diff -r f81d0eca2c62 -r b5809b948010 QScintilla/Shell.py
--- a/QScintilla/Shell.py Thu Apr 20 20:09:53 2017 +0200
+++ b/QScintilla/Shell.py Fri Apr 21 19:39:31 2017 +0200
@@ -101,9 +101,9 @@
@param dbs reference to the debug server object
@param vm reference to the viewmanager object
- @param parent parent widget (QWidget)
@param windowedVariant flag indicating the shell window variant
(boolean)
+ @param parent parent widget (QWidget)
"""
super(Shell, self).__init__(parent)
self.setUtf8(True)
@@ -115,8 +115,8 @@
self.linesepRegExp = r"\r\n|\n|\r"
- # TODO: change this for Shell Window
- self.passive = Preferences.getDebugger("PassiveDbgEnabled")
+ self.passive = ((not self.__windowed) and
+ Preferences.getDebugger("PassiveDbgEnabled"))
if self.passive:
self.setWindowTitle(self.tr('Shell - Passive'))
else:
@@ -235,33 +235,33 @@
if self.passive:
self.__getBanner()
- # Create a little language context menu
- self.lmenu = QMenu(self.tr('Start'))
- self.lmenu.aboutToShow.connect(self.__showLanguageMenu)
- self.lmenu.triggered.connect(self.__startDebugClient)
-
- # Create the history context menu
- self.hmenu = QMenu(self.tr('History'))
- self.hmenu.addAction(self.tr('Select entry'), self.__selectHistory)
- self.hmenu.addAction(self.tr('Show'), self.__showHistory)
- self.hmenu.addAction(self.tr('Clear'), self.__clearHistory)
-
- # Create a little context menu
- self.menu = QMenu(self)
- self.menu.addAction(self.tr('Cut'), self.cut)
- self.menu.addAction(self.tr('Copy'), self.copy)
- self.menu.addAction(self.tr('Paste'), self.paste)
- self.menu.addMenu(self.hmenu)
- self.menu.addSeparator()
- self.menu.addAction(self.tr('Find'), self.__find)
- self.menu.addSeparator()
- self.menu.addAction(self.tr('Clear'), self.clear)
- self.menu.addAction(self.tr('Reset'), self.__reset)
- self.menu.addAction(
- self.tr('Reset and Clear'), self.__resetAndClear)
- self.menu.addSeparator()
- self.menu.addMenu(self.lmenu)
if not self.__windowed:
+ # Create a little language context menu
+ self.lmenu = QMenu(self.tr('Start'))
+ self.lmenu.aboutToShow.connect(self.__showLanguageMenu)
+ self.lmenu.triggered.connect(self.__startDebugClient)
+
+ # Create the history context menu
+ self.hmenu = QMenu(self.tr('History'))
+ self.hmenu.addAction(self.tr('Select entry'), self.selectHistory)
+ self.hmenu.addAction(self.tr('Show'), self.showHistory)
+ self.hmenu.addAction(self.tr('Clear'), self.clearHistory)
+
+ # Create a little context menu
+ self.menu = QMenu(self)
+ self.menu.addAction(self.tr('Cut'), self.cut)
+ self.menu.addAction(self.tr('Copy'), self.copy)
+ self.menu.addAction(self.tr('Paste'), self.paste)
+ self.menu.addMenu(self.hmenu)
+ self.menu.addSeparator()
+ self.menu.addAction(self.tr('Find'), self.__find)
+ self.menu.addSeparator()
+ self.menu.addAction(self.tr('Clear'), self.clear)
+ self.menu.addAction(self.tr('Reset'), self.__reset)
+ self.menu.addAction(
+ self.tr('Reset and Clear'), self.__resetAndClear)
+ self.menu.addSeparator()
+ self.menu.addMenu(self.lmenu)
self.menu.addSeparator()
self.menu.addAction(self.tr("Configure..."), self.__configure)
@@ -607,9 +607,9 @@
else:
return []
- def __clearHistory(self):
+ def clearHistory(self):
"""
- Private slot to clear the current history.
+ Public slot to clear the current history.
"""
if self.clientType:
self.historyLists[self.clientType] = []
@@ -618,9 +618,9 @@
self.history = []
self.histidx = -1
- def __selectHistory(self):
+ def selectHistory(self):
"""
- Private slot to select a history entry to execute.
+ Public slot to select a history entry to execute.
"""
cmd, ok = QInputDialog.getItem(
self,
@@ -632,9 +632,9 @@
if ok:
self.__insertHistory(cmd)
- def __showHistory(self):
+ def showHistory(self):
"""
- Private slot to show the shell history dialog.
+ Public slot to show the shell history dialog.
"""
from .ShellHistoryDialog import ShellHistoryDialog
dlg = ShellHistoryDialog(self.history, self.vm, self)
@@ -653,7 +653,7 @@
self.saveHistory(clientType)
Preferences.Prefs.settings.endGroup()
- self.__clearHistory()
+ self.clearHistory()
def getClientType(self):
"""
@@ -1570,8 +1570,9 @@
@param ev context menu event (QContextMenuEvent)
"""
- self.menu.popup(ev.globalPos())
- ev.accept()
+ if not self.__windowed:
+ self.menu.popup(ev.globalPos())
+ ev.accept()
def clear(self):
"""
@@ -1716,7 +1717,7 @@
@param event the drop event (QDropEvent)
"""
- if event.mimeData().hasUrls():
+ if event.mimeData().hasUrls() and not self.__windowed:
for url in event.mimeData().urls():
fname = url.toLocalFile()
if fname:
