Mercurial Repositories > eric / changeset

--- a/Preferences/ConfigurationPages/WebBrowserPage.py	Wed Apr 27 19:44:22 2016 +0200
+++ b/Preferences/ConfigurationPages/WebBrowserPage.py	Sat Apr 30 13:07:13 2016 +0200
@@ -14,6 +14,7 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserPage import Ui_WebBrowserPage
 
+import UI.PixmapCache
 import Preferences
 
 
@@ -127,6 +128,16 @@
         if index > -1:
             self.languageCombo.setCurrentIndex(index)
         
+        for engineName in self.__browserWindow.imageSearchEngine()\
+                .searchEngineNames():
+            self.imageSearchComboBox.addItem(
+                UI.PixmapCache.getIcon("{0}.png".format(engineName.lower())),
+                engineName)
+        index = self.imageSearchComboBox.findText(
+            Preferences.getWebBrowser("ImageSearchEngine"))
+        if index > -1:
+            self.imageSearchComboBox.setCurrentIndex(index)
+        
         self.spatialCheckBox.setChecked(
             Preferences.getWebBrowser("SpatialNavigationEnabled"))
         self.linksInFocusChainCheckBox.setChecked(
@@ -236,6 +247,10 @@
         Preferences.setWebBrowser("SearchLanguage", language)
         
         Preferences.setWebBrowser(
+            "ImageSearchEngine",
+            self.imageSearchComboBox.currentText())
+        
+        Preferences.setWebBrowser(
             "SpatialNavigationEnabled",
             self.spatialCheckBox.isChecked())
         Preferences.setWebBrowser(

--- a/Preferences/ConfigurationPages/WebBrowserPage.ui	Wed Apr 27 19:44:22 2016 +0200
+++ b/Preferences/ConfigurationPages/WebBrowserPage.ui	Sat Apr 30 13:07:13 2016 +0200
@@ -533,6 +533,42 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_7">
+     <property name="title">
+      <string>Image Search</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Default Search Engine:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="imageSearchComboBox">
+        <property name="toolTip">
+         <string>Select the default search engine for image searches</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>383</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Navigation</string>
@@ -671,6 +707,7 @@
   <tabstop>diskCacheCheckBox</tabstop>
   <tabstop>cacheSizeSpinBox</tabstop>
   <tabstop>languageCombo</tabstop>
+  <tabstop>imageSearchComboBox</tabstop>
   <tabstop>spatialCheckBox</tabstop>
   <tabstop>linksInFocusChainCheckBox</tabstop>
   <tabstop>webInspectorGroup</tabstop>

--- a/Preferences/__init__.py	Wed Apr 27 19:44:22 2016 +0200
+++ b/Preferences/__init__.py	Sat Apr 30 13:07:13 2016 +0200
@@ -1025,7 +1025,7 @@
         "WebSearchKeywords": [],    # array of two tuples (keyword,
                                     # search engine name)
         "SearchLanguage": QLocale().language(),
-        "ImmageSearchEngine": "Google",
+        "ImageSearchEngine": "Google",
         "RssFeeds": [],
         "ShowPreview": True,
         "WebInspectorPort": 42024,

--- a/WebBrowser/ImageSearch/ImageSearchEngine.py	Wed Apr 27 19:44:22 2016 +0200
+++ b/WebBrowser/ImageSearch/ImageSearchEngine.py	Sat Apr 30 13:07:13 2016 +0200
@@ -28,8 +28,6 @@
         super(ImageSearchEngine, self).__init__(parent)
         
         self.__searchEngineNames = ["Google", "TinEye", "Yandex"]
-        
-        self.__searchEngine = Preferences.getWebBrowser("ImmageSearchEngine")
     
     def searchEngine(self):
         """
@@ -38,7 +36,7 @@
         @return name of the current search engine
         @rtype str
         """
-        return self.__searchEngine
+        return Preferences.getWebBrowser("ImageSearchEngine")
     
     def setSearchEngine(self, searchEngine):
         """
@@ -47,8 +45,7 @@
         @param searchEngine name of the search engine
         @type str
         """
-        self.__searchEngine = searchEngine
-        Preferences.setWebBrowser("ImmageSearchEngine", searchEngine)
+        Preferences.setWebBrowser("ImageSearchEngine", searchEngine)
     
     def searchEngineNames(self):
         """
@@ -71,7 +68,7 @@
         @rtype QUrl
         """
         if not searchEngine:
-            searchEngine = self.__searchEngine
+            searchEngine = self.searchEngine()
         
         searchEngine_l = searchEngine.lower()
         if searchEngine_l == "google":