eric: changeset 8608:4d4d2ec95dd4

--- a/eric7/VirtualEnv/VirtualenvManagerDialog.py	Tue Sep 14 19:58:41 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManagerDialog.py	Wed Sep 15 19:57:41 2021 +0200
@@ -16,6 +16,7 @@
 from .Ui_VirtualenvManagerDialog import Ui_VirtualenvManagerDialog

 import Utilities
+import UI.PixmapCache


 class VirtualenvManagerDialog(QDialog, Ui_VirtualenvManagerDialog):
@@ -42,6 +43,14 @@

         self.__manager = manager

+        self.addButton.setIcon(UI.PixmapCache.getIcon("plus"))
+        self.newButton.setIcon(UI.PixmapCache.getIcon("new"))
+        self.editButton.setIcon(UI.PixmapCache.getIcon("edit"))
+        self.removeButton.setIcon(UI.PixmapCache.getIcon("minus"))
+        self.removeAllButton.setIcon(UI.PixmapCache.getIcon("minus_3"))
+        self.deleteButton.setIcon(UI.PixmapCache.getIcon("fileDelete"))
+        self.deleteAllButton.setIcon(UI.PixmapCache.getIcon("fileDeleteList"))
+
         baseDir = self.__manager.getVirtualEnvironmentsBaseDir()
         if not baseDir:
             baseDir = Utilities.getHomeDir()
--- a/eric7/VirtualEnv/VirtualenvManagerDialog.ui	Tue Sep 14 19:58:41 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManagerDialog.ui	Wed Sep 15 19:57:41 2021 +0200
@@ -16,8 +16,8 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QTreeWidget" name="venvList">
      <property name="alternatingRowColors">
       <bool>true</bool>
@@ -54,43 +54,50 @@
      </column>
     </widget>
    </item>
-   <item row="0" column="1">
-    <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="addButton">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>28</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="addButton">
        <property name="toolTip">
         <string>Press to add an existing virtual environment</string>
        </property>
        <property name="text">
         <string>Add...</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="newButton">
+      <widget class="QToolButton" name="newButton">
        <property name="toolTip">
         <string>Press to create a new virtual environment</string>
        </property>
        <property name="text">
         <string>New...</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
       <widget class="Line" name="line_6">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="editButton">
+      <widget class="QToolButton" name="editButton">
        <property name="toolTip">
         <string>Press to edit the selected virtual environment</string>
        </property>
@@ -102,85 +109,73 @@
      <item>
       <widget class="Line" name="line_3">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="removeButton">
+      <widget class="QToolButton" name="removeButton">
        <property name="toolTip">
         <string>Press to remove the selected virtual environments</string>
        </property>
        <property name="text">
         <string>Remove</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="removeAllButton">
+      <widget class="QToolButton" name="removeAllButton">
        <property name="toolTip">
         <string>Press to remove all virtual environments</string>
        </property>
        <property name="text">
         <string>Remove All</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
       <widget class="Line" name="line_4">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="deleteButton">
+      <widget class="QToolButton" name="deleteButton">
        <property name="toolTip">
         <string>Press to remove the selected virtual environments and delete them</string>
        </property>
        <property name="text">
         <string>Delete</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="deleteAllButton">
+      <widget class="QToolButton" name="deleteAllButton">
        <property name="toolTip">
         <string>Press to remove all virtual environments and delete them</string>
        </property>
        <property name="text">
         <string>Delete All</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
-      <spacer name="verticalSpacer_3">
+      <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>20</width>
-         <height>228</height>
+         <width>40</width>
+         <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -207,7 +202,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
--- a/eric7/eric7.py	Tue Sep 14 19:58:41 2021 +0200
+++ b/eric7/eric7.py	Wed Sep 15 19:57:41 2021 +0200
@@ -426,3 +426,4 @@
 # TODO: make VCS status an embedded view (left side)
 # TODO: add a VCS diff view in the central area (view manager) (?)
 # TODO: add virtual environment manager as embedded view (right side)
+# TODO: add file search/replace as embedded view (left side)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/icons/breeze-dark/minus_3.svg	Wed Sep 15 19:57:41 2021 +0200
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 22 22"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="minus_3.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1595"
+     inkscape:window-height="870"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="22.98"
+     inkscape:cx="9.8889522"
+     inkscape:cy="9.2831558"
+     inkscape:window-x="92"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs4">
+    <style
+       type="text/css"
+       id="style2">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+  </defs>
+  <g
+     id="g873"
+     transform="translate(-10)">
+    <path
+       class="ColorScheme-Text"
+       d="m 12,14 v 2 h 10 v -2 z"
+       fill="currentColor"
+       id="path6-36"
+       style="color:#eff0f1" />
+    <path
+       class="ColorScheme-Text"
+       d="m 16,10 v 2 h 10 v -2 z"
+       fill="currentColor"
+       id="path6-5"
+       style="color:#eff0f1" />
+    <path
+       class="ColorScheme-Text"
+       d="M 20,6 V 8 H 30 V 6 Z"
+       fill="currentColor"
+       id="path6-35"
+       style="color:#eff0f1" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/icons/breeze-light/minus_3.svg	Wed Sep 15 19:57:41 2021 +0200
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 22 22"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="minus_3.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1595"
+     inkscape:window-height="870"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="22.98097"
+     inkscape:cx="9.8889522"
+     inkscape:cy="9.2831558"
+     inkscape:window-x="92"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <defs
+     id="defs4">
+    <style
+       type="text/css"
+       id="style2">.ColorScheme-Text {
+        color:#232629;
+      }</style>
+  </defs>
+  <g
+     id="g46"
+     transform="translate(0,2)">
+    <path
+       class="ColorScheme-Text"
+       d="M 10,4 V 6 H 20 V 4 Z"
+       fill="currentColor"
+       id="path6" />
+    <path
+       class="ColorScheme-Text"
+       d="m 6,8 v 2 H 16 V 8 Z"
+       fill="currentColor"
+       id="path6-3"
+       style="color:#232629" />
+    <path
+       class="ColorScheme-Text"
+       d="m 2,12 v 2 h 10 v -2 z"
+       fill="currentColor"
+       id="path6-6"
+       style="color:#232629" />
+  </g>
+</svg>
Binary file eric7/icons/oxygen/minus_3.png has changed
eric7/VirtualEnv/VirtualenvManagerDialog.py		file \| annotate \| diff \| comparison \| revisions
eric7/VirtualEnv/VirtualenvManagerDialog.ui		file \| annotate \| diff \| comparison \| revisions
eric7/eric7.py		file \| annotate \| diff \| comparison \| revisions
eric7/icons/breeze-dark/minus_3.svg		file \| annotate \| diff \| comparison \| revisions
eric7/icons/breeze-light/minus_3.svg		file \| annotate \| diff \| comparison \| revisions
eric7/icons/oxygen/minus_3.png		file \| annotate \| diff \| comparison \| revisions