#1873 show tray title at the top of the menu

git-svn-id: https://xpra.org/svn/Xpra/trunk@19614 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jun 11, 2018 · d70c272 · d70c272
1 parent f9e21af
commit d70c272
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/xpra/client/gtk_base/gtk_tray_menu_base.py b/src/xpra/client/gtk_base/gtk_tray_menu_base.py
@@ -36,6 +36,7 @@
 
 HIDE_DISABLED_MENU_ENTRIES = OSX
 
+SHOW_TITLE_ITEM = envbool("XPRA_SHOW_TITLE_ITEM", True)
 SHOW_VERSION_CHECK = envbool("XPRA_SHOW_VERSION_CHECK", True)
 SHOW_UPLOAD = envbool("XPRA_SHOW_UPLOAD_MENU", True)
 STARTSTOP_SOUND_MENU = envbool("XPRA_SHOW_SOUND_MENU", True)
@@ -273,11 +274,22 @@ def setup_menu(self, show_close=True):
         self.menu_icon_size = get_icon_size()
         menu = gtk.Menu()
         menu.set_title(self.client.session_name or u"Xpra")
+        title_item = None
+        if SHOW_TITLE_ITEM:
+            title_item = gtk.MenuItem(self.client.session_name or u"Xpra")
+            set_sensitive(title_item, False)
+            menu.append(title_item)
         def set_menu_title(*_args):
             #set the real name when available:
+            try:
+                title = self.client.get_tray_title()
+            except:
+                title = self.client.session_name or u"Xpra"
             m = self.menu
             if m:
-                m.set_title(self.client.session_name or u"Xpra")
+                m.set_title(title)
+            if title_item:
+                title_item.set_label(title)
         self.client.after_handshake(set_menu_title)
 
         menu.append(self.make_infomenuitem())