Move the GUI frontend doc out of the Qt implementation

diff --git a/gui.py b/gui.py
index 155226b3939fff4598786870baa61b3aedf13396..b3929cbed6835543ed23add3663b461d6cc2bc9b 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -18,6 +18,18 @@
 # This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 import sys
 
 # This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 import sys
 

+'''
+This module implements two functions:
+
+def error(message):
+       This function displays the error message to the user in some appropriate fassion
+
+def setup(internalResolutions, externalResolutions):
+       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:
 # frontend detectors
 def qtAvailable():
        try:


@@ -29,19 +41,18 @@ def qtAvailable():
 def zenityAvailable():
        return True # FIXME
 
 def zenityAvailable():
        return True # FIXME
 

-# actual frontend
+# actual frontends

 if qtAvailable():
        from PyQt4 import QtGui
        from qt_dialogue import PositionSelection
        app = QtGui.QApplication(sys.argv)
        
        def error(message):
 if qtAvailable():
        from PyQt4 import QtGui
        from qt_dialogue import PositionSelection
        app = QtGui.QApplication(sys.argv)
        
        def error(message):

-               '''Displays a fatal error to the user'''

                QtGui.QMessageBox.critical(None, 'Fatal error', message)
        
        def setup(internalResolutions, externalResolutions):
                QtGui.QMessageBox.critical(None, 'Fatal error', message)
        
        def setup(internalResolutions, externalResolutions):

-               '''Returns a ScreenSetup instance, or None if the user canceled'''

                return PositionSelection(internalResolutions, externalResolutions).run()
                return PositionSelection(internalResolutions, externalResolutions).run()

+

 elif zenityAvailable():
        import subprocess
        from zenity_dialogue import run as setup # this provides the setup function
 elif zenityAvailable():
        import subprocess
        from zenity_dialogue import run as setup # this provides the setup function


@@ -49,5 +60,6 @@ elif zenityAvailable():
        def error(message):
                '''Displays a fatal error to the user'''
                subprocess.check_call(["zenity", "--error", "--text="+message])
        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'
 else:
        print >> sys.stderr, 'No GUI frontend available, please make sure PyQt4 or Zenity is installed'

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 45cf557a9bea9edbca5b744bee84f094c7f79090..69365e8325d8c8882f06450ca3f28ec5e0f1b6ee 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -22,7 +22,7 @@ def userChoose (title, choices, returns, fallback):
        assert len(choices) == len(returns)
        p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
        switch = dict (zip (choices,returns))
        assert len(choices) == len(returns)
        p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
        switch = dict (zip (choices,returns))

-       for line in p.stdout:
+       for line in p.stdout: # FIXME use p.communicate()[0] instead to get entire stdout and ensure the process terminates. also check p.returncode.

                return switch.get(line.strip(), fallback)
        return fallback
 
                return switch.get(line.strip(), fallback)
        return fallback