29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff -up hplip-2.8.5/systray.py.systray hplip-2.8.5/systray.py
|
|
--- hplip-2.8.5/systray.py.systray 2008-06-06 08:15:34.000000000 +0100
|
|
+++ hplip-2.8.5/systray.py 2008-06-06 08:20:49.000000000 +0100
|
|
@@ -38,8 +38,8 @@ from prnt import cups
|
|
USAGE = [(__doc__, "", "name", True),
|
|
("Usage: hp-systray [OPTIONS]", "", "summary", True),
|
|
utils.USAGE_OPTIONS,
|
|
- ("Force Qt3:", "--qt3 (default)", "option", False),
|
|
- ("Force Qt4:", "--qt4", "option", False),
|
|
+ ("Force Qt3:", "--qt3", "option", False),
|
|
+ ("Force Qt4:", "--qt4 (default)", "option", False),
|
|
("Startup even if no hplip CUPS queues are present:", "-x or --force-startup", "option", False),
|
|
utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3,
|
|
utils.USAGE_HELP,
|
|
@@ -135,11 +135,11 @@ if __name__ == '__main__':
|
|
os.close(w)
|
|
|
|
try:
|
|
- if force_qt3 or (not force_qt3 and not force_qt4):
|
|
+ if force_qt3:
|
|
from ui import systemtray_qt3
|
|
systemtray_qt3.run(r, child_pid)
|
|
|
|
- elif force_qt4:
|
|
+ elif force_qt4 or (not force_qt3 and not force_qt4):
|
|
from ui import systemtray_qt4
|
|
systemtray_qt4.run(r, child_pid)
|
|
|