projects
/
lilass.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the zenity backend to work. it doesn't provide all the possible functionality...
[lilass.git]
/
gui.py
diff --git
a/gui.py
b/gui.py
index 40cafa55e8dc2cda6c0850cbfa42723f407b8c99..998783f65c68f4c7372af00771768607f035bdb3 100644
(file)
--- a/
gui.py
+++ b/
gui.py
@@
-1,5
+1,5
@@
# DSL - easy Display Setup for Laptops
# DSL - easy Display Setup for Laptops
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012
-2015
Ralf Jung <post@ralfj.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-42,9
+42,9
@@
class QtFrontend:
from PyQt4 import QtGui
QtGui.QMessageBox.critical(None, 'Fatal error', message)
from PyQt4 import QtGui
QtGui.QMessageBox.critical(None, 'Fatal error', message)
- def setup(self,
internalResolutions, externalResolutions, commonRes
):
+ def setup(self,
situation
):
from qt_dialogue import PositionSelection
from qt_dialogue import PositionSelection
- return PositionSelection(
internalResolutions, externalResolutions, commonRes
).run()
+ return PositionSelection(
situation
).run()
@staticmethod
def isAvailable():
@staticmethod
def isAvailable():
@@
-61,14
+61,14
@@
class ZenityFrontend:
'''Displays a fatal error to the user'''
subprocess.check_call(["zenity", "--error", "--text="+message])
'''Displays a fatal error to the user'''
subprocess.check_call(["zenity", "--error", "--text="+message])
- def setup(self,
internalResolutions, externalResolutions, commonRes
):
+ def setup(self,
situation
):
from zenity_dialogue import run
from zenity_dialogue import run
- return run(
internalResolutions, externalResolutions
)
+ return run(
situation.internalResolutions(), situation.externalResolutions()
)
@staticmethod
def isAvailable():
try:
@staticmethod
def isAvailable():
try:
- from
dsl
import processOutputIt
+ from
screen
import processOutputIt
processOutputIt("zenity", "--version")
return True
except Exception:
processOutputIt("zenity", "--version")
return True
except Exception: