2 Commits

Author SHA1 Message Date
YourKalamity
3466ef5b35 Change default DSi version 2020-12-20 12:28:23 +00:00
Kalam :p
6df97b1e32 Update executables.yml 2020-12-19 23:42:10 +00:00
2 changed files with 9 additions and 3 deletions

View File

@@ -83,7 +83,7 @@ jobs:
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
- name: Create executable
run: |
pyinstaller --onefile --add-data "colour.py:." --add-data "tkmacosx:tkmacosx" --add-data "Darwin:Darwin" --add-data "certifi:certifi" --add-data "requests:requests" --add-data "urllib3:urllib3" --add-data "lazy.ico:." --add-data "chardet:chardet" --icon "lazy.ico" --console --name "lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS" main.py
pyinstaller --onefile --add-data "colour.py:." --add-data "tkmacosx:tkmacosx" --add-data "Darwin:Darwin" --add-binary "Darwin/7za:Darwin" --add-data "certifi:certifi" --add-data "requests:requests" --add-data "urllib3:urllib3" --add-data "lazy.ico:." --add-data "chardet:chardet" --icon "lazy.ico" --console --name "lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS" main.py
cd dist
chmod +x lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS
zip ../lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS.zip lazy-dsi-file-downloader-${{ steps.vars.outputs.tag }}-macOS

10
main.py
View File

@@ -467,6 +467,10 @@ def summonWindow1():
selector["menu"].config(bg=buttonColour,fg=foregroundColour,font=(buttonFont))
selector.grid(column=0,row=5,sticky="w")
if platform.system() == "Darwin":
macOS_hiddentext = tkinter.Label(topFrame, text = "(Click the area above this text\n if you can't see the drop down menu) ",fg=foregroundColour,font=(bodyFont))
macOS_hiddentext.grid(column=0,row=6, sticky="w")
backButton = Button(bottomFrame,text="Back", font=(buttonFont),fg=foregroundColour,bg=backButtonColour,command=lambda: [topFrame.destroy(),bottomFrame.destroy(),summonWindow0()], width=button_width)
backButton.pack(side=tkinter.LEFT)
nextButton = Button(bottomFrame, text="Next",width=button_width, fg=foregroundColour,bg=nextButtonColour, font=(buttonFont),command=lambda:[topFrame.destroy(),bottomFrame.destroy(),summonWindow2()])
@@ -593,6 +597,8 @@ if __name__ == "__main__":
print("This program will ONLY work on Python 3 and above")
sys.exit()
os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
root = tkinter.Tk()
window = tkinter.Toplevel(root)
root.withdraw()
@@ -607,7 +613,7 @@ if __name__ == "__main__":
#TKinter Vars
downloadmemorypit = tkinter.IntVar(value=1)
firmwareVersion = tkinter.StringVar()
firmwareVersion.set(dsiVersions[0])
firmwareVersion.set(dsiVersions[1])
downloadtwlmenu = tkinter.IntVar(value=1)
downloaddumptool = tkinter.IntVar(value=1)
unlaunch = tkinter.IntVar(value=0)
@@ -661,7 +667,7 @@ if __name__ == "__main__":
else: #Non Jeve Stobs worshippers
from tkinter import Button
from tkmacosx import Button
backgroundColour = "#252a34"
foregroundColour = "white"
buttonColour = "#7289DA"