refactor: Remove dynamic GUI import

This was an intended to provide a possibility to develop
alternative GUIs for specific dialogs but didnt catch on.

- Use absolut imports everywhere

11 files changed, 11 insertions, 45 deletions

diff --git a/test/gtk/assistant.py b/test/gtk/assistant.py
index 7d31e0890..5a4547e1a 100644
--- a/test/gtk/assistant.py
+++ b/test/gtk/assistant.py
@@ -1,12 +1,9 @@
 from gi.repository import Gtk
 
-from gajim import gui
 from gajim.common.const import CSSPriority
 
-gui.init('gtk')
-
-from gajim.gui.assistant import Assistant
-from gajim.gui.assistant import Page
+from gajim.gtk.assistant import Assistant
+from gajim.gtk.assistant import Page
 
 from . import util
 
diff --git a/test/gtk/certificate_dialog.py b/test/gtk/certificate_dialog.py
index 1435c9367..ecb0ff474 100644
--- a/test/gtk/certificate_dialog.py
+++ b/test/gtk/certificate_dialog.py
@@ -1,12 +1,9 @@
 from gi.repository import Gio
 from gi.repository import Gtk
 
-from gajim import gui
 from gajim.common.const import CSSPriority
 
-gui.init('gtk')
-
-from gajim.gui.certificate_dialog import CertificateDialog
+from gajim.gtk.certificate_dialog import CertificateDialog
 
 from . import util
 
diff --git a/test/gtk/change_password.py b/test/gtk/change_password.py
index b6d454667..fdbcb928b 100644
--- a/test/gtk/change_password.py
+++ b/test/gtk/change_password.py
@@ -5,13 +5,10 @@ from gi.repository import Gtk
 from nbxmpp.modules.dataforms import create_field
 from nbxmpp.modules.dataforms import SimpleDataForm
 
-from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-gui.init('gtk')
-
-from gajim.gui.change_password import ChangePassword
+from gajim.gtk.change_password import ChangePassword
 
 from . import util
 
diff --git a/test/gtk/dataform.py b/test/gtk/dataform.py
index 98e224536..cf738ae58 100644
--- a/test/gtk/dataform.py
+++ b/test/gtk/dataform.py
@@ -5,13 +5,10 @@ from gi.repository import Gtk
 from nbxmpp.modules.dataforms import extend_form
 from nbxmpp.simplexml import Node
 
-from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-gui.init('gtk')
-
-from gajim.gui.dataform import DataFormWidget
+from gajim.gtk.dataform import DataFormWidget
 
 from . import util
 
diff --git a/test/gtk/fake_dataform.py b/test/gtk/fake_dataform.py
index 5de103449..6cd50e6a9 100644
--- a/test/gtk/fake_dataform.py
+++ b/test/gtk/fake_dataform.py
@@ -1,11 +1,8 @@
 from gi.repository import Gtk
 
-from gajim import gui
-
-gui.init('gtk')
-
 from gajim.common.const import CSSPriority
-from gajim.gui.dataform import FakeDataFormWidget
+
+from gajim.gtk.dataform import FakeDataFormWidget
 
 from . import util
 
diff --git a/test/gtk/groupchat_info.py b/test/gtk/groupchat_info.py
index d555bb771..2f4138d43 100644
--- a/test/gtk/groupchat_info.py
+++ b/test/gtk/groupchat_info.py
@@ -5,13 +5,10 @@ from nbxmpp.modules.discovery import parse_disco_info
 from nbxmpp.protocol import Iq
 from nbxmpp.structs import MucSubject
 
-from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-gui.init('gtk')
-
-from gajim.gui.groupchat_info import GroupChatInfoScrolled
+from gajim.gtk.groupchat_info import GroupChatInfoScrolled
 
 from . import util
 
diff --git a/test/gtk/ssl_error_dialog.py b/test/gtk/ssl_error_dialog.py
index fa8b0913c..0a874ab19 100644
--- a/test/gtk/ssl_error_dialog.py
+++ b/test/gtk/ssl_error_dialog.py
@@ -3,12 +3,10 @@ from unittest.mock import MagicMock
 from gi.repository import Gio
 from gi.repository import Gtk
 
-from gajim import gui
-
-gui.init('gtk')
 from gajim.common import app
 from gajim.common.const import CSSPriority
-from gajim.gui.ssl_error_dialog import SSLErrorDialog
+
+from gajim.gtk.ssl_error_dialog import SSLErrorDialog
 
 from . import util
 
diff --git a/test/no_gui/test_gtk_menus.py b/test/no_gui/test_gtk_menus.py
index 0fa84754a..c1081305a 100644
--- a/test/no_gui/test_gtk_menus.py
+++ b/test/no_gui/test_gtk_menus.py
@@ -1,11 +1,8 @@
 import unittest
 
-from gajim import gui
 from gajim.common.const import URIType
 from gajim.common.const import XmppUriQuery
 
-gui.init('gtk')
-
 from gajim.gtk.menus import _uri_context_menus
 from gajim.gtk.menus import _xmpp_uri_context_menus
 
diff --git a/test/no_gui/test_gtk_util.py b/test/no_gui/test_gtk_util.py
index 7f1ba972e..7f16cd9a7 100644
--- a/test/no_gui/test_gtk_util.py
+++ b/test/no_gui/test_gtk_util.py
@@ -1,9 +1,5 @@
 import unittest
 
-from gajim import gui
-
-gui.init('gtk')
-
 from gajim.gtk.util import get_first_grapheme
 
 
diff --git a/test/no_gui/test_nick_completion.py b/test/no_gui/test_nick_completion.py
index 73da7e2d1..2d119053a 100644
--- a/test/no_gui/test_nick_completion.py
+++ b/test/no_gui/test_nick_completion.py
@@ -1,12 +1,9 @@
 import unittest
 from unittest.mock import MagicMock
 
-from gajim import gui
 from gajim.common import app
 
-gui.init('gtk')
-
-from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion
+from gajim.gtk.groupchat_nick_completion import GroupChatNickCompletion
 
 
 class Test(unittest.TestCase):
diff --git a/test/no_gui/test_styling.py b/test/no_gui/test_styling.py
index 96635cda4..6ecec02bf 100644
--- a/test/no_gui/test_styling.py
+++ b/test/no_gui/test_styling.py
@@ -1,10 +1,6 @@
 import unittest
 from unittest.mock import MagicMock
 
-from gajim import gui
-
-gui.init('gtk')
-
 from gajim.common import app  # Avoids circular imports from common.helpers
 from gajim.common import styling
 from gajim.common.styling import EmphasisSpan