X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/41c87e2c4099296550511b3752358e7417e62877..0d513b43eb63d88ff9b1262dedda26b330d2505e:/gui.py

diff --git a/gui.py b/gui.py
index 7c9979d..b3929cb 100644
--- a/gui.py
+++ b/gui.py
@@ -18,26 +18,48 @@
 # This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 import sys
 
-qt_available = True
-try:
-	from PyQt4 import QtGui
-	from qt_dialogue import PositionSelection
-	app = QtGui.QApplication(sys.argv)
-except Exception, e:
-	import subprocess
-	from zenity_dialogue import run as zenity_run
-	qt_available = False
+'''
+This module implements two functions:
 
 def error(message):
-	'''Displays a fatal error to the user'''
-	if qt_available:
-		QtGui.QMessageBox.critical(None, 'Fatal error', message)
-	else:
-		subprocess.Popen(["zenity", "--error", "--text="+message], stdout=subprocess.PIPE)
+	This function displays the error message to the user in some appropriate fassion
 
 def setup(internalResolutions, externalResolutions):
-	'''Returns a ScreenSetup instance, or None if the user canceled'''
-	if qt_available:
+	Both arguments are lists of (width, height) tuples of resolutions. You can use dsl.res2user to obtain a user-readable representation of a resolution tuple.
+	The user should be asked about his display setup preferences.
+	The function returns None if the user cancelled, and an instance of dsl.ScreenSetup otherwise.
+'''
+
+# frontend detectors
+def qtAvailable():
+	try:
+		import PyQt4
+		return True
+	except ImportError:
+		return False
+
+def zenityAvailable():
+	return True # FIXME
+
+# actual frontends
+if qtAvailable():
+	from PyQt4 import QtGui
+	from qt_dialogue import PositionSelection
+	app = QtGui.QApplication(sys.argv)
+	
+	def error(message):
+		QtGui.QMessageBox.critical(None, 'Fatal error', message)
+	
+	def setup(internalResolutions, externalResolutions):
 		return PositionSelection(internalResolutions, externalResolutions).run()
-	else:
-		return zenity_run(internalResolutions, externalResolutions)
+
+elif zenityAvailable():
+	import subprocess
+	from zenity_dialogue import run as setup # this provides the setup function
+	
+	def error(message):
+		'''Displays a fatal error to the user'''
+		subprocess.check_call(["zenity", "--error", "--text="+message])
+
+else:
+	print >> sys.stderr, 'No GUI frontend available, please make sure PyQt4 or Zenity is installed'