Imported Upstream version 3.16.5

1 files changed, 16 insertions, 8 deletions

diff --git a/faxsetup.py b/faxsetup.py
index 1a4de1ee0..dd704d2c3 100755
--- a/faxsetup.py
+++ b/faxsetup.py
@@ -39,10 +39,16 @@ from base import device, utils, maint, tui, module
 from prnt import cups
 
 
+try:
+    from importlib import import_module
+except ImportError as e:
+    log.debug(e)
+    from base.utils import dyn_import_mod as import_module
+
 
 try:
     mod = module.Module(__mod__, __title__, __version__, __doc__, None,
-                        (GUI_MODE,), (UI_TOOLKIT_QT4,))
+                        (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
                         
     mod.setUsage(module.USAGE_FLAG_DEVICE_ARGS,
                  see_also_list=['hp-sendfax', 'hp-fab'])
@@ -60,15 +66,17 @@ try:
         log.error("%s requires Qt4 GUI support. Exiting." % __mod__)
         sys.exit(1)
 
-    try:
-        from PyQt4.QtGui import QApplication
-        from ui4.faxsetupdialog import FaxSetupDialog
-    except ImportError:
-        log.error("Unable to load Qt4 support. Is it installed?")
-        sys.exit(1)        
+    # try:
+    #     from PyQt4.QtGui import QApplication
+    #     from ui4.faxsetupdialog import FaxSetupDialog
+    # except ImportError:
+    #     log.error("Unable to load Qt4 support. Is it installed?")
+    #     sys.exit(1)        
+    QApplication, ui_package = utils.import_dialog(ui_toolkit)
+    ui = import_module(ui_package + ".faxsetupdialog")
 
     app = QApplication(sys.argv)
-    dlg = FaxSetupDialog(None, device_uri)
+    dlg = ui.FaxSetupDialog(None, device_uri)
     dlg.show()
     try:
         log.debug("Starting GUI loop...")