Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Sat Oct 01 15:12:23 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Mon Oct 03 19:02:45 2016 +0200
@@ -978,22 +978,19 @@
             self.selectAllAct.triggered.connect(self.__selectAll)
         self.__actions.append(self.selectAllAct)
         
-        if hasattr(QWebEnginePage, "Unselect"):
-            self.unselectAct = E5Action(
-                self.tr('Unselect'),
-                self.tr('Unselect'),
-                QKeySequence(self.tr("Ctrl+Shift+A", "Edit|Unselect")),
-                0, self, 'webbrowser_edit_unselect')
-            self.unselectAct.setStatusTip(self.tr('Clear current selection'))
-            self.unselectAct.setWhatsThis(self.tr(
-                """<b>Unselect</b>"""
-                """<p>Clear the selection of the current browser.</p>"""
-            ))
-            if not self.__initShortcutsOnly:
-                self.unselectAct.triggered.connect(self.__unselect)
-            self.__actions.append(self.unselectAct)
-        else:
-            self.unselectAct = None
+        self.unselectAct = E5Action(
+            self.tr('Unselect'),
+            self.tr('Unselect'),
+            QKeySequence(self.tr("Alt+Ctrl+A", "Edit|Unselect")),
+            0, self, 'webbrowser_edit_unselect')
+        self.unselectAct.setStatusTip(self.tr('Clear current selection'))
+        self.unselectAct.setWhatsThis(self.tr(
+            """<b>Unselect</b>"""
+            """<p>Clear the selection of the current browser.</p>"""
+        ))
+        if not self.__initShortcutsOnly:
+            self.unselectAct.triggered.connect(self.__unselect)
+        self.__actions.append(self.unselectAct)
         
         self.findAct = E5Action(
             self.tr('Find...'),
@@ -1803,8 +1800,7 @@
         menu.addAction(self.pasteAct)
         menu.addSeparator()
         menu.addAction(self.selectAllAct)
-        if self.unselectAct is not None:
-            menu.addAction(self.unselectAct)
+        menu.addAction(self.unselectAct)
         menu.addSeparator()
         menu.addAction(self.findAct)
         menu.addAction(self.findNextAct)
@@ -2245,7 +2241,7 @@
             self,
             self.tr("Open File"),
             "",
-            self.tr("HTML Files (*.html *.htm *.mhtml);;"
+            self.tr("HTML Files (*.html *.htm *.mhtml *.mht);;"
                     "PDF Files (*.pdf);;"
                     "CHM Files (*.chm);;"
                     "All Files (*)"
@@ -2265,7 +2261,7 @@
             self,
             self.tr("Open File"),
             "",
-            self.tr("HTML Files (*.html *.htm *.mhtml);;"
+            self.tr("HTML Files (*.html *.htm *.mhtml *.mht);;"
                     "PDF Files (*.pdf);;"
                     "CHM Files (*.chm);;"
                     "All Files (*)"