eric: comparison QScintilla/ShellWindow.py

-:b5809b948010
+:50b6867ffcd3
 Module implementing a stand alone shell window.
 """
 from __future__ import unicode_literals
-from PyQt5.QtCore import Qt, QCoreApplication, QPoint, QSize, QSignalMapper
+import sys
+import os
+from PyQt5.QtCore import Qt, QCoreApplication, QPoint, QSize, QSignalMapper, \
+QProcess
 from PyQt5.QtGui import QKeySequence
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QAction, \
 QWhatsThis, QDialog
 from PyQt5.Qsci import QsciScintilla
 from .Shell import Shell
 from .APIsManager import APIsManager
 from Debugger.DebugServer import DebugServer
 from UI.SearchWidget import SearchWidget
+from eric6config import getConfig
 class ShellWindow(E5MainWindow):
 """
 Class implementing a stand alone shell window.
 def closeEvent(self, event):
 """
 Protected method to handle the close event.
-@param event close event (QCloseEvent)
+@param event close event
+@type QCloseEvent
 """
 self.__writeSettings()
 self.__debugServer.shutdownServer()
 self.__shell.closeShell()
 def __readShortcut(self, act, category):
 """
 Private function to read a single keyboard shortcut from the settings.
-@param act reference to the action object (E5Action)
+@param act reference to the action object
-@param category category the action belongs to (string)
+@type E5Action
+@param category category the action belongs to
+@type str
 """
 if act.objectName():
 accel = Preferences.Prefs.settings.value(
 "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()))
 if accel is not None:
 self.tr('Quit'),
 UI.PixmapCache.getIcon("exit.png"),
 self.tr('&Quit'),
 QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
 0, self, 'quit')
-self.exitAct.setStatusTip(self.tr('Quit the IDE'))
+self.exitAct.setStatusTip(self.tr('Quit the Shell'))
 self.exitAct.setWhatsThis(self.tr(
 """<b>Quit the Shell</b>"""
 """<p>This quits the Shell window.</p>"""
 ))
 self.exitAct.triggered.connect(self.quit)
 self.exitAct.setMenuRole(QAction.QuitRole)
 self.fileActions.append(self.exitAct)
-##
-##        self.newWindowAct = E5Action(
+self.newWindowAct = E5Action(
-##            self.tr('New Window'),
+self.tr('New Window'),
-##            UI.PixmapCache.getIcon("newWindow.png"),
+UI.PixmapCache.getIcon("newWindow.png"),
-##            self.tr('New &Window'),
+self.tr('New &Window'),
-##            QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
+QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
-##            0, self, 'new_window')
+0, self, 'new_window')
-##        self.newWindowAct.setStatusTip(self.tr(
+self.newWindowAct.setStatusTip(self.tr(
-##            'Open a new eric6 instance'))
+'Open a new Shell window'))
-##        self.newWindowAct.setWhatsThis(self.tr(
+self.newWindowAct.setWhatsThis(self.tr(
-##            """<b>New Window</b>"""
+"""<b>New Window</b>"""
-##            """<p>This opens a new instance of the eric6 IDE.</p>"""
+"""<p>This opens a new instance of the Shell window.</p>"""
-##        ))
+))
-##        self.newWindowAct.triggered.connect(self.__newWindow)
+self.newWindowAct.triggered.connect(self.__newWindow)
-##        self.fileActions.append(self.newWindowAct)
+self.fileActions.append(self.newWindowAct)
 self.restartAct = E5Action(
 self.tr('Restart'),
 UI.PixmapCache.getIcon("restart.png"),
 self.tr('Restart'),
 Private slot to handle the 'restart and clear' menu entry.
 """
 self.__doRestart()
 self.__shell.clear()
+def __newWindow(self):
+"""
+Private slot to start a new instance of eric6.
+"""
+program = sys.executable
+eric6 = os.path.join(getConfig("ericDir"), "eric6_shell.py")
+args = [eric6]
+QProcess.startDetached(program, args)
 ##################################################################
 ## Below are the action methods for the view menu
 ##################################################################
 def __zoomIn(self):
 def __zoomTo(self, value):
 """
 Private slot to zoom to a given value.
-@param value zoom value to be set (integer)
+@param value zoom value to be set
+@type int
 """
 self.__shell.zoomTo(value)
 self.__sbZoom.setValue(self.__shell.getZoom())
 def __zoomValueChanged(self, value):
 """
 Private slot to handle changes of the zoom value.
-@param value new zoom value (integer)
+@param value new zoom value
+@type int
 """
 self.__sbZoom.setValue(value)
 ##################################################################
 ## Below are the action methods for the help menu
 """
 Private method to create the menus of the menu bar.
 """
 self.__fileMenu = self.menuBar().addMenu(self.tr("&File"))
 self.__fileMenu.setTearOffEnabled(True)
-##        self.__fileMenu.addAction(self.newAct)
+self.__fileMenu.addAction(self.newWindowAct)
-##        self.__fileMenu.addSeparator()
+self.__fileMenu.addSeparator()
 self.__fileMenu.addAction(self.restartAct)
 self.__fileMenu.addAction(self.clearRestartAct)
 self.__fileMenu.addSeparator()
 self.__fileMenu.addAction(self.exitAct)
 """
 Private method to create the various toolbars.
 """
 filetb = self.addToolBar(self.tr("File"))
 filetb.setIconSize(UI.Config.ToolBarIconSize)
-##        filetb.addAction(self.newAct)
+filetb.addAction(self.newWindowAct)
 filetb.addSeparator()
 filetb.addAction(self.restartAct)
 filetb.addAction(self.clearRestartAct)
 filetb.addSeparator()
 filetb.addAction(self.exitAct)

Mercurial Repositories > eric / file comparison

comparison: QScintilla/ShellWindow.py

QScintilla/ShellWindow.py