Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
93455cfb by wurstsalat at 2023-03-29T20:41:18+02:00
imprv: Workspace menu: Always show Mark as read action
- - - - -
2 changed files:
- gajim/gtk/menus.py
- gajim/gtk/workspace_side_bar.py
Changes:
=====================================
gajim/gtk/menus.py
=====================================
@@ -778,23 +778,17 @@ def get_format_menu() -> GajimMenu:
return GajimMenu.from_list(menuitems)
-def get_workspace_menu(workspace_id: str, has_unread: bool) -> GajimMenu:
+def get_workspace_menu(workspace_id: str) -> GajimMenu:
remove_action = 'win.dummy'
if app.settings.get_workspace_count() > 1:
remove_action = 'win.remove-workspace'
menuitems: MenuItemListT = [
+ (_('Mark as read'), 'win.mark-workspace-as-read', workspace_id),
(_('Edit…'), 'win.edit-workspace', workspace_id),
(_('Remove'), remove_action, workspace_id),
]
- if has_unread:
- menuitems.insert(
- 0,
- (_('Mark as read'),
- 'win.mark-workspace-as-read',
- workspace_id))
-
return GajimMenu.from_list(menuitems)
=====================================
gajim/gtk/workspace_side_bar.py
=====================================
@@ -332,8 +332,7 @@ def _popup_menu(self, _widget: Gtk.Widget, event:
Gdk.EventButton) -> None:
if event.button != 3: # right click
return
- menu = get_workspace_menu(
- self.workspace_id, self._unread_label.get_visible())
+ menu = get_workspace_menu(self.workspace_id)
popover = GajimPopover(menu, relative_to=self, event=event)
popover.popup()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/93455cfbe8732c3a45b9ee3df20160a4c40ddd8f
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/93455cfbe8732c3a45b9ee3df20160a4c40ddd8f
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
