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

Commits:

13 changed files:

Changes:

  • gajim/application.py
    ... ... @@ -227,8 +227,8 @@ def _startup(self, _application: GajimApplication) -> None:
    227 227 
             self.interface.run(self)
    228 228 
             self.add_actions()
    229 229 
             self._load_shortcuts()
    230 
    -        from gajim import gui_menu_builder
    231 
    -        gui_menu_builder.build_accounts_menu()
    230 
    +        from gajim.gui import menus
    231 
    +        menus.build_accounts_menu()
    232 232 
             self.update_app_actions_state()
    233 233
    234 234 
             app.ged.register_event_handler('feature-discovered',

  • gajim/gtk/chat_list.py
    ... ... @@ -44,8 +44,7 @@
    44 44 
     from gajim.common.preview_helpers import filename_from_uri
    45 45 
     from gajim.common.preview_helpers import guess_simple_file_type
    46 46
    47 
    -from gajim.gui_menu_builder import get_chat_list_row_menu
    48 
    -
    47 
    +from .menus import get_chat_list_row_menu
    49 48 
     from .builder import get_builder
    50 49 
     from .util import EventHelper
    51 50

  • gajim/gtk/controls/chat.py
    ... ... @@ -48,9 +48,6 @@
    48 48 
     from gajim.common.const import KindConstant
    49 49 
     from gajim.common.const import PEPEventType
    50 50
    51 
    -from gajim.gui_menu_builder import get_encryption_menu
    52 
    -from gajim.gui_menu_builder import get_singlechat_menu
    53 
    -
    54 51 
     from gajim.gui.call_widget import CallWidget
    55 52 
     from gajim.gui.const import TARGET_TYPE_URI_LIST
    56 53 
     from gajim.gui.const import ControlType
    ... ... @@ -63,6 +60,9 @@
    63 60 
     from gajim.command_system.framework import CommandHost  # pylint: disable=unused-import
    64 61 
     from gajim.gui.controls.base import BaseControl
    65 62
    63 
    +from ..menus import get_encryption_menu
    64 
    +from ..menus import get_singlechat_menu
    65 
    +
    66 66 
     log = logging.getLogger('gajim.gui.controls.chat')
    67 67
    68 68

  • gajim/gtk/controls/groupchat.py
    ... ... @@ -46,9 +46,6 @@
    46 46 
     from gi.repository import GLib
    47 47 
     from gi.repository import Gio
    48 48
    49 
    -from gajim.gui_menu_builder import get_encryption_menu
    50 
    -from gajim.gui_menu_builder import get_groupchat_menu
    51 
    -
    52 49 
     from gajim.common import app
    53 50 
     from gajim.common import ged
    54 51 
     from gajim.common import helpers
    ... ... @@ -83,6 +80,9 @@
    83 80 
     from gajim.gui.util import get_app_window
    84 81 
     from gajim.gui.util import open_window
    85 82
    83 
    +from ..menus import get_encryption_menu
    84 
    +from ..menus import get_groupchat_menu
    85 
    +
    86 86 
     log = logging.getLogger('gajim.gui.controls.groupchat')
    87 87
    88 88

  • gajim/gtk/conversation/plain_widget.py
    ... ... @@ -30,9 +30,8 @@
    30 30 
     from gajim.common.structs import URI
    31 31 
     from gajim.common.styling import PlainBlock
    32 32
    33 
    -from gajim.gui_menu_builder import get_conv_action_context_menu
    34 
    -from gajim.gui_menu_builder import get_conv_uri_context_menu
    35 
    -
    33 
    +from ..menus import get_conv_action_context_menu
    34 
    +from ..menus import get_conv_uri_context_menu
    36 35 
     from ..emoji_data import emoji_pixbufs
    37 36 
     from ..emoji_data import get_emoji_pixbuf
    38 37 
     from ..util import get_cursor

  • gajim/gtk/groupchat_roster.py
    ... ... @@ -39,7 +39,7 @@
    39 39 
     from gajim.common.nec import NetworkEvent
    40 40 
     from gajim.common.modules.contacts import GroupchatContact
    41 41
    42 
    -from gajim.gui_menu_builder import get_groupchat_roster_menu
    42 
    +from .menus import get_groupchat_roster_menu
    43 43 
     from .tooltips import GCTooltip
    44 44 
     from .builder import get_builder
    45 45 
     from .types import GroupchatControlType

  • gajim/gtk/htmltextview.py
    ... ... @@ -47,8 +47,8 @@
    47 47 
     from gajim.common.const import StyleAttr
    48 48 
     from gajim.common.helpers import open_uri
    49 49 
     from gajim.common.helpers import parse_uri
    50 
    -from gajim.gui_menu_builder import get_conv_context_menu
    51 50
    51 
    +from .menus import get_conv_context_menu
    52 52 
     from .util import get_cursor
    53 53
    54 54 
     log = logging.getLogger('gajim.htmlview')

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

  • gajim/gtk/notification_manager.py
    ... ... @@ -26,8 +26,7 @@
    26 26 
     from gajim.common.helpers import get_groupchat_name
    27 27 
     from gajim.common.helpers import get_muc_context
    28 28
    29 
    -from gajim.gui_menu_builder import get_subscription_menu
    30 
    -
    29 
    +from .menus import get_subscription_menu
    31 30 
     from .util import open_window
    32 31
    33 32

  • gajim/gtk/roster.py
    ... ... @@ -42,8 +42,7 @@
    42 42 
     from gajim.common.i18n import _
    43 43 
     from gajim.common.nec import NetworkEvent
    44 44
    45 
    -from gajim.gui_menu_builder import get_roster_menu
    46 
    -
    45 
    +from .menus import get_roster_menu
    47 46 
     from .dialogs import ConfirmationDialog
    48 47 
     from .dialogs import DialogButton
    49 48 
     from .tooltips import RosterTooltip

  • gajim/gtk/search.py
    ... ... @@ -26,8 +26,7 @@
    26 26 
     from gajim.common import ged
    27 27 
     from gajim.common.i18n import _
    28 28
    29 
    -from gajim.gui_menu_builder import SearchMenu
    30 
    -
    29 
    +from .menus import SearchMenu
    31 30 
     from .dataform import DataFormWidget
    32 31 
     from .util import ensure_not_destroyed
    33 32 
     from .util import find_widget

  • gajim/gtk/start_chat.py
    ... ... @@ -36,8 +36,7 @@
    36 36 
     from gajim.common.const import MUC_DISCO_ERRORS
    37 37 
     from gajim.common.modules.util import as_task
    38 38
    39 
    -from gajim.gui_menu_builder import get_start_chat_row_menu
    40 
    -
    39 
    +from .menus import get_start_chat_row_menu
    41 40 
     from .chat_filter import ChatFilter
    42 41 
     from .groupchat_info import GroupChatInfoScrolled
    43 42 
     from .groupchat_nick import NickChooser

  • gajim/gui_interface.py
    ... ... @@ -61,7 +61,7 @@
    61 61 
     from gajim.common.dbus import logind
    62 62 
     from gajim.common.dbus import music_track
    63 63
    64 
    -from gajim import gui_menu_builder
    64 
    +from gajim.gui import menus
    65 65 
     from gajim.dialog_messages import get_dialog
    66 66
    67 67 
     from gajim.common import idle
    ... ... @@ -792,7 +792,7 @@ def enable_account(self, account: str) -> None:
    792 792 
             app.block_signed_in_notifications[account] = True
    793 793
    794 794 
             app.settings.set_account_setting(account, 'active', True)
    795 
    -        gui_menu_builder.build_accounts_menu()
    795 
    +        menus.build_accounts_menu()
    796 796 
             app.app.update_app_actions_state()
    797 797
    798 798 
             app.nec.push_incoming_event(NetworkEvent(
    ... ... @@ -814,7 +814,7 @@ def disable_account(self, account: str) -> None:
    814 814
    815 815 
             app.settings.set_account_setting(account, 'roster_version', '')
    816 816 
             app.settings.set_account_setting(account, 'active', False)
    817 
    -        gui_menu_builder.build_accounts_menu()
    817 
    +        menus.build_accounts_menu()
    818 818 
             app.app.update_app_actions_state()
    819 819
    820 820 
             app.nec.push_incoming_event(NetworkEvent(

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.