Skip to content

Commit

Permalink
#2539 don't show the header bar for OR windows, add show_window_info …
Browse files Browse the repository at this point in the history
…shortcut (remove unused speed and quality shortcuts)

git-svn-id: https://xpra.org/svn/Xpra/trunk@26323 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 12, 2020
1 parent 2b48464 commit 744f9d4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
5 changes: 5 additions & 0 deletions src/xpra/client/client_window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/xpra/client/gtk3/gtk3_client_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/client/gtk_base/window_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 1 addition & 4 deletions src/xpra/scripts/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit 744f9d4

Please sign in to comment.