mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Use different icon formats depending on OS
Contributes to CURA-9365
This commit is contained in:
parent
3e67566aad
commit
ffca22971e
3 changed files with 9 additions and 3 deletions
|
|
@ -66,7 +66,10 @@
|
||||||
- "."
|
- "."
|
||||||
- "../uranium"
|
- "../uranium"
|
||||||
- "../libcharon"
|
- "../libcharon"
|
||||||
icon: "./icons/Cura.ico"
|
icon:
|
||||||
|
Windows: "./icons/Cura.ico"
|
||||||
|
Macos: "./icons/cura.icns"
|
||||||
|
Linux: ".icons/cura-128.png"
|
||||||
"5.1.0-CURA-9365":
|
"5.1.0-CURA-9365":
|
||||||
conan:
|
conan:
|
||||||
curaengine: "curaengine/latest@ultimaker/cura-9365"
|
curaengine: "curaengine/latest@ultimaker/cura-9365"
|
||||||
|
|
@ -135,4 +138,7 @@
|
||||||
- "."
|
- "."
|
||||||
- "../uranium"
|
- "../uranium"
|
||||||
- "../libcharon"
|
- "../libcharon"
|
||||||
icon: "./icons/Cura.ico"
|
icon:
|
||||||
|
Windows: "./icons/Cura.ico"
|
||||||
|
Macos: "./icons/cura.icns"
|
||||||
|
Linux: ".icons/cura-128.png"
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ class CuraConan(ConanFile):
|
||||||
hiddenimports = pyinstaller_metadata["hiddenimports"],
|
hiddenimports = pyinstaller_metadata["hiddenimports"],
|
||||||
collect_all = pyinstaller_metadata["collect_all"],
|
collect_all = pyinstaller_metadata["collect_all"],
|
||||||
pathex = pathex,
|
pathex = pathex,
|
||||||
icon = str(Path(self.source_folder, pyinstaller_metadata["icon"]))
|
icon = pyinstaller_metadata["icon"][str(self.settings.os)]
|
||||||
))
|
))
|
||||||
|
|
||||||
def layout(self):
|
def layout(self):
|
||||||
|
|
|
||||||
BIN
icons/cura.icns
BIN
icons/cura.icns
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue