Compare commits

..

4 Commits

Author SHA1 Message Date
Profitroll
8b9119afa9 Changed empty saved behavior 2023-01-27 12:18:10 +01:00
Profitroll
4f8e60ace2 Ignore updated 2023-01-27 12:17:53 +01:00
Profitroll
cd6b6599c5 Build tasks updated 2023-01-27 12:17:46 +01:00
Profitroll
29d84082f1 Paths updated 2023-01-27 12:17:33 +01:00
6 changed files with 31 additions and 8 deletions

4
.gitignore vendored
View File

@@ -166,3 +166,7 @@ cython_debug/
*.vsix
# Project
venv
buildif
buildenv
sv_ttk

18
.vscode/tasks.json vendored
View File

@@ -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
View 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
View File

@@ -0,0 +1 @@
cd .\dist\main && .\main.exe

View File

@@ -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

View File

@@ -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")