Commit e9e0b7fb authored by Philipp Hörist's avatar Philipp Hörist

Move AccountsWindow to gtk module

parent 6bf94f15
Pipeline #2274 passed with stages
in 3 minutes and 48 seconds
...@@ -23,10 +23,10 @@ from gajim.common.app import interface ...@@ -23,10 +23,10 @@ from gajim.common.app import interface
from gajim.common.exceptions import GajimGeneralException from gajim.common.exceptions import GajimGeneralException
from gajim import config from gajim import config
from gajim import dialogs from gajim import dialogs
from gajim.accounts_window import AccountsWindow
import gajim.plugins.gui
from gajim import disco from gajim import disco
import gajim.plugins.gui
from gajim.gtk.dialogs import ShortcutsWindow from gajim.gtk.dialogs import ShortcutsWindow
from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.history_sync import HistorySyncAssistant
from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.server_info import ServerInfoDialog
...@@ -43,6 +43,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow ...@@ -43,6 +43,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow
from gajim.gtk.features import FeaturesDialog from gajim.gtk.features import FeaturesDialog
from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.account_wizard import AccountCreationWizard
from gajim.gtk.history import HistoryWindow from gajim.gtk.history import HistoryWindow
from gajim.gtk.accounts import AccountsWindow
# General Actions # General Actions
......
...@@ -482,7 +482,7 @@ class AccountCreationWizard: ...@@ -482,7 +482,7 @@ class AccountCreationWizard:
GLib.source_remove(self.update_progressbar_timeout_id) GLib.source_remove(self.update_progressbar_timeout_id)
def on_advanced_button_clicked(self, widget): def on_advanced_button_clicked(self, widget):
from gajim.accounts_window import AccountsWindow from gajim.gtk.accounts import AccountsWindow
window = app.get_app_window(AccountsWindow) window = app.get_app_window(AccountsWindow)
if window is None: if window is None:
window = AccountsWindow() window = AccountsWindow()
......
# This file is part of Gajim.
#
# Gajim is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
# by the Free Software Foundation; version 3 only.
#
# Gajim is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
from functools import partial from functools import partial
from gi.repository import Gtk, GLib, Gdk from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GLib
from gajim.common import app
from gajim import gtkgui_helpers from gajim import gtkgui_helpers
from gajim import gui_menu_builder from gajim import gui_menu_builder
from gajim.common import passwords
from gajim import config from gajim import config
from gajim.options_dialog import OptionsDialog, OptionsBox
from gajim.common import app
from gajim.common import passwords
from gajim.common import helpers from gajim.common import helpers
from gajim.common import ged from gajim.common import ged
from gajim.common.connection import Connection from gajim.common.connection import Connection
from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf
from gajim.options_dialog import OptionsDialog, OptionsBox
from gajim.common.const import Option, OptionKind, OptionType from gajim.common.const import Option, OptionKind, OptionType
from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialog
from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import YesNoDialog
......
...@@ -53,7 +53,6 @@ from gajim import cell_renderer_image ...@@ -53,7 +53,6 @@ from gajim import cell_renderer_image
from gajim import tooltips from gajim import tooltips
from gajim import message_control from gajim import message_control
from gajim import adhoc_commands from gajim import adhoc_commands
from gajim.accounts_window import AccountsWindow
from gajim.common import app from gajim.common import app
from gajim.common import helpers from gajim.common import helpers
...@@ -81,6 +80,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow ...@@ -81,6 +80,7 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow
from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.account_wizard import AccountCreationWizard
from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.service_registration import ServiceRegistration
from gajim.gtk.history import HistoryWindow from gajim.gtk.history import HistoryWindow
from gajim.gtk.accounts import AccountsWindow
log = logging.getLogger('gajim.roster') log = logging.getLogger('gajim.roster')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment