Skip to content

Version 0.1.3 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PostScriptReal merged 5 commits into from
Mar 25, 2025
Merged

Version 0.1.3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1af36cd
Update MDLDec to latest version
PostScriptReal Mar 24, 2025
1eff9e4
Scaling issues are sorta fixed (+ more)
PostScriptReal Mar 24, 2025
5fe6c68
Damnit the script folder is gone
PostScriptReal Mar 24, 2025
74872dd
Fix auto scaling
PostScriptReal Mar 25, 2025
3324af9
More GUI fixes
PostScriptReal Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pyinstaller-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
pip install tksvg
- name: Run PyInstaller
run: |
pyinstaller --noconfirm --onedir --console --name "Snark" --add-data "version.txt:." --add-data "activities.txt:." --add-data "icon-linux.svg:." --add-data "logo128.png:." --add-data "icon-win32.ico:." --add-data "icon-linux.png:." --add-data "LICENSE:." --add-data "README.md:." --add-data "save:save/" --add-data "scripts:scripts/" --add-data "themes:themes/" --add-data "third_party:third_party/" --add-data "images:images/" --add-data "logs:logs/" "GUI.py"
pyinstaller --noconfirm --onedir --console --name "Snark" --add-data "version.txt:." --add-data "activities.txt:." --add-data "icon-linux.svg:." --add-data "logo128.png:." --add-data "icon-win32.ico:." --add-data "icon-linux.png:." --add-data "LICENSE:." --add-data "README.md:." --add-data "save:save/" --add-data "themes:themes/" --add-data "third_party:third_party/" --add-data "images:images/" --add-data "logs:logs/" "GUI.py"
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyinstaller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
pip install jsoncparser
- name: Run PyInstaller
run: |
pyinstaller --noconfirm --onedir --console --name "Snark" --add-data "version.txt:." --add-data "activities.txt:." --add-data "logo128.png:." --add-data "icon-win32.ico:." --add-data "icon-linux.png:." --add-data "LICENSE:." --add-data "README.md:." --add-data "save:save/" --add-data "scripts:scripts/" --add-data "themes:themes/" --add-data "third_party:third_party/" --add-data "images:images/" --add-data "logs:logs/" "GUI.py"
pyinstaller --noconfirm --onedir --console --name "Snark" --add-data "version.txt:." --add-data "activities.txt:." --add-data "logo128.png:." --add-data "icon-win32.ico:." --add-data "icon-linux.png:." --add-data "LICENSE:." --add-data "README.md:." --add-data "save:save/" --add-data "themes:themes/" --add-data "third_party:third_party/" --add-data "images:images/" --add-data "logs:logs/" "GUI.py"
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,4 @@ cython_debug/
back.bmp
Snark.code-workspace
*.mdl
scripts/
119 changes: 79 additions & 40 deletions GUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(self):
self.devMode = False
# Flag specifically for Snark, scripts are currently not implemented yet and is a copy of the scripting system from SMD Tools v1.1
# This will allow me to disable the functionality for it until I come up with a proper implementation
self.allowScripts = True
self.allowScripts = False
# Another flag for Snark, it disables booting to the "games" menu and makes the menu show a "This menu will be completed soon" message
# instead of showing the (very much) incomplete menu
self.allowGames = True
Expand Down Expand Up @@ -426,32 +426,61 @@ def __init__(self):
if winSizeFile and not ws[0] == "":
self.goodWidth = int(ws[0].replace("\n", ""))
else:
self.update()
self.goodWidth = self.winfo_width()
# self.dumbFixMenu5.grid(column=0, row=2, sticky="nsew", columnspan=10)

self.optMenu = OptionsMenu(self.dumbFixMenu3, thCol, self.changeTheme, self.updateOpt, True)
self.setupMenu = SetupMenu(menu, thCol, self.updateGames)
self.compSetMenu = CompSetupMenu(self.dumbFixMenu4, thCol, self.updateComps, self.flags.allowGames)
self.decMenu = DecompMenu(menu, thCol, True)
self.cmpMenu = CompMenu(self.dumbFixMenu, thCol, True)
self.abtMenu = AboutMenu(self.dumbFixMenu2, thCol, True)
self.scrMenu = ScriptMenu(self.dumbFixMenu5, thCol, False)
print(self.goodWidth)

self.mTemplate = MenuTemp(thCol, self.goodWidth)

self.dumbFixMenu3.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.optMenu = OptionsMenu(self.mTemplate, self.dumbFixMenu3, self.changeTheme, self.updateOpt, True)
self.dumbFixMenu3.grid_remove()

self.setupMenu = SetupMenu(self.mTemplate, menu, self.updateGames)

self.dumbFixMenu4.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.compSetMenu = CompSetupMenu(self.mTemplate, self.dumbFixMenu4, self.updateComps, self.flags.allowGames)
self.dumbFixMenu4.grid_remove()

self.decMenu = DecompMenu(self.mTemplate, menu, True)

self.dumbFixMenu.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.cmpMenu = CompMenu(self.mTemplate, self.dumbFixMenu, False)
if winSizeFile:
self.dumbFixMenu.grid_remove()
self.cmpMenu.hidden = True

self.dumbFixMenu2.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.abtMenu = AboutMenu(self.mTemplate, self.dumbFixMenu2, True)
self.dumbFixMenu2.grid_remove()

if self.flags.allowScripts:
self.dumbFixMenu5.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.scrMenu = ScriptMenu(self.mTemplate, self.dumbFixMenu5, True)
self.dumbFixMenu5.grid_remove()
# Getting the maximum height
self.update_idletasks()
if not self.scrMenu.hidden:
self.goodHeight = self.winfo_height()
if not self.cmpMenu.hidden or winSizeFile:
if winSizeFile and not ws[1] == "":
self.goodHeight = int(ws[1].replace("\n", ""))
else:
self.update()
self.goodHeight = self.winfo_reqheight()
# Switching back to the setup menu
self.cmpMenu.hide()
self.dumbFixMenu.grid_remove()
self.setupMenu.show()
self.update()
print(self.goodHeight)
# Switching back to the setup menu
self.scrMenu.hide()
self.update_idletasks()
self.dumbFixMenu5.grid_remove()
self.setupMenu.show()
self.update_idletasks()

if sys.platform == 'linux':
self.geometry(f"{self.goodWidth}x491")
self.geometry(f"{self.goodWidth}x{self.goodHeight}")
else:
self.geometry("501x443")

if not os.path.exists("save/WinSize.txt"):
wsf = open("save/WinSize.txt", "w")
wsf.write(f"{self.goodWidth}\n{self.goodHeight}")
wsf.close()


# Applying theme
Expand Down Expand Up @@ -581,7 +610,8 @@ def about(self):
self.cmpMenu.hide()
self.decMenu.hide()
self.optMenu.hide()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()

def updateOpt(self, key, val):
self.setupMenu.updateOpt(key, val)
Expand All @@ -590,7 +620,8 @@ def updateOpt(self, key, val):
self.cmpMenu.updateOpt(key, val)
self.decMenu.updateOpt(key, val)
self.optMenu.updateOpt(key, val)
self.scrMenu.updateOpt(key, val)
if self.flags.allowScripts:
self.scrMenu.updateOpt(key, val)

def updateGames(self, comp):
self.cmpMenu.updateGames(comp)
Expand All @@ -611,7 +642,8 @@ def optionsMenu(self):
self.cmpMenu.hide()
self.decMenu.hide()
self.optMenu.show()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()

def openfile(self):
startDir = self.options["startFolder"]
Expand Down Expand Up @@ -647,7 +679,8 @@ def bd_menu(self):
self.compSetMenu.hide()
self.abtMenu.hide()
self.optMenu.hide()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()

def cmpSetupMenu(self):
if self.compSetMenu.hidden:
Expand All @@ -662,7 +695,8 @@ def cmpSetupMenu(self):
self.setupMenu.hide()
self.abtMenu.hide()
self.optMenu.hide()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()


""" Switches menu to Decompile Menu """
Expand All @@ -679,7 +713,8 @@ def mnc_menu(self):
self.abtMenu.hide()
self.optMenu.hide()
self.compSetMenu.hide()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()

""" Switches menu to Compile Menu """
def cmp_menu(self):
Expand All @@ -695,23 +730,27 @@ def cmp_menu(self):
self.decMenu.hide()
self.abtMenu.hide()
self.optMenu.hide()
self.scrMenu.hide()
if self.flags.allowScripts:
self.scrMenu.hide()
# print(f"width: {self.winfo_width()} height: {self.winfo_height()}")

def scripts(self):
if self.scrMenu.hidden:
self.setupMenu.hide()
self.compSetMenu.hide()
self.dumbFixMenu.grid_remove()
self.dumbFixMenu2.grid_remove()
self.dumbFixMenu3.grid_remove()
self.dumbFixMenu4.grid_remove()
self.dumbFixMenu5.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.cmpMenu.hide()
self.decMenu.hide()
self.abtMenu.hide()
self.optMenu.hide()
self.scrMenu.show()
if self.flags.allowScripts:
if self.scrMenu.hidden:
self.setupMenu.hide()
self.compSetMenu.hide()
self.dumbFixMenu.grid_remove()
self.dumbFixMenu2.grid_remove()
self.dumbFixMenu3.grid_remove()
self.dumbFixMenu4.grid_remove()
self.dumbFixMenu5.grid(column=0, row=2, sticky="nsew", columnspan=10)
self.cmpMenu.hide()
self.decMenu.hide()
self.abtMenu.hide()
self.optMenu.hide()
self.scrMenu.show()
else:
a = ScriptWin()

def exec_script(self, script):
# Script parsing and execution function
Expand Down
Loading