From 744f9d46485bab375e680cb034c909754a8cada6 Mon Sep 17 00:00:00 2001 From: Antoine Martin <totaam@xpra.org> Date: Tue, 12 May 2020 12:02:48 +0000 Subject: [PATCH] #2539 don't show the header bar for OR windows, add show_window_info shortcut (remove unused speed and quality shortcuts) git-svn-id: https://xpra.org/svn/Xpra/trunk@26323 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/client/client_window_base.py | 5 +++++ src/xpra/client/gtk3/gtk3_client_window.py | 2 +- src/xpra/client/gtk_base/window_info.py | 2 +- src/xpra/scripts/config.py | 5 +---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/xpra/client/client_window_base.py b/src/xpra/client/client_window_base.py index 95e4355044..741f6c583d 100644 --- a/src/xpra/client/client_window_base.py +++ b/src/xpra/client/client_window_base.py @@ -756,6 +756,11 @@ def quit(self): def void(self): pass + def show_window_info(self, *args): + from xpra.client.gtk_base.window_info import WindowInfo + wi = WindowInfo(self._client, self) + wi.show() + def show_session_info(self, *args): self._client.show_session_info(*args) diff --git a/src/xpra/client/gtk3/gtk3_client_window.py b/src/xpra/client/gtk3/gtk3_client_window.py index 455c173245..f61d72a821 100644 --- a/src/xpra/client/gtk3/gtk3_client_window.py +++ b/src/xpra/client/gtk3/gtk3_client_window.py @@ -47,7 +47,7 @@ class GTK3ClientWindow(GTKClientWindowBase): def init_window(self, metadata): super().init_window(metadata) - if WINDOW_MENU and self.get_decorated(): + if WINDOW_MENU and self.get_decorated() and not self.is_OR(): self.add_header_bar() def add_header_bar(self): diff --git a/src/xpra/client/gtk_base/window_info.py b/src/xpra/client/gtk_base/window_info.py index ba92c58a8d..233ec7bd64 100644 --- a/src/xpra/client/gtk_base/window_info.py +++ b/src/xpra/client/gtk_base/window_info.py @@ -170,7 +170,7 @@ def geom_str(geom): geom = list(w.get_position()) + list(w.get_size()) self.outer_geometry_label.set_text(geom_str(geom)) self.inner_geometry_label.set_text(geom_str(w.get_drawing_area_geometry())) - self.offsets_label.set_text(",".join(w.window_offset or []) or "none") + self.offsets_label.set_text(",".join(str(x) for x in (w.window_offset or ())) or "none") self.frame_extents_label.set_text(csv(w._current_frame_extents or []) or "none") self.max_size_label.set_text(csv(w.max_window_size)) def hsc(sc): diff --git a/src/xpra/scripts/config.py b/src/xpra/scripts/config.py index 15f0e2ad9f..a6c6e6f3a2 100755 --- a/src/xpra/scripts/config.py +++ b/src/xpra/scripts/config.py @@ -757,10 +757,7 @@ def get_default_key_shortcuts(): (True, "#+F2:show_start_new_command"), (True, "#+F3:show_bug_report"), (True, "#+F4:quit"), - (True, "#+F5:increase_quality"), - (True, "#+F6:decrease_quality"), - (True, "#+F7:increase_speed"), - (True, "#+F8:decrease_speed"), + (True, "#+F5:show_window_info"), (True, "#+F10:magic_key"), (True, "#+F11:show_session_info"), (True, "#+F12:toggle_debug"),