Skip to content

Commit b591964

Browse files
committed
Changed icons folder to assets
1 parent 77f963e commit b591964

File tree

7 files changed

+6
-8
lines changed

7 files changed

+6
-8
lines changed
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Icon from: https://icons8.com/icon/17947/crafting-table
1+
Icon from: https://icons8.com/icon/17947/crafting-table
22
by Icons8: https://icons8.com
File renamed without changes.

build.spec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ else:
1717

1818
main_datas = [
1919
("assets", "assets"),
20-
("icon.ico", "."),
21-
("icon.png", "."),
2220
("icon_viewer.ico", "."),
23-
("icon_viewer.png", "."),
24-
("icon2.png", ".")
21+
("icon_viewer.png", ".")
2522
]
2623
main_hiddenimports = ["PIL", "PIL._imagingtk", "PIL._tkinter_finder", "pkg_resources.extern"]
2724

@@ -54,7 +51,7 @@ main_exe = EXE( # type: ignore
5451
target_arch=None,
5552
codesign_identity=None,
5653
entitlements_file=None,
57-
icon='./icon.ico'
54+
icon='./assets/icon.ico'
5855
)
5956

6057
py3dst_hiddenimports = ["PIL", "PIL._imagingtk", "PIL._tkinter_finder", "pkg_resources.extern"]

release_type.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
release

src/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ def __init__(self):
216216
self.globalVars.running = "exe"
217217
self.globalVars.appPath = Path(sys._MEIPASS)
218218
self.globalVars.assetsPath = Path(sys._MEIPASS).joinpath("assets")
219-
self.globalVars.iconPath = Path(sys._MEIPASS)
219+
self.globalVars.iconPath = self.globalVars.assetsPath
220220
self.globalVars.runningDir = Path(os.path.dirname(sys.executable))
221221
elif __file__:
222222
self.globalVars.running = "src"
223223
self.globalVars.appPath = Path(os.path.dirname(__file__))
224224
self.globalVars.assetsPath = Path(os.path.dirname(__file__)).parent.joinpath("assets")
225-
self.globalVars.iconPath = Path(os.path.dirname(__file__)).parent
225+
self.globalVars.iconPath = self.globalVars.assetsPath
226226
self.globalVars.runningDir = Path(os.path.dirname(__file__))
227227

228228
# ----------------------------------------------------------------------

0 commit comments

Comments
 (0)