Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Sat Feb 17 14:59:26 2018 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Feb 17 17:29:03 2018 +0100
@@ -21,7 +21,7 @@
     QUrl, QTextCodec, QProcess, QEvent
 from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
-    QComboBox, QLabel, QMenu, QToolButton, QLineEdit, QApplication, \
+    QComboBox, QLabel, QMenu, QLineEdit, QApplication, \
     QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QInputDialog, QAction
 from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEnginePage, \
     QWebEngineProfile, QWebEngineScript
@@ -771,31 +771,16 @@
         else:
             self.saveAsAct = None
         
-        self.savePageScreenAct = E5Action(
+        self.saveVisiblePageScreenAct = E5Action(
             self.tr('Save Page Screen'),
             UI.PixmapCache.getIcon("fileSavePixmap.png"),
             self.tr('Save Page Screen...'),
-            0, 0, self, 'webbrowser_file_save_page_screen')
-        self.savePageScreenAct.setStatusTip(
-            self.tr('Save the current page as a screen shot'))
-        self.savePageScreenAct.setWhatsThis(self.tr(
-            """<b>Save Page Screen...</b>"""
-            """<p>Saves the current page as a screen shot.</p>"""
-        ))
-        if not self.__initShortcutsOnly:
-            self.savePageScreenAct.triggered.connect(self.__savePageScreen)
-        self.__actions.append(self.savePageScreenAct)
-        
-        self.saveVisiblePageScreenAct = E5Action(
-            self.tr('Save Visible Page Screen'),
-            UI.PixmapCache.getIcon("fileSaveVisiblePixmap.png"),
-            self.tr('Save Visible Page Screen...'),
             0, 0, self, 'webbrowser_file_save_visible_page_screen')
         self.saveVisiblePageScreenAct.setStatusTip(
             self.tr('Save the visible part of the current page as a'
                     ' screen shot'))
         self.saveVisiblePageScreenAct.setWhatsThis(self.tr(
-            """<b>Save Visible Page Screen...</b>"""
+            """<b>Save Page Screen...</b>"""
             """<p>Saves the visible part of the current page as a"""
             """ screen shot.</p>"""
         ))
@@ -2008,7 +1993,6 @@
             menu.addSeparator()
         if self.saveAsAct is not None:
             menu.addAction(self.saveAsAct)
-        menu.addAction(self.savePageScreenAct)
         menu.addAction(self.saveVisiblePageScreenAct)
         menu.addSeparator()
         if self.printPreviewAct:
@@ -2198,7 +2182,6 @@
         menu = self.__superMenu.addMenu(self.tr("Save"))
         if self.saveAsAct:
             menu.addAction(self.saveAsAct)
-        menu.addAction(self.savePageScreenAct)
         menu.addAction(self.saveVisiblePageScreenAct)
         
         if self.printPreviewAct or self.printAct or self.printPdfAct:
@@ -2324,7 +2307,7 @@
         filetb.addSeparator()
         if self.saveAsAct is not None:
             filetb.addAction(self.saveAsAct)
-        filetb.addAction(self.savePageScreenAct)
+        filetb.addAction(self.saveVisiblePageScreenAct)
         filetb.addSeparator()
         if self.printPreviewAct:
             filetb.addAction(self.printPreviewAct)
@@ -2338,13 +2321,6 @@
         filetb.addAction(self.exitAct)
         self.__toolbars["file"] = (filetb.windowTitle(), filetb)
         
-        self.savePageScreenMenu = QMenu(self)
-        self.savePageScreenMenu.addAction(self.savePageScreenAct)
-        self.savePageScreenMenu.addAction(self.saveVisiblePageScreenAct)
-        savePageScreenButton = filetb.widgetForAction(self.savePageScreenAct)
-        savePageScreenButton.setMenu(self.savePageScreenMenu)
-        savePageScreenButton.setPopupMode(QToolButton.MenuButtonPopup)
-        
         edittb = self.addToolBar(self.tr("Edit"))
         edittb.setObjectName("EditToolBar")
         edittb.setIconSize(UI.Config.ToolBarIconSize)
@@ -2605,25 +2581,14 @@
             browser.saveAs()
     
     @pyqtSlot()
-    def __savePageScreen(self, visibleOnly=False):
-        """
-        Private slot to save the current page as a screen shot.
-        
-        @param visibleOnly flag indicating to just save the visible part
-            of the page (boolean)
-        """
-        from .PageScreenDialog import PageScreenDialog
-        self.__pageScreen = PageScreenDialog(
-            self.currentBrowser(), visibleOnly=visibleOnly)
-        self.__pageScreen.show()
-        
-    @pyqtSlot()
     def __saveVisiblePageScreen(self):
         """
         Private slot to save the visible part of the current page as a screen
         shot.
         """
-        self.__savePageScreen(visibleOnly=True)
+        from .PageScreenDialog import PageScreenDialog
+        self.__pageScreen = PageScreenDialog(self.currentBrowser())
+        self.__pageScreen.show()
         
     def __about(self):
         """