From 06359a40aeb6d615441fbb4d528c9524edd0e592 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:42:51 +0900 Subject: [PATCH] fix: block/unblock signal handlers --- CHANGELOG.md | 19 ++++++++++++++----- docs/dzgui.adoc | 4 ++++ docs/dzgui_dark.adoc | 4 ++++ dzgui.sh | 10 +++++++--- helpers/funcs | 2 +- helpers/ui.py | 15 ++++++++++----- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7831b8..9b61325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,27 +1,36 @@ # Changelog -## [5.3.3-beta.5] 2024-08-27 +## [5.4.1-beta.5] 2024-09-10 +### Added +- Pre-boot validation check for users with self-compiled version of jq +### Fixed +- When reloading the server browser, the map combobox selection would revert to the last selected map instead of All Maps +- Server filter toggle signals were accessible from the main menu when switching between menu contexts +- Global cooldown dialog could sometimes block filter toggles after cooldown reset +- Normalized minor version number due to a previous clerical error + +## [5.4.0-beta.5] 2024-08-27 ### Added - Freedesktop application icons for system taskbar, tray, and other dialogs ### Fixed - Errors being printed to the console when Exit button was explicitly clicked -## [5.3.3-beta.4] 2024-08-21 +## [5.4.0-beta.4] 2024-08-21 ### Added - Emit CPU model name when exporting system debug log ### Fixed - Detect Steam Deck OLED APU variant during initial setup -## [5.3.3-beta.3] 2024-08-04 +## [5.4.0-beta.3] 2024-08-04 ### Added - Scan local area network for DayZ servers -## [5.3.3-beta.2] 2024-08-03 +## [5.4.0-beta.2] 2024-08-03 ### Fixed - Clerical hotfix for previous player names fix - Test if DayZ directory is empty at startup, implying that the game was moved to a new library collection -## [5.3.3-beta.1] 2024-07-16 +## [5.4.0-beta.1] 2024-07-16 ### Fixed - Encapsulate player names correctly so that names with whitespace in them are supported diff --git a/docs/dzgui.adoc b/docs/dzgui.adoc index e18dcff..e059491 100644 --- a/docs/dzgui.adoc +++ b/docs/dzgui.adoc @@ -33,6 +33,10 @@ All dependencies are installed out of the box on Steam Deck. - `wmctrl` or `xdotool` - `PyGObject` (`python-gobject`) + +[NOTE] +If you are using a self-compiled version of jq (e.g. gentoo), it must be configured with support for oniguruma (this is the default setting on most distributions). + === Preparation ==== Step 1: Download DZGUI and make it executable diff --git a/docs/dzgui_dark.adoc b/docs/dzgui_dark.adoc index 004be46..967ffa5 100644 --- a/docs/dzgui_dark.adoc +++ b/docs/dzgui_dark.adoc @@ -33,6 +33,10 @@ All dependencies are installed out of the box on Steam Deck. - `wmctrl` or `xdotool` - `PyGObject` (`python-gobject`) + +[NOTE] +If you are using a self-compiled version of jq (e.g. gentoo), it must be configured with support for oniguruma (this is the default setting on most distributions). + === Preparation ==== Step 1: Download DZGUI and make it executable diff --git a/dzgui.sh b/dzgui.sh index fd08763..0a1d3e2 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=5.3.3-beta.7 +version=5.4.1-beta.1 #CONSTANTS aid=221100 @@ -220,6 +220,10 @@ depcheck(){ raise_error_and_quit "$msg" fi done + local jqmsg="jq must be compiled with support for oniguruma" + local jqtest + jqtest=$(echo '{"test": "foo"}' | jq '.test | test("^foo$")') + [[ $? -ne 0 ]] && raise_error_and_quit "$jqmsg" logger INFO "Initial dependencies satisfied" } check_pyver(){ @@ -562,10 +566,10 @@ fetch_helpers_by_sum(){ [[ -f "$config_file" ]] && source "$config_file" declare -A sums sums=( - ["ui.py"]="f89047e3fde843dbb52d343daf8d2675" + ["ui.py"]="9a5df05a4b67af3be06e39d9d7cebff3" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" - ["funcs"]="44eca80b207057423c2d298cc7cf1e29" + ["funcs"]="b73289e0aa71a91da539c28707a6405c" ["lan"]="c62e84ddd1457b71a85ad21da662b9af" ) local author="aclist" diff --git a/helpers/funcs b/helpers/funcs index 7d19b29..59bf84e 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o pipefail -version=5.3.3 +version=5.4.1 #CONSTANTS aid=221100 diff --git a/helpers/ui.py b/helpers/ui.py index a15fc50..37b56d6 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -19,7 +19,7 @@ gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib, Gdk, GObject, Pango from enum import Enum -# 5.3.3 +# 5.4.1 app_name = "DZGUI" start_time = 0 @@ -574,6 +574,7 @@ class ButtonBox(Gtk.Box): column = Gtk.TreeViewColumn(column_title, renderer, text=i) treeview.append_column(column) self._populate(context) + toggle_signal(treeview, treeview, '_on_keypress', False) treeview.set_model(row_store) treeview.grab_focus() @@ -1033,7 +1034,6 @@ class TreeView(Gtk.TreeView): # Local server lists may have different filter toggles from remote list # FIXME: tree selection updates twice here. attach signal later toggle_signal(self, self.selected_row, '_on_tree_selection_changed', False) - # toggle_signal(self, self.selected_row, '_on_check_toggled', False) for column in self.get_columns(): self.remove_column(column) row_store.clear() @@ -1071,6 +1071,10 @@ class TreeView(Gtk.TreeView): self.update_first_col(mode) transient_parent = self.get_outer_window() + # Reset map selection + selected_map.clear() + selected_map.append("Map=All maps") + for check in checks: toggle_signal(self.get_outer_grid().right_panel.filters_vbox, check, '_on_check_toggle', True) toggle_signal(self, self, '_on_keypress', True) @@ -1190,20 +1194,20 @@ class TreeView(Gtk.TreeView): valid_contexts = ["Server browser", "My saved servers", "Recent servers", "Scan LAN servers"] if chosen_row in valid_contexts: # server contexts share the same model type - for check in checks: - toggle_signal(filters_vbox, check, '_on_check_toggle', False) if chosen_row == "Server browser": - reinit_checks() cooldown = call_out(self, "test_cooldown", "", "") if cooldown.returncode == 1: spawn_dialog(self.get_outer_window(), cooldown.stdout, "NOTIFY") return 1 + reinit_checks() else: for check in checks: if check.get_label() not in toggled_checks: toggled_checks.append(check.get_label()) check.set_active(True) + for check in checks: + toggle_signal(filters_vbox, check, '_on_check_toggle', False) self._update_multi_column(chosen_row) map_store.clear() @@ -1812,6 +1816,7 @@ class App(Gtk.Application): is_steam_deck = False is_game_mode = False + GLib.set_prgname(app_name) self.win = OuterWindow(is_steam_deck, is_game_mode) self.win.set_icon_name("dzgui")