From fe40a5e54f69c5121af428bae40f047f865f2a2e Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 23 Sep 2025 20:46:12 +0900 Subject: [PATCH 1/7] feat: self_update flag --- CHANGELOG.md | 4 ++++ dzgui.sh | 6 +++--- helpers/ui.py | 19 +++++++++++++------ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edff876..94e5bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [6.0.0-beta.8] 2025-09-23 +## Added +- Flag to disable branch toggle for distro-packaged releases + ## [6.0.0-beta.7] 2025-09-20 ## Added - Users can save text notes to describe servers diff --git a/dzgui.sh b/dzgui.sh index 33fb0d1..658421f 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=6.0.0.beta-7 +version=6.0.0.beta-8 #CONSTANTS aid=221100 @@ -585,10 +585,10 @@ fetch_helpers_by_sum(){ [[ -f "$config_file" ]] && source "$config_file" declare -A sums sums=( - ["funcs"]="c27a81577c818b4f4d786ada52ad5042" + ["funcs"]="65134f86b7c9e14173e05d8e3ebea101" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["servers.py"]="7f83d5c1ca54acb12f1bd6657feb2ecf" - ["ui.py"]="8d6e52b3e9032acbb84ba6cf137f455a" + ["ui.py"]="aac7ef0f75876da82fba8be2740e22b9" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["pefile.py"]="21531f2c0d9dfa5f110cf6779f9d22c0" ) diff --git a/helpers/ui.py b/helpers/ui.py index e8c4906..3df3aeb 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -3758,7 +3758,7 @@ class LeftLabel(Gtk.Label): class Options(Gtk.Box): - def __init__(self): + def __init__(self, self_update=True): super().__init__( orientation=Gtk.Orientation.VERTICAL, margin_start=10, @@ -3835,11 +3835,18 @@ class Options(Gtk.Box): self.branch_combo.append_text("Testing") self.branch_combo.set_active(0) self.branch_combo.connect("changed", self._on_branch_changed) + self.branch_combo.set_sensitive(self_update) - msg = ( - "Stable: only contains stable features. " - "Testing: pre-release beta, contains new features." - ) + if self_update is True: + msg = ( + "Stable: only contains stable features. " + "Testing: pre-release beta, contains new features." + ) + else: + msg = ( + "In-app updates are disabled when installing " + "DZGUI via the system package manager." + ) eb = InfoEventBox(msg) version_rows = [ @@ -4355,7 +4362,7 @@ class Notebook(Gtk.Notebook): self.keys.show_all() self.append_page(self.keys) - self.settings = Options() + self.settings = Options(self_update=True) self.settings.type = RowType.OPTIONS self.settings.show_all() self.append_page(self.settings) From 35f1f180d2b2faba61788331842fa865df433e92 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 23 Sep 2025 20:56:00 +0900 Subject: [PATCH 2/7] chore: bump version --- helpers/funcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/funcs b/helpers/funcs index e8f35ef..dbb6ab2 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o pipefail -version="6.0.0-beta.7" +version="6.0.0-beta.8" #CONSTANTS aid=221100 From 796dcd5588a15ed1f65ad03f60e7b7a359486a1c Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 30 Sep 2025 19:07:42 +0900 Subject: [PATCH 3/7] fix: missing param --- helpers/ui.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpers/ui.py b/helpers/ui.py index 3df3aeb..c4f2d19 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -1872,6 +1872,7 @@ class TreeView(Gtk.TreeView): ) -> bool: if self.is_server_context(self.view) is False: return + coords = widget.convert_widget_to_bin_window_coords(x, y) path = self.get_path_at_pos(coords.bx, coords.by) if path is None: @@ -3207,8 +3208,11 @@ class GenericDialog(Gtk.MessageDialog): self.outer.set_margin_end(30) def _on_dialog_delete( - self, response_id: Gtk.ResponseType + self, response_id: Gtk.ResponseType, event: Gdk.Event ) -> Literal[True]: + """ + Prevent manual dialog destruction + """ return True def _return_to_main_menu(self, widget: Gtk.Widget) -> None: From 54e2d2feaa1165b00664dfaa9f737426e8d90599 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 30 Sep 2025 19:08:04 +0900 Subject: [PATCH 4/7] fix: block tooltips on main menu --- helpers/ui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/ui.py b/helpers/ui.py index c4f2d19..df896fe 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -1872,6 +1872,8 @@ class TreeView(Gtk.TreeView): ) -> bool: if self.is_server_context(self.view) is False: return + if self.subpage is None: + return coords = widget.convert_widget_to_bin_window_coords(x, y) path = self.get_path_at_pos(coords.bx, coords.by) From 239f806f7e9e0e262ad7f25e45e2aac25eef6635 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 30 Sep 2025 19:09:39 +0900 Subject: [PATCH 5/7] chore: update changelog --- CHANGELOG.md | 4 ++++ dzgui.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94e5bd3..ac59081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## Added - Flag to disable branch toggle for distro-packaged releases +## Fixed +- ESC key destroying wait dialogs while thread is pending +- Tooltip signals being processed on main menu + ## [6.0.0-beta.7] 2025-09-20 ## Added - Users can save text notes to describe servers diff --git a/dzgui.sh b/dzgui.sh index 658421f..e9e671f 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -588,7 +588,7 @@ fetch_helpers_by_sum(){ ["funcs"]="65134f86b7c9e14173e05d8e3ebea101" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["servers.py"]="7f83d5c1ca54acb12f1bd6657feb2ecf" - ["ui.py"]="aac7ef0f75876da82fba8be2740e22b9" + ["ui.py"]="840f6f97a27d94606c15b8925bf8dd87" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["pefile.py"]="21531f2c0d9dfa5f110cf6779f9d22c0" ) From 9a37cebe4780c5ba2f355d2910a6d732724205ad Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Fri, 3 Oct 2025 01:20:40 +0900 Subject: [PATCH 6/7] fix: f-string in dialog title --- helpers/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/ui.py b/helpers/ui.py index df896fe..a6a6b42 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -3238,7 +3238,7 @@ class LanDialog(Gtk.MessageDialog): buttons=Gtk.ButtonsType.OK_CANCEL, text="Scan LAN servers", secondary_text="Select the query port", - title="{appname}", + title=f"{app_name} - Dialog", modal=True, ) From 9d1ee7e130376233f23809f032e039d4f2c18b98 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Fri, 3 Oct 2025 01:22:02 +0900 Subject: [PATCH 7/7] chore: update checksums --- CHANGELOG.md | 3 ++- dzgui.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac59081..4ccd93d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ # Changelog -## [6.0.0-beta.8] 2025-09-23 +## [6.0.0-beta.8] XXXX-XX-XX ## Added - Flag to disable branch toggle for distro-packaged releases ## Fixed - ESC key destroying wait dialogs while thread is pending - Tooltip signals being processed on main menu +- Leaky variable name in dialog title ## [6.0.0-beta.7] 2025-09-20 ## Added diff --git a/dzgui.sh b/dzgui.sh index e9e671f..c47cb14 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -588,7 +588,7 @@ fetch_helpers_by_sum(){ ["funcs"]="65134f86b7c9e14173e05d8e3ebea101" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["servers.py"]="7f83d5c1ca54acb12f1bd6657feb2ecf" - ["ui.py"]="840f6f97a27d94606c15b8925bf8dd87" + ["ui.py"]="4fa719725febbeea31473d929a40393b" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["pefile.py"]="21531f2c0d9dfa5f110cf6779f9d22c0" )