diff --git a/boiiiwd_package/resources/sett4.png b/boiiiwd_package/resources/sett4.png deleted file mode 100644 index 94f5299..0000000 Binary files a/boiiiwd_package/resources/sett4.png and /dev/null differ diff --git a/boiiiwd_package/resources/sett5.png b/boiiiwd_package/resources/sett5.png deleted file mode 100644 index d22bfc3..0000000 Binary files a/boiiiwd_package/resources/sett5.png and /dev/null differ diff --git a/boiiiwd_package/resources/sett6.png b/boiiiwd_package/resources/sett6.png deleted file mode 100644 index 79b4cbf..0000000 Binary files a/boiiiwd_package/resources/sett6.png and /dev/null differ diff --git a/boiiiwd_package/resources/sett7.png b/boiiiwd_package/resources/sett7.png deleted file mode 100644 index c232b81..0000000 Binary files a/boiiiwd_package/resources/sett7.png and /dev/null differ diff --git a/boiiiwd_package/resources/sett8.png b/boiiiwd_package/resources/sett8.png deleted file mode 100644 index fcf256d..0000000 Binary files a/boiiiwd_package/resources/sett8.png and /dev/null differ diff --git a/boiiiwd_package/src/helpers.py b/boiiiwd_package/src/helpers.py index 30af1aa..738421c 100644 --- a/boiiiwd_package/src/helpers.py +++ b/boiiiwd_package/src/helpers.py @@ -353,7 +353,7 @@ def get_item_name(id): # you gotta use my modded CTkToolTip originaly by Akascape def show_noti(widget ,message, event=None, noti_dur=3.0, topmost=False): - ctk_tooltip.CTkToolTip(widget, message=message, is_noti=True, noti_event=event, noti_dur=noti_dur, topmost=topmost) + CTkToolTip(widget, message=message, is_noti=True, noti_event=event, noti_dur=noti_dur, topmost=topmost) def check_item_date(down_date, date_updated): current_year = datetime.now().year diff --git a/boiiiwd_package/src/imports.py b/boiiiwd_package/src/imports.py index ec924fa..02bb496 100644 --- a/boiiiwd_package/src/imports.py +++ b/boiiiwd_package/src/imports.py @@ -23,8 +23,8 @@ from CTkMessagebox import CTkMessagebox from PIL import Image # Use CTkToolTip and CTkListbox from my repo originally by Akascape (https://github.com/Akascape) -from .CTkListbox import ctk_listbox -from .CTkToolTip import ctk_tooltip +from .CTkListbox.ctk_listbox import CTkListbox +from .CTkToolTip.ctk_tooltip import CTkToolTip if getattr(sys, 'frozen', False): diff --git a/boiiiwd_package/src/library_tab.py b/boiiiwd_package/src/library_tab.py index b6e2eaf..b6dcafc 100644 --- a/boiiiwd_package/src/library_tab.py +++ b/boiiiwd_package/src/library_tab.py @@ -24,8 +24,8 @@ class LibraryTab(ctk.CTkScrollableFrame): self.update_button = ctk.CTkButton(self, image=ctk.CTkImage(Image.open(update_button_image)), command=self.check_for_updates, width=65, height=20, text="", fg_color="transparent") self.update_button.grid(row=0, column=1, padx=(0, 20), pady=(10, 20), sticky="en") - self.update_tooltip = ctk_tooltip.CTkToolTip(self.update_button, message="Check items for updates", topmost=True) - filter_tooltip = ctk_tooltip.CTkToolTip(self.filter_refresh_button, message="Refresh library", topmost=True) + self.update_tooltip = CTkToolTip(self.update_button, message="Check items for updates", topmost=True) + filter_tooltip = CTkToolTip(self.filter_refresh_button, message="Refresh library", topmost=True) self.label_list = [] self.button_list = [] self.button_view_list = [] @@ -42,8 +42,8 @@ class LibraryTab(ctk.CTkScrollableFrame): button_view = ctk.CTkButton(self, text="Details", width=55, height=24, fg_color="#3d3f42") button.configure(command=lambda: self.remove_item(item, folder, workshop_id)) button_view.configure(command=lambda: self.show_map_info(workshop_id, invalid_warn)) - button_view_tooltip = ctk_tooltip.CTkToolTip(button_view, message="Opens up a window that shows basic details") - button_tooltip = ctk_tooltip.CTkToolTip(button, message="Removes the map/mod from your game") + button_view_tooltip = CTkToolTip(button_view, message="Opens up a window that shows basic details") + button_tooltip = CTkToolTip(button, message="Removes the map/mod from your game") label.grid(row=len(self.label_list) + 1, column=0, pady=(0, 10), padx=(5, 10), sticky="w") button.grid(row=len(self.button_list) + 1, column=1, pady=(0, 10), padx=(50, 10), sticky="e") button_view.grid(row=len(self.button_view_list) + 1, column=1, pady=(0, 10), padx=(10, 75), sticky="w") @@ -57,7 +57,7 @@ class LibraryTab(ctk.CTkScrollableFrame): label.bind("", lambda event: self.open_folder_location(folder, event)) label.bind("", lambda event, label=label: self.copy_to_clipboard(label, folder, event)) if invalid_warn: - label_warn = ctk_tooltip.CTkToolTip(label, message="Duplicated or Blocked item (Search item id in search)") + label_warn = CTkToolTip(label, message="Duplicated or Blocked item (Search item id in search)") def on_label_hover(self, label, enter): if enter: @@ -569,7 +569,7 @@ class LibraryTab(ctk.CTkScrollableFrame): update_btn = ctk.CTkButton(buttons_frame, text="Update", command=check_for_updates, width=130) update_btn.grid(row=0, column=1, padx=(10, 20), pady=(10, 10), sticky="n") - update_btn_tooltip = ctk_tooltip.CTkToolTip(update_btn, message="Checks and installs updates of the current selected item (redownload!)", topmost=True) + update_btn_tooltip = CTkToolTip(update_btn, message="Checks and installs updates of the current selected item (redownload!)", topmost=True) view_button = ctk.CTkButton(buttons_frame, text="Close", command=close_window, width=130) view_button.grid(row=0, column=2, padx=(10, 20), pady=(10, 10), sticky="n") @@ -694,7 +694,7 @@ class LibraryTab(ctk.CTkScrollableFrame): cevent = Event() self.select_all_bool = False - listbox = ctk_listbox.CTkListbox(top, multiple_selection=True) + listbox = CTkListbox(top, multiple_selection=True) listbox.grid(row=0, column=0, sticky="nsew") update_button = ctk.CTkButton(top, text="Update") diff --git a/boiiiwd_package/src/main.py b/boiiiwd_package/src/main.py index b2f0c7b..613c54f 100644 --- a/boiiiwd_package/src/main.py +++ b/boiiiwd_package/src/main.py @@ -143,7 +143,7 @@ class BOIIIWD(ctk.CTk): self.button_browse = ctk.CTkButton(master=self.optionsframe, text="Workshop", command=self.open_browser, width=10) self.button_browse.grid(row=2, column=5, padx=(0, 20), pady=(0, 10), sticky="en") - self.button_browse_tooltip = ctk_tooltip.CTkToolTip(self.button_browse, message="Will open steam workshop for boiii in your browser") + self.button_browse_tooltip = CTkToolTip(self.button_browse, message="Will open steam workshop for boiii in your browser") self.info_button = ctk.CTkButton(master=self.optionsframe, text="Details", command=self.show_map_info, width=10) self.info_button.grid(row=2, column=5, padx=(0, 20), pady=(0, 10), sticky="wn") @@ -190,9 +190,9 @@ class BOIIIWD(ctk.CTk): self.sidebar_queue.configure(text="Queue 🚧", command=self.queue_button_event) sidebar_settings_button_image = os.path.join(RESOURCES_DIR, "sett10.png") self.sidebar_settings.configure(command=self.settings_button_event, text="", image=ctk.CTkImage(Image.open(sidebar_settings_button_image), size=(int(35), int(35))), fg_color="transparent", width=45, height=45) - self.sidebar_settings_tooltip = ctk_tooltip.CTkToolTip(self.sidebar_settings, message="Settings") - self.sidebar_library_tooltip = ctk_tooltip.CTkToolTip(self.sidebar_library, message="Experimental") - self.sidebar_queue_tooltip = ctk_tooltip.CTkToolTip(self.sidebar_queue, message="Experimental") + self.sidebar_settings_tooltip = CTkToolTip(self.sidebar_settings, message="Settings") + self.sidebar_library_tooltip = CTkToolTip(self.sidebar_library, message="Experimental") + self.sidebar_queue_tooltip = CTkToolTip(self.sidebar_queue, message="Experimental") self.bind("", self.save_window_size) # context_menus diff --git a/boiiiwd_package/src/settings_tab.py b/boiiiwd_package/src/settings_tab.py index 41f123a..5aca2d6 100644 --- a/boiiiwd_package/src/settings_tab.py +++ b/boiiiwd_package/src/settings_tab.py @@ -46,7 +46,7 @@ class SettingsTab(ctk.CTkFrame): self.console_var.trace_add("write", self.enable_save_button) self.checkbox_show_console = ctk.CTkSwitch(left_frame, text="Console (On Download)", variable=self.console_var) self.checkbox_show_console.grid(row=1, column=1, padx=20, pady=(20, 0), sticky="nw") - self.checkbox_show_console_tooltip = ctk_tooltip.CTkToolTip(self.checkbox_show_console, message="Toggle SteamCMD console\nPlease don't close the Console If you want to stop press the Stop button") + self.checkbox_show_console_tooltip = CTkToolTip(self.checkbox_show_console, message="Toggle SteamCMD console\nPlease don't close the Console If you want to stop press the Stop button") self.console_var.set(self.load_settings("console")) # Show continuous checkbox @@ -54,7 +54,7 @@ class SettingsTab(ctk.CTkFrame): self.continuous_var.trace_add("write", self.enable_save_button) self.checkbox_continuous = ctk.CTkSwitch(left_frame, text="Continuous Download", variable=self.continuous_var) self.checkbox_continuous.grid(row=2, column=1, padx=20, pady=(20, 0), sticky="nw") - self.checkbox_continuous_tooltip = ctk_tooltip.CTkToolTip(self.checkbox_continuous, message="This will make sure that the download restarts and resumes! until it finishes if steamcmd crashes randomly (it will not redownload from the start)") + self.checkbox_continuous_tooltip = CTkToolTip(self.checkbox_continuous, message="This will make sure that the download restarts and resumes! until it finishes if steamcmd crashes randomly (it will not redownload from the start)") self.continuous_var.set(self.load_settings("continuous_download")) # clean on finish checkbox @@ -62,7 +62,7 @@ class SettingsTab(ctk.CTkFrame): self.clean_checkbox_var.trace_add("write", self.enable_save_button) self.clean_checkbox = ctk.CTkSwitch(left_frame, text="Clean on finish", variable=self.clean_checkbox_var) self.clean_checkbox.grid(row=3, column=1, padx=20, pady=(20, 0), sticky="nw") - self.clean_checkbox_tooltip = ctk_tooltip.CTkToolTip(self.clean_checkbox, message="Cleans the map that have been downloaded and installed from steamcmd's steamapps folder ,to save space") + self.clean_checkbox_tooltip = CTkToolTip(self.clean_checkbox, message="Cleans the map that have been downloaded and installed from steamcmd's steamapps folder ,to save space") self.clean_checkbox_var.set(self.load_settings("clean_on_finish", "on")) # Show estimated_progress checkbox @@ -70,7 +70,7 @@ class SettingsTab(ctk.CTkFrame): self.estimated_progress_var.trace_add("write", self.enable_save_button) self.estimated_progress_cb = ctk.CTkSwitch(left_frame, text="Estimated Progress Bar", variable=self.estimated_progress_var) self.estimated_progress_cb.grid(row=4, column=1, padx=20, pady=(20, 0), sticky="nw") - self.estimated_progress_var_tooltip = ctk_tooltip.CTkToolTip(self.estimated_progress_cb, message="This will change how to progress bar works by estimating how long the download will take\ + self.estimated_progress_var_tooltip = CTkToolTip(self.estimated_progress_cb, message="This will change how to progress bar works by estimating how long the download will take\ \nThis is not accurate ,it's better than with it off which is calculating the downloaded folder size which steamcmd dumps the full size rigth mostly") self.estimated_progress_var.set(self.load_settings("estimated_progress", "on")) @@ -79,7 +79,7 @@ class SettingsTab(ctk.CTkFrame): self.show_fails_var.trace_add("write", self.enable_save_button) self.show_fails_cb = ctk.CTkSwitch(left_frame, text="Show fails (on top of progress bar)", variable=self.show_fails_var) self.show_fails_cb.grid(row=5, column=1, padx=20, pady=(20, 0), sticky="nw") - self.show_fails_tooltip = ctk_tooltip.CTkToolTip(self.show_fails_cb, message="Display how many times steamcmd has failed/crashed\nIf the number is getting high quickly then try pressing Reset SteamCMD and try again, otherwise its fine") + self.show_fails_tooltip = CTkToolTip(self.show_fails_cb, message="Display how many times steamcmd has failed/crashed\nIf the number is getting high quickly then try pressing Reset SteamCMD and try again, otherwise its fine") self.estimated_progress_var.set(self.load_settings("show_fails", "on")) # Show skip_already_installed maps checkbox @@ -87,7 +87,7 @@ class SettingsTab(ctk.CTkFrame): self.skip_already_installed_var.trace_add("write", self.enable_save_button) self.skip_already_installed_ch = ctk.CTkSwitch(left_frame, text="Skip already installed maps", variable=self.skip_already_installed_var) self.skip_already_installed_ch.grid(row=6, column=1, padx=20, pady=(20, 0), sticky="nw") - self.skip_already_installed_ch_tooltip = ctk_tooltip.CTkToolTip(self.skip_already_installed_ch, message="If on it will not download installed maps,\nthis can miss sometimes if you remove maps manually and not from library tab while the app is running") + self.skip_already_installed_ch_tooltip = CTkToolTip(self.skip_already_installed_ch, message="If on it will not download installed maps,\nthis can miss sometimes if you remove maps manually and not from library tab while the app is running") self.skip_already_installed_var.set(self.load_settings("skip_already_installed", "on")) # check items for update on launch @@ -95,7 +95,7 @@ class SettingsTab(ctk.CTkFrame): self.check_items_var.trace_add("write", self.enable_save_button) self.check_items_ch = ctk.CTkSwitch(left_frame, text="Check Library items on launch", variable=self.check_items_var) self.check_items_ch.grid(row=7, column=1, padx=20, pady=(20, 0), sticky="nw") - self.check_items_tooltip = ctk_tooltip.CTkToolTip(self.check_items_ch, message="This will show a window on launch of items that have pending updates -> you can open it manually from library tab") + self.check_items_tooltip = CTkToolTip(self.check_items_ch, message="This will show a window on launch of items that have pending updates -> you can open it manually from library tab") self.check_items_var.set(self.load_settings("check_items", "off")) # Resetr steam on many fails @@ -105,7 +105,7 @@ class SettingsTab(ctk.CTkFrame): self.reset_steamcmd_on_fail_text.grid(row=8, column=1, padx=20, pady=(10, 0), sticky="nw") self.reset_steamcmd_on_fail = ctk.CTkOptionMenu(left_frame, values=["5", "10", "20", "30", "40", "Custom", "Disable"], variable=self.reset_steamcmd_on_fail_var, command=self.reset_steamcmd_on_fail_func) self.reset_steamcmd_on_fail.grid(row=8, column=1, padx=(190, 0), pady=(10, 0), sticky="nw") - self.reset_steamcmd_on_fail_tooltip = ctk_tooltip.CTkToolTip(self.reset_steamcmd_on_fail, message="This actually fixes steamcmd when its crashing way too much") + self.reset_steamcmd_on_fail_tooltip = CTkToolTip(self.reset_steamcmd_on_fail, message="This actually fixes steamcmd when its crashing way too much") self.reset_steamcmd_on_fail.set(value=self.load_settings("reset_on_fail", "10")) # item folder naming @@ -126,11 +126,11 @@ class SettingsTab(ctk.CTkFrame): self.reset_steamcmd = ctk.CTkButton(right_frame, text="Reset SteamCMD", command=self.settings_reset_steamcmd) self.reset_steamcmd.grid(row=3, column=1, padx=20, pady=(20, 0), sticky="n") - self.reset_steamcmd_tooltip = ctk_tooltip.CTkToolTip(self.reset_steamcmd, message="This will remove steamapps folder + all the maps that are potentioaly corrupted\nor not so use at ur own risk (could fix some issues as well)") + self.reset_steamcmd_tooltip = CTkToolTip(self.reset_steamcmd, message="This will remove steamapps folder + all the maps that are potentioaly corrupted\nor not so use at ur own risk (could fix some issues as well)") self.steam_to_boiii = ctk.CTkButton(right_frame, text="Steam to boiii", command=self.from_steam_to_boiii_toplevel) self.steam_to_boiii.grid(row=5, column=1, padx=20, pady=(20, 0), sticky="n") - self.steam_to_boiii_tooltip = ctk_tooltip.CTkToolTip(self.steam_to_boiii, message="Moves/copies maps and mods from steam to boiii (opens up a window)") + self.steam_to_boiii_tooltip = CTkToolTip(self.steam_to_boiii, message="Moves/copies maps and mods from steam to boiii (opens up a window)") # appearance self.appearance_mode_label = ctk.CTkLabel(right_frame, text="Appearance Mode:", anchor="n")