GitLab

at 2022-08-20T14:19:10+02:00

refactor: WorkspaceSidebar: Move building menu to menu module

     return GajimMenu.from_list(menuitems)

 

 

+def get_workspace_menu(workspace_id: str) -> GajimMenu:

+    menuitems: MenuItemListT = [

+        (_('Edit…'), 'win.edit-workspace', f'"{workspace_id}"'),

+    ]

+

+    return GajimMenu.from_list(menuitems)

+

+

 def escape_mnemonic(label: Optional[str]) -> Optional[str]:

     if label is None:

         return None

 from __future__ import annotations

 

 from typing import Any

-from typing import List

 from typing import Optional

 from typing import cast

 

 import pickle

 

 from gi.repository import Gdk

-from gi.repository import Gio

-from gi.repository import GLib

 from gi.repository import Gtk

 from nbxmpp.protocol import JID

 

 

 from .chat_list_stack import ChatListStack

 from .chat_page import ChatPage

+from .menus import get_workspace_menu

 from .structs import ChatListEntryParam

 from .util import open_window

 

         if event.button != 3:  # right click

             return

 

-        menu = self._get_workspace_menu()

+        menu = get_workspace_menu(self.workspace_id)

 

         rectangle = Gdk.Rectangle()

         rectangle.x = int(event.x)

         popover.set_pointing_to(rectangle)

         popover.popup()

 

-    def _get_workspace_menu(self) -> Gio.Menu:

-        menu_items: List[Any] = [

-            ('edit-workspace', _('Edit…')),

-        ]

-        menu = Gio.Menu()

-        for item in menu_items:

-            action, label = item

-            action = f'win.{action}'

-            menuitem = Gio.MenuItem.new(label, action)

-            variant = GLib.Variant('s', self.workspace_id)

-            menuitem.set_action_and_target_value(action, variant)

-            menu.append_item(menuitem)

-        return menu

-

     def update_avatar(self) -> None:

         self._image.update()

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes: