From d122d72c8df300ab48eeb2431490b98c65786243 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Wed, 4 Sep 2019 18:26:56 -0300 Subject: [PATCH] AddonManager: Better icons --- src/Gui/Icons/document-package.svg | 831 +++++++++++++++++++++++++++ src/Gui/Icons/document-python.svg | 497 ++++++++++++++++ src/Gui/Icons/freecad-doc.png | Bin 3239 -> 3489 bytes src/Gui/Icons/freecad-doc.svg | 626 +++++++++++--------- src/Gui/Icons/resource.qrc | 4 +- src/Mod/AddonManager/AddonManager.py | 12 +- 6 files changed, 1684 insertions(+), 286 deletions(-) create mode 100644 src/Gui/Icons/document-package.svg create mode 100644 src/Gui/Icons/document-python.svg diff --git a/src/Gui/Icons/document-package.svg b/src/Gui/Icons/document-package.svg new file mode 100644 index 0000000000..370abc9f77 --- /dev/null +++ b/src/Gui/Icons/document-package.svg @@ -0,0 +1,831 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-10-15 + + + Andreas Nilsson + + + + + edit + copy + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/document-python.svg b/src/Gui/Icons/document-python.svg new file mode 100644 index 0000000000..bd67c19d1b --- /dev/null +++ b/src/Gui/Icons/document-python.svg @@ -0,0 +1,497 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-10-15 + + + Andreas Nilsson + + + + + edit + copy + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/freecad-doc.png b/src/Gui/Icons/freecad-doc.png index b8fe4d1bf598dfcfec8a7ae9e416258f71ace371..ccccfef75dd5d6dc99c7978efd9a28c0444a0d97 100644 GIT binary patch delta 3428 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 + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1" + inkscape:export-filename="/home/yorik/Sources/FreeCAD/src/Gui/Icons/freecad-doc.png" + inkscape:export-xdpi="128" + inkscape:export-ydpi="128"> + id="defs4200"> + id="linearGradient15218"> + style="stop-color:#f0f0ef;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop15220" /> + id="stop2269" + offset="0.59928656" + style="stop-color:#e8e8e8;stop-opacity:1;" /> + + + inkscape:collect="always" + id="linearGradient2259"> + id="stop2261" /> + id="stop2263" /> - + + + + - - - + - - + id="linearGradient2251"> + + + + + + + style="stop-color:#204a87;stop-opacity:1" /> + style="stop-color:#729fcf;stop-opacity:1" /> @@ -127,277 +175,297 @@ inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective3148-5" /> - + + + + + - - - - - - - - - - + y2="26.520763" + x2="-157.32494" + y1="58.261547" + x1="-146.74467" + id="linearGradient3808" + xlink:href="#linearGradient3864-9" + inkscape:collect="always" /> + id="linearGradient5060" + inkscape:collect="always"> + style="stop-color:black;stop-opacity:1;" /> + style="stop-color:black;stop-opacity:0;" /> + + + + + + + + + + + + + + + + + + + + + + + + + - - + inkscape:window-y="0" + inkscape:showpageshadow="false" + inkscape:window-maximized="1" /> + id="metadata4203"> image/svg+xml - + + 2005-10-15 + + + Andreas Nilsson + + + + + edit + copy + + + + + + Jakub Steiner + + + + + + + + + + - - - - - - - - - - - - - - - - diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index 4765f6d170..fe4fefdf81 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -189,6 +189,9 @@ LinkSelectAll.svg Unlink.svg Invisible.svg + folder.svg + document-python.svg + document-package.svg @@ -277,6 +280,5 @@ DrawStyleShaded.svg DrawStyleWireFrame.svg user.svg - folder.svg diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py index ddb6ee5e49..e27621d3d7 100644 --- a/src/Mod/AddonManager/AddonManager.py +++ b/src/Mod/AddonManager/AddonManager.py @@ -263,7 +263,7 @@ class CommandAddonManager: import AddonManager_rc addonicon = QtGui.QIcon(":/icons/" + addon_repo[0] + "_workbench_icon.svg") if addonicon.isNull(): - addonicon = QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg")) + addonicon = QtGui.QIcon(":/icons/document-package.svg") if addon_repo[2] > 0: item = QtGui.QListWidgetItem(addonicon,str(addon_repo[0]) + str(" ("+translate("AddonsInstaller","Installed")+")")) item.setForeground(QtGui.QBrush(QtGui.QColor(0,182,41))) @@ -368,7 +368,7 @@ class CommandAddonManager: import AddonManager_rc addonicon = QtGui.QIcon(":/icons/" + macro.name.replace(" ","_") + "_macro_icon.svg") if addonicon.isNull(): - addonicon = QtGui.QIcon(":/icons/applications-python.svg") + addonicon = QtGui.QIcon(":/icons/document-python.svg") if macro.is_installed(): item = QtGui.QListWidgetItem(addonicon, macro.name + str(' (Installed)')) item.setForeground(QtGui.QBrush(QtGui.QColor(0,182,41))) @@ -523,7 +523,7 @@ class CommandAddonManager: self.dialog.listWorkbenches.item(i).setText(txt+ext) else: self.dialog.listWorkbenches.item(i).setText(txt) - self.dialog.listWorkbenches.item(i).setIcon(QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg"))) + self.dialog.listWorkbenches.item(i).setIcon(QtGui.QIcon(":/icons/document-package.svg")) for i in range(self.dialog.listMacros.count()): txt = self.dialog.listMacros.item(i).text().strip() if txt.endswith(" ("+translate("AddonsInstaller","Installed")+")"): @@ -534,7 +534,7 @@ class CommandAddonManager: self.dialog.listMacros.item(i).setText(txt+ext) else: self.dialog.listMacros.item(i).setText(txt) - self.dialog.listMacros.item(i).setIcon(QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg"))) + self.dialog.listMacros.item(i).setIcon(QtGui.QIcon(":/icons/document-package.svg")) else: self.dialog.listWorkbenches.clear() self.dialog.listMacros.clear() @@ -543,13 +543,13 @@ class CommandAddonManager: self.dialog.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/button_valid.svg"),str(wb[0]) + " ("+translate("AddonsInstaller","Installed")+")")) wb[2] = 1 else: - self.dialog.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/applications-python.svg"),str(wb[0]))) + self.dialog.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/document-python.svg"),str(wb[0]))) wb[2] = 0 for macro in self.macros: if macro.is_installed(): self.dialog.listMacros.addItem(item) else: - self.dialog.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/applications-python.svg"),+macro.name)) + self.dialog.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/document-python.svg"),+macro.name)) def mark(self,repo):