Compare commits
4 Commits
d844d182f6
...
8b9119afa9
Author | SHA1 | Date | |
---|---|---|---|
|
8b9119afa9 | ||
|
4f8e60ace2 | ||
|
cd6b6599c5 | ||
|
29d84082f1 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -166,3 +166,7 @@ cython_debug/
|
||||
*.vsix
|
||||
|
||||
# Project
|
||||
venv
|
||||
buildif
|
||||
buildenv
|
||||
sv_ttk
|
18
.vscode/tasks.json
vendored
18
.vscode/tasks.json
vendored
@@ -6,7 +6,23 @@
|
||||
{
|
||||
"label": "Clean up",
|
||||
"type": "shell",
|
||||
"command": ".\\.vscode\\tasks\\cleanup.bat",
|
||||
"command": "./.vscode/tasks/cleanup.bat",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build",
|
||||
"type": "shell",
|
||||
"command": "./.vscode/tasks/build.bat",
|
||||
"problemMatcher": [],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Test EXE",
|
||||
"type": "shell",
|
||||
"command": "./.vscode/tasks/test_exe.bat",
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
|
1
.vscode/tasks/build.bat
vendored
Normal file
1
.vscode/tasks/build.bat
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.\buildenv\scripts\activate && pyinstaller main.py --noconfirm --add-data assets;assets --add-data sv_ttk;sv_ttk
|
1
.vscode/tasks/test_exe.bat
vendored
Normal file
1
.vscode/tasks/test_exe.bat
vendored
Normal file
@@ -0,0 +1 @@
|
||||
cd .\dist\main && .\main.exe
|
@@ -74,7 +74,7 @@ class App(ThemedTk):
|
||||
if self.frame_saves_saves.status_code == 200 and isinstance(self.frame_saves_saves.json(), list) is True and len(self.frame_saves_saves.json()) > 0:
|
||||
self.frame_saves_object = FrameSaves(self, self.frame_saves_saves.json(), vscroll=True)
|
||||
else:
|
||||
self.frame_saves_object = FrameSavesEmpty(self)
|
||||
self.frame_saves_object = FrameSaves(self, [], vscroll=True)
|
||||
self.frame_saves_object.grid(column=1, row=0, sticky=NSEW)
|
||||
return
|
||||
|
||||
|
@@ -234,12 +234,13 @@ class ToplevelWelcome(ThemedToplevel):
|
||||
|
||||
def stage_location_select_location(self, entry: ttk.Entry):
|
||||
|
||||
if path.exists(path.join(str(getenv("APPDATA")), "Stardew Valley")):
|
||||
self.path_start = path.join(str(getenv("APPDATA")), "Stardew Valley")
|
||||
elif path.exists(path.join(path.expanduser("~"), ".config", "Stardew Valley")):
|
||||
self.path_start = path.join(path.expanduser("~"), ".config", "Stardew Valley")
|
||||
else:
|
||||
self.path_start = None
|
||||
self.path_start = None
|
||||
|
||||
for guess in [ [str(getenv("APPDATA")), "Stardew Valley"], [str(getenv("APPDATA")), "StardewValley"], [path.expanduser("~"), ".config", "Stardew Valley"], [path.expanduser("~"), ".config", "StardewValley"] ]:
|
||||
joined_path = path.join(*guess)
|
||||
if path.exists(joined_path):
|
||||
self.path_start = joined_path
|
||||
break
|
||||
|
||||
self.path_dir = filedialog.askdirectory(initialdir=self.path_start, title="Select Stardew Valley Saves folder")
|
||||
|
||||
|
Reference in New Issue
Block a user