zenity stuff now successfully tested

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index a85f2d52bcb8bd57abe07eb0e303f4a06c5f02aa..0f83c2396d28967d539af1d916493f3f9bf97014 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -12,13 +12,28 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License

-# along with this program (gpl.txt); if not, write to the Free Software
+# along with this program; if not, write to the Free Software

 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 

-# This file bstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
+# This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it

 import sys
 import sys

-from PyQt4 import QtGui
-app = QtGui.QApplication(sys.argv)
+
+qt_available = True
+try:
+       from PyQt4 import QtGui
+       from qt_dialogue import PositionSelection
+       app = QtGui.QApplication(sys.argv)
+except Exception, e:
+       from zenity_dialogue import run as zenity_run
+       qt_available = False

 
 def error(message):
 
 def error(message):

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

        QtGui.QMessageBox.critical(None, 'Fatal error', message)
        QtGui.QMessageBox.critical(None, 'Fatal error', message)

+
+def setup(internalResolutions, externalResolutions):
+       '''Returns a ScreenSetup instance, or None if the user canceled'''
+       if qt_available:
+               return PositionSelection(internalResolutions, externalResolutions).run()
+       else:
+               return zenity_run(internalResolutions, externalResolutions)