Mercurial Repositories > eric / changeset

--- a/CondaInterface/CondaInfoDialog.py	Sat Feb 23 13:22:24 2019 +0100
+++ b/CondaInterface/CondaInfoDialog.py	Sat Feb 23 13:23:09 2019 +0100
@@ -35,7 +35,7 @@
         self.setWindowFlags(Qt.Window)
         
         self.iconLabel.setPixmap(
-            UI.PixmapCache.getPixmap("miniconda48.png"))
+            UI.PixmapCache.getPixmap("miniconda48"))
         
         # version information
         if "conda_version" in infoDict:

--- a/CondaInterface/CondaPackagesWidget.py	Sat Feb 23 13:22:24 2019 +0100
+++ b/CondaInterface/CondaPackagesWidget.py	Sat Feb 23 13:23:09 2019 +0100
@@ -68,7 +68,7 @@
         
         self.condaMenuButton.setObjectName(
             "navigation_supermenu_button")
-        self.condaMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu.png"))
+        self.condaMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu"))
         self.condaMenuButton.setToolTip(self.tr("Conda Menu"))
         self.condaMenuButton.setPopupMode(QToolButton.InstantPopup)
         self.condaMenuButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
@@ -76,7 +76,14 @@
         self.condaMenuButton.setAutoRaise(True)
         self.condaMenuButton.setShowMenuInside(True)
         
-        self.searchToggleButton.setIcon(UI.PixmapCache.getIcon("find.png"))
+        self.refreshButton.setIcon(UI.PixmapCache.getIcon("reload"))
+        self.upgradeButton.setIcon(UI.PixmapCache.getIcon("1uparrow"))
+        self.upgradeAllButton.setIcon(UI.PixmapCache.getIcon("2uparrow"))
+        self.uninstallButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.searchToggleButton.setIcon(UI.PixmapCache.getIcon("find"))
+        self.searchButton.setIcon(UI.PixmapCache.getIcon("findNext"))
+        self.installButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.showDetailsButton.setIcon(UI.PixmapCache.getIcon("info"))
         
         if CondaInterface.condaVersion() >= (4, 4, 0):
             self.searchOptionsWidget.hide()

--- a/CondaInterface/CondaPackagesWidget.ui	Sat Feb 23 13:22:24 2019 +0100
+++ b/CondaInterface/CondaPackagesWidget.ui	Sat Feb 23 13:23:09 2019 +0100
@@ -183,43 +183,31 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="refreshButton">
+         <widget class="QToolButton" name="refreshButton">
           <property name="toolTip">
            <string>Press to refresh the lists</string>
           </property>
-          <property name="text">
-           <string>&amp;Refresh</string>
-          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="upgradeButton">
+         <widget class="QToolButton" name="upgradeButton">
           <property name="toolTip">
            <string>Press to upgrade the selected packages</string>
           </property>
-          <property name="text">
-           <string>Up&amp;grade</string>
-          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="upgradeAllButton">
+         <widget class="QToolButton" name="upgradeAllButton">
           <property name="toolTip">
            <string>Press to upgrade all listed packages</string>
           </property>
-          <property name="text">
-           <string>Upgrade &amp;All</string>
-          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="uninstallButton">
+         <widget class="QToolButton" name="uninstallButton">
           <property name="toolTip">
            <string>Press to uninstall the selected package</string>
           </property>
-          <property name="text">
-           <string>&amp;Uninstall</string>
-          </property>
          </widget>
         </item>
         <item>
@@ -275,16 +263,13 @@
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="searchButton">
+         <widget class="QToolButton" name="searchButton">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="toolTip">
            <string>Press to start the search</string>
           </property>
-          <property name="text">
-           <string>&amp;Search</string>
-          </property>
          </widget>
         </item>
        </layout>
@@ -339,13 +324,10 @@
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="Line" name="line">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-            </widget>
-           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
            <item>
             <widget class="QLabel" name="label">
              <property name="text">
@@ -414,23 +396,17 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="installButton">
+         <widget class="QToolButton" name="installButton">
           <property name="toolTip">
            <string>Press to install the selected package (by name or package specification)</string>
           </property>
-          <property name="text">
-           <string>&amp;Install</string>
-          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="showDetailsButton">
+         <widget class="QToolButton" name="showDetailsButton">
           <property name="toolTip">
            <string>Press to show details for the selected entry</string>
           </property>
-          <property name="text">
-           <string>Show Details...</string>
-          </property>
          </widget>
         </item>
         <item>
@@ -474,7 +450,6 @@
   <tabstop>patternButton</tabstop>
   <tabstop>fullNameButton</tabstop>
   <tabstop>packageSpecButton</tabstop>
-  <tabstop>platformComboBox</tabstop>
   <tabstop>searchResultList</tabstop>
   <tabstop>installButton</tabstop>
   <tabstop>showDetailsButton</tabstop>

--- a/WebBrowser/WebBrowserView.py	Sat Feb 23 13:22:24 2019 +0100
+++ b/WebBrowser/WebBrowserView.py	Sat Feb 23 13:23:09 2019 +0100
@@ -1519,8 +1519,8 @@
             self.parentWidget().installEventFilter(self)
         
         # find the render widget receiving events for the web page
-        if qVersionTuple() < (5, 8, 0) or qVersionTuple() >= (5, 12, 0):
-            if obj is self and evt.type() == QEvent.ChildAdded:
+        if obj is self and evt.type() == QEvent.ChildAdded:
+            if qVersionTuple() < (5, 8, 0):
                 child = evt.child()
                 if child and child.inherits(
                         "QtWebEngineCore::"
@@ -1529,8 +1529,7 @@
                     self.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.installEventFilter(self)
-        elif qVersionTuple() >= (5, 11, 0):
-            if obj is self and evt.type() == QEvent.ChildAdded:
+            elif qVersionTuple() >= (5, 11, 0):
                 QTimer.singleShot(0, self.__setRwhvqt)
         
         # forward events to WebBrowserView

Binary file icons/default/info.png has changed