Mercurial Repositories > eric / changeset

--- a/eric6/Preferences/ConfigurationPages/SecurityPage.py	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/SecurityPage.py	Tue Sep 03 19:27:46 2019 +0200
@@ -64,10 +64,6 @@
         )
         
         self.__displayMode = displayMode
-        if self.__configDlg.isUsingWebEngine():
-            # TODO: is this still needed?
-            self.dnsPrefetchCheckBox.setEnabled(False)
-            self.dnsGroup.hide()
     
     def save(self):
         """
@@ -79,10 +75,6 @@
         Preferences.setUser(
             "UseMasterPassword",
             self.masterPasswordCheckBox.isChecked())
-        if self.dnsPrefetchCheckBox.isEnabled():
-            Preferences.setHelp(
-                "DnsPrefetchEnabled",
-                self.dnsPrefetchCheckBox.isChecked())
         
         if self.__oldUseMasterPassword != \
                 self.masterPasswordCheckBox.isChecked():

--- a/eric6/Preferences/ConfigurationPages/SecurityPage.ui	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/SecurityPage.ui	Tue Sep 03 19:27:46 2019 +0200
@@ -91,25 +91,6 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="dnsGroup">
-     <property name="title">
-      <string>DNS</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="dnsPrefetchCheckBox">
-        <property name="toolTip">
-         <string>Select to enable DNS prefetch</string>
-        </property>
-        <property name="text">
-         <string>Use DNS prefetching to improve page loading</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>

--- a/eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.py	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.py	Tue Sep 03 19:27:46 2019 +0200
@@ -47,14 +47,14 @@
         """
         Public slot to save the Flash Cookies Manager configuration.
         """
-        Preferences.setWebBrowser("FlashCookiesDataPath",
-                            self.flashDataPathPicker.text())
-        Preferences.setWebBrowser("FlashCookieAutoRefresh",
-                            self.autoModeGroup.isChecked())
-        Preferences.setWebBrowser("FlashCookieNotify",
-                            self.notificationGroup.isChecked())
-        Preferences.setWebBrowser("FlashCookiesDeleteOnStartExit",
-                            self.deleteGroup.isChecked())
+        Preferences.setWebBrowser(
+            "FlashCookiesDataPath", self.flashDataPathPicker.text())
+        Preferences.setWebBrowser(
+            "FlashCookieAutoRefresh", self.autoModeGroup.isChecked())
+        Preferences.setWebBrowser(
+            "FlashCookieNotify", self.notificationGroup.isChecked())
+        Preferences.setWebBrowser(
+            "FlashCookiesDeleteOnStartExit", self.deleteGroup.isChecked())
     
 
 def create(dlg):

--- a/eric6/UI/LogView.py	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/UI/LogView.py	Tue Sep 03 19:27:46 2019 +0200
@@ -40,9 +40,7 @@
         
         self.__logViewer = LogViewerEdit(self)
         from .SearchWidget import SearchWidget
-        # TODO: get rid of 'hideRegExp'
-        self.__searchWidget = SearchWidget(
-            self.__logViewer, self, hideRegExp=False)
+        self.__searchWidget = SearchWidget(self.__logViewer, self)
         self.__searchWidget.setSizePolicy(
             QSizePolicy.Fixed, QSizePolicy.Preferred)
         self.__searchWidget.hide()

--- a/eric6/UI/SearchWidget.py	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/UI/SearchWidget.py	Tue Sep 03 19:27:46 2019 +0200
@@ -27,8 +27,7 @@
     searchNext = pyqtSignal(str, bool, bool, bool)
     searchPrevious = pyqtSignal(str, bool, bool, bool)
     
-    def __init__(self, mainWindow, parent=None, spacer=True, showLine=False,
-                 hideRegExp=False):
+    def __init__(self, mainWindow, parent=None, spacer=True, showLine=False):
         """
         Constructor
         
@@ -41,8 +40,6 @@
         @type bool
         @param showLine flag indicating to show all widget in one row
         @type bool
-        @param hideRegExp flag indicating to hide the Regexp checkbox
-        @type bool
         """
         super(SearchWidget, self).__init__(parent)
         
@@ -54,10 +51,6 @@
             self.__ui = Ui_SearchWidget()
         self.__ui.setupUi(self)
         
-        if hideRegExp:
-            self.__ui.regexpCheckBox.setChecked(False)
-            self.__ui.regexpCheckBox.hide()
-        
         if not showLine:
             if spacer:
                 spacerItem = QSpacerItem(

--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Mon Sep 02 18:58:29 2019 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Tue Sep 03 19:27:46 2019 +0200
@@ -375,7 +375,6 @@
         
         @return prepared script object
         @rtype QWebEngineScript
-        @exception ValueError raised to indicate an unsupported start point
         """
         script = QWebEngineScript()
         script.setSourceCode("{0}\n{1}".format(
@@ -386,19 +385,6 @@
         script.setRunsOnSubFrames(not self.__noFrames)
         return script
     
-    # TODO: get rid of it
-    def __toJavaScriptList(self, patterns):
-        """
-        Private method to convert a list of str to a string containing a valid
-        JavaScript list definition.
-        
-        @param patterns list of match patterns
-        @type list of str
-        @return JavaScript script containing the list
-        @rtype str
-        """
-        return ""
-    
     def updateScript(self):
         """
         Public method to updated the script.