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

Commits: b5a950aa by lovetox at 2022-01-02T00:37:51+01:00 Move and rename gui_menu_builder to gtk module

- - - - -

13 changed files:

- gajim/application.py - gajim/gtk/chat_list.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/groupchat_roster.py - gajim/gtk/htmltextview.py - gajim/gui_menu_builder.py → gajim/gtk/menus.py - gajim/gtk/notification_manager.py - gajim/gtk/roster.py - gajim/gtk/search.py - gajim/gtk/start_chat.py - gajim/gui_interface.py

Changes:

===================================== gajim/application.py ===================================== @@ -227,8 +227,8 @@ def _startup(self, _application: GajimApplication) -> None: self.interface.run(self) self.add_actions() self._load_shortcuts() - from gajim import gui_menu_builder - gui_menu_builder.build_accounts_menu() + from gajim.gui import menus + menus.build_accounts_menu() self.update_app_actions_state()

app.ged.register_event_handler('feature-discovered',

===================================== gajim/gtk/chat_list.py ===================================== @@ -44,8 +44,7 @@ from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type

-from gajim.gui_menu_builder import get_chat_list_row_menu - +from .menus import get_chat_list_row_menu from .builder import get_builder from .util import EventHelper

===================================== gajim/gtk/controls/chat.py ===================================== @@ -48,9 +48,6 @@ from gajim.common.const import KindConstant from gajim.common.const import PEPEventType

-from gajim.gui_menu_builder import get_encryption_menu -from gajim.gui_menu_builder import get_singlechat_menu - from gajim.gui.call_widget import CallWidget from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.const import ControlType @@ -63,6 +60,9 @@ from gajim.command_system.framework import CommandHost # pylint: disable=unused-import from gajim.gui.controls.base import BaseControl

+from ..menus import get_encryption_menu +from ..menus import get_singlechat_menu + log = logging.getLogger('gajim.gui.controls.chat')

===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -46,9 +46,6 @@ from gi.repository import GLib from gi.repository import Gio

-from gajim.gui_menu_builder import get_encryption_menu -from gajim.gui_menu_builder import get_groupchat_menu - from gajim.common import app from gajim.common import ged from gajim.common import helpers @@ -83,6 +80,9 @@ from gajim.gui.util import get_app_window from gajim.gui.util import open_window

+from ..menus import get_encryption_menu +from ..menus import get_groupchat_menu + log = logging.getLogger('gajim.gui.controls.groupchat')

===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -30,9 +30,8 @@ from gajim.common.structs import URI from gajim.common.styling import PlainBlock

-from gajim.gui_menu_builder import get_conv_action_context_menu -from gajim.gui_menu_builder import get_conv_uri_context_menu - +from ..menus import get_conv_action_context_menu +from ..menus import get_conv_uri_context_menu from ..emoji_data import emoji_pixbufs from ..emoji_data import get_emoji_pixbuf from ..util import get_cursor

===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -39,7 +39,7 @@ from gajim.common.nec import NetworkEvent from gajim.common.modules.contacts import GroupchatContact

-from gajim.gui_menu_builder import get_groupchat_roster_menu +from .menus import get_groupchat_roster_menu from .tooltips import GCTooltip from .builder import get_builder from .types import GroupchatControlType

===================================== gajim/gtk/htmltextview.py ===================================== @@ -47,8 +47,8 @@ from gajim.common.const import StyleAttr from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri -from gajim.gui_menu_builder import get_conv_context_menu

+from .menus import get_conv_context_menu from .util import get_cursor

log = logging.getLogger('gajim.htmlview')

===================================== gajim/gui_menu_builder.py → gajim/gtk/menus.py =====================================

===================================== gajim/gtk/notification_manager.py ===================================== @@ -26,8 +26,7 @@ from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_muc_context

-from gajim.gui_menu_builder import get_subscription_menu - +from .menus import get_subscription_menu from .util import open_window

===================================== gajim/gtk/roster.py ===================================== @@ -42,8 +42,7 @@ from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent

-from gajim.gui_menu_builder import get_roster_menu - +from .menus import get_roster_menu from .dialogs import ConfirmationDialog from .dialogs import DialogButton from .tooltips import RosterTooltip

===================================== gajim/gtk/search.py ===================================== @@ -26,8 +26,7 @@ from gajim.common import ged from gajim.common.i18n import _

-from gajim.gui_menu_builder import SearchMenu - +from .menus import SearchMenu from .dataform import DataFormWidget from .util import ensure_not_destroyed from .util import find_widget

===================================== gajim/gtk/start_chat.py ===================================== @@ -36,8 +36,7 @@ from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.modules.util import as_task

-from gajim.gui_menu_builder import get_start_chat_row_menu - +from .menus import get_start_chat_row_menu from .chat_filter import ChatFilter from .groupchat_info import GroupChatInfoScrolled from .groupchat_nick import NickChooser

===================================== gajim/gui_interface.py ===================================== @@ -61,7 +61,7 @@ from gajim.common.dbus import logind from gajim.common.dbus import music_track

-from gajim import gui_menu_builder +from gajim.gui import menus from gajim.dialog_messages import get_dialog

from gajim.common import idle @@ -792,7 +792,7 @@ def enable_account(self, account: str) -> None: app.block_signed_in_notifications[account] = True

app.settings.set_account_setting(account, 'active', True) - gui_menu_builder.build_accounts_menu() + menus.build_accounts_menu() app.app.update_app_actions_state()

app.nec.push_incoming_event(NetworkEvent( @@ -814,7 +814,7 @@ def disable_account(self, account: str) -> None:

app.settings.set_account_setting(account, 'roster_version', '') app.settings.set_account_setting(account, 'active', False) - gui_menu_builder.build_accounts_menu() + menus.build_accounts_menu() app.app.update_app_actions_state()

app.nec.push_incoming_event(NetworkEvent(

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5a950aa28f40d925a906cec2cf724004...