kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

AddonManager: Better icons

Browse Source
This commit is contained in:
Yorik van Havre
2019-09-04 18:26:56 -03:00
parent 8de92d25c9
commit d122d72c8d
6 changed files with 1684 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

831
src/Gui/Icons/document-package.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

497
src/Gui/Icons/document-python.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/Gui/Icons/freecad-doc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

626
src/Gui/Icons/freecad-doc.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

4
src/Gui/Icons/resource.qrc
View File

@@ -189,6 +189,9 @@
<file>LinkSelectAll.svg</file>
<file>Unlink.svg</file>
<file>Invisible.svg</file>
<file>folder.svg</file>
<file>document-python.svg</file>
<file>document-package.svg</file>
</qresource>
<!-- Alternative directory names for icons that should be loaded from a theme -->
<!-- See also http://permalink.gmane.org/gmane.comp.lib.qt.general/26374 -->
@@ -277,6 +280,5 @@
<file>DrawStyleShaded.svg</file>
<file>DrawStyleWireFrame.svg</file>
<file>user.svg</file>
<file>folder.svg</file>
</qresource>
</RCC>

12
src/Mod/AddonManager/AddonManager.py
View File

@@ -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):