X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/1fabdda231c0be36747b39fd681773a03d1bcf93..1b0001147e5d8209a2a2a209edaa93264a143473:/gui.py

diff --git a/gui.py b/gui.py
index edb9b2b..a0fb3bb 100644
--- 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
-# 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.
 
 # This file bstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 import sys
 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)
-	raise Exception(message)
+
+def setup(internalResolutions, externalResolutions):
+	'''Returns a ScreenSetup instance, or None if the user canceled'''
+	return PositionSelection(internalResolutions, externalResolutions).run()