X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/aaa0b27561726d84cc7c3fcfd16302c87dc628d7..ffc98865eecc0de34e0a33d7d83461ed9d4ee29b:/zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 75011f8..b5e72d0 100644
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -1,5 +1,6 @@
 # DSL - easy Display Setup for Laptops
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012      Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2015 Constantin Berhard<constantin@exxxtremesys.lu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,25 +16,38 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt
+from screen import RelativeScreenPosition, ScreenSetup, processOutputIt
 
 def userChoose (title, choices, returns, fallback):
-	assert len(choices) == len(returns)
-	args = ["zenity", "--list", "--text="+title, "--column="]+choices
-	switch = dict (list(zip (choices,returns)))
-	for line in processOutputIt(*args):
-		return switch.get(line.strip(), fallback)
-	return fallback
+    assert len(choices) == len(returns)
+    args = ["zenity", "--list", "--text="+title, "--column="]+choices
+    switch = dict (list(zip (choices,returns)))
+    try:
+        for line in processOutputIt(*args):
+            return switch.get(line.strip(), fallback)
+    except Exception:
+        # on user cancel, the return code of zenity is nonzero
+        return fallback
+    return fallback
 
 def run (internalResolutions, externalResolutions):
-	relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None)
-	if relpos == None:
-		return None
-	intres = internalResolutions[0]
-	if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
-		intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, internalResolutions[0])
-	extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, externalResolutions[0])
-	extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None)
-	if extprim == None:
-		return None
-	return ScreenSetup(relpos,intres,extres,extprim)
+    relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None)
+    if relpos == None:
+        return None
+    intres = internalResolutions[0]
+    extres = externalResolutions[0]
+    extprim = None
+    if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
+        intres = userChoose ("internal display resolution", list(map(str,internalResolutions)), internalResolutions, None)
+        if intres == None:
+            return None
+    else:
+        extprim = True
+    extres = userChoose ("external display resolution", list(map(str,externalResolutions)), externalResolutions, None)
+    if extres == None:
+        return None
+    if extprim == None:
+        extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None)
+    if extprim == None:
+        return None
+    return ScreenSetup(intres,extres,relpos,extprim)