Mercurial Repositories > eric / changeset

--- a/PipInterface/PipPackagesWidget.py	Sat Feb 23 15:02:24 2019 +0100
+++ b/PipInterface/PipPackagesWidget.py	Sat Feb 23 15:31:47 2019 +0100
@@ -29,7 +29,6 @@
 from .Pip import Pip
 
 
-# TODO: use icons for action buttons
 class PipPackagesWidget(QWidget, Ui_PipPackagesWidget):
     """
     Class implementing the pip packages management widget.
@@ -68,7 +67,16 @@
         self.pipMenuButton.setAutoRaise(True)
         self.pipMenuButton.setShowMenuInside(True)
         
+        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.showPackageDetailsButton.setIcon(UI.PixmapCache.getIcon("info"))
         self.searchToggleButton.setIcon(UI.PixmapCache.getIcon("find"))
+        self.searchButton.setIcon(UI.PixmapCache.getIcon("findNext"))
+        self.installButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.installUserSiteButton.setIcon(UI.PixmapCache.getIcon("addUser"))
+        self.showDetailsButton.setIcon(UI.PixmapCache.getIcon("info"))
         
         self.__pip = Pip(self)
         self.__client = E5XmlRpcClient(self.__pip.getIndexUrlXml(), self)

--- a/PipInterface/PipPackagesWidget.ui	Sat Feb 23 15:02:24 2019 +0100
+++ b/PipInterface/PipPackagesWidget.ui	Sat Feb 23 15:31:47 2019 +0100
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
+    <width>503</width>
     <height>700</height>
    </rect>
   </property>
@@ -37,8 +37,8 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
          <widget class="QCheckBox" name="localCheckBox">
           <property name="toolTip">
            <string>Select to show only locally-installed packages</string>
@@ -51,7 +51,7 @@
           </property>
          </widget>
         </item>
-        <item>
+        <item row="0" column="1">
          <widget class="QCheckBox" name="notRequiredCheckBox">
           <property name="toolTip">
            <string>Select to list packages that are not dependencies of installed packages</string>
@@ -61,7 +61,7 @@
           </property>
          </widget>
         </item>
-        <item>
+        <item row="1" column="0">
          <widget class="QCheckBox" name="userCheckBox">
           <property name="toolTip">
            <string>Select to show only packages installed to the user-site</string>
@@ -230,53 +230,38 @@
          </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>
-         <widget class="QPushButton" name="showPackageDetailsButton">
+         <widget class="QToolButton" name="showPackageDetailsButton">
           <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>
@@ -358,19 +343,6 @@
           </item>
          </widget>
         </item>
-        <item row="0" column="3" rowspan="2">
-         <widget class="QPushButton" 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>
         <item row="1" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -388,6 +360,16 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="3" rowspan="2">
+         <widget class="QToolButton" name="searchButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Press to start the search</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -461,33 +443,24 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="installButton">
+         <widget class="QToolButton" name="installButton">
           <property name="toolTip">
            <string>Press to install the selected package</string>
           </property>
-          <property name="text">
-           <string>&amp;Install</string>
-          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="installUserSiteButton">
+         <widget class="QToolButton" name="installUserSiteButton">
           <property name="toolTip">
            <string>Press to install the selected package to the user site</string>
           </property>
-          <property name="text">
-           <string>Install to &amp;User-Site</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>
@@ -531,6 +504,7 @@
   <tabstop>upgradeButton</tabstop>
   <tabstop>upgradeAllButton</tabstop>
   <tabstop>uninstallButton</tabstop>
+  <tabstop>showPackageDetailsButton</tabstop>
   <tabstop>searchToggleButton</tabstop>
   <tabstop>searchEditName</tabstop>
   <tabstop>searchTermCombineComboBox</tabstop>

Binary file icons/default/addUser.png has changed