Moved more files to qt/

pocc · Aug 18, 2019 · ec28f44 · ec28f44
1 parent 33f4f48
commit ec28f44
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/merlink/__init__.py b/merlink/__init__.py
@@ -21,7 +21,7 @@
 
 from .merlink_cli import MainCli
 from .merlink_gui import MainWindow
-from merlink.merlink_gui_utils import check_for_duplicate_instance
+from merlink.qt.gui_utils import check_for_duplicate_instance
 from . import os_utils
 
 

diff --git a/merlink/merlink_gui.py b/merlink/merlink_gui.py
@@ -17,11 +17,11 @@
 from PyQt5.QtWidgets import QDialog
 
 from merlink.browsers.client_vpn import ClientVpnBrowser
-from merlink import merlink_gui_qt as main_window
+from merlink.qt import main_window
 from merlink.qt.pane_login_fullscreen import TfaDialogUi
 from merlink.qt.menu_bars import MenuBarsUi
 from merlink.qt.system_tray import SystrayIconUi
-from merlink.merlink_gui_utils import show_error_dialog, vpn_status_dialog
+from merlink.qt.gui_utils import show_error_dialog, vpn_status_dialog
 from merlink.vpn.vpn_connection import VpnConnection
 
 

diff --git a/merlink/merlink_gui_utils.py → merlink/qt/gui_utils.py b/merlink/merlink_gui_utils.py → merlink/qt/gui_utils.py
diff --git a/merlink/merlink_gui_qt.py → merlink/qt/main_window.py b/merlink/merlink_gui_qt.py → merlink/qt/main_window.py
diff --git a/merlink/qt/menu_bars.py b/merlink/qt/menu_bars.py
@@ -8,7 +8,7 @@
 from PyQt5.QtWidgets import QAction
 
 from merlink.os_utils import open_vpnsettings
-from merlink.merlink_gui_utils import show_error_dialog
+from merlink.qt.gui_utils import show_error_dialog
 
 
 class MenuBarsUi: