Merge branch 'master' of ralfj.de:dsl

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index edb9b2b9a8086ceeeddb794986891cb6599df1fb..25f71c2e7c28fc1c477cd07182fa19d65a3f0a99 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -12,14 +12,19 @@
 # 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
 from PyQt4 import QtGui
 import sys
 from PyQt4 import QtGui

+from qt_dialogue import PositionSelection

 app = QtGui.QApplication(sys.argv)
 
 def error(message):
 app = QtGui.QApplication(sys.argv)
 
 def error(message):

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

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

-       raise Exception(message)
+
+def setup(internalResolutions, externalResolutions):
+       '''Returns a ScreenSetup instance, or None if the user canceled'''
+       return PositionSelection(internalResolutions, externalResolutions).run()