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 b8fe4d1bf5..ccccfef75d 100644 Binary files a/src/Gui/Icons/freecad-doc.png and b/src/Gui/Icons/freecad-doc.png differ diff --git a/src/Gui/Icons/freecad-doc.svg b/src/Gui/Icons/freecad-doc.svg index 4a43066f03..9d2f52b331 100644 --- a/src/Gui/Icons/freecad-doc.svg +++ b/src/Gui/Icons/freecad-doc.svg @@ -10,65 +10,113 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="64" - height="64" - id="svg4427" - version="1.1" - inkscape:version="0.48.5 r10040" + width="48px" + height="48px" + id="svg4198" + sodipodi:version="0.32" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="freecad-doc.svg" - inkscape:export-filename="/Users/James/Desktop/MPlayer.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + 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):