|
 |
986012 |
diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
|
|
|
986012 |
--- hplip-3.16.7/base/utils.py.ui-optional 2016-07-15 12:12:28.000000000 +0200
|
|
|
986012 |
+++ hplip-3.16.7/base/utils.py 2016-08-12 10:12:24.599398769 +0200
|
|
|
986012 |
@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
|
|
|
986012 |
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
|
|
|
986012 |
no_qt_message_gtk()
|
|
|
986012 |
|
|
|
986012 |
+ # hplip-gui sub-package (Fedora)
|
|
|
986012 |
+ try:
|
|
|
986012 |
+ import ui
|
|
|
986012 |
+ except ImportError:
|
|
|
986012 |
+ log.error("hplip-gui not installed. GUI not available. Exiting.")
|
|
|
986012 |
+ return False
|
|
|
986012 |
+
|
|
|
986012 |
log.error("PyQt not installed. GUI not available. Exiting.")
|
|
|
986012 |
return False
|
|
|
986012 |
|
|
|
986012 |
@@ -783,7 +790,8 @@ def checkPyQtImport4():
|
|
|
986012 |
import PyQt5
|
|
|
986012 |
import ui5
|
|
|
986012 |
else:
|
|
|
986012 |
- log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
|
|
|
986012 |
+ # hplip-gui sub-package (Fedora) requires python3-qt5
|
|
|
986012 |
+ log.error("Install the hplip-gui package for graphical support.")
|
|
|
986012 |
return False
|
|
|
986012 |
return True
|
|
|
986012 |
|
|
|
986012 |
@@ -2434,6 +2442,7 @@ def checkPyQtImport45():
|
|
|
986012 |
except ImportError as e:
|
|
|
986012 |
log.debug(e)
|
|
|
986012 |
|
|
|
986012 |
+ log.error("Install the hplip-gui package for graphical support.")
|
|
|
986012 |
raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
|
|
|
986012 |
|
|
|
986012 |
|
|
|
986012 |
@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit):
|
|
|
986012 |
return (QApplication, "ui4")
|
|
|
986012 |
except ImportError as e:
|
|
|
986012 |
log.error(e)
|
|
|
986012 |
+ log.error("Unable to load Qt support. Is hplip-gui package installed?")
|
|
|
986012 |
sys.exit(1)
|
|
|
986012 |
elif ui_toolkit == "qt5":
|
|
|
986012 |
try:
|
|
|
986012 |
@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit):
|
|
|
986012 |
return (QApplication, "ui5")
|
|
|
986012 |
except ImportError as e:
|
|
|
986012 |
log.error(e)
|
|
|
986012 |
- sys.exit(1)
|
|
|
986012 |
- else:
|
|
|
986012 |
- log.error("Unable to load Qt support. Is it installed?")
|
|
|
986012 |
+ log.error("Unable to load Qt support. Is hplip-gui package installed?")
|
|
|
986012 |
sys.exit(1)
|
|
|
986012 |
|
|
|
986012 |
|