refactor pretty much everything. some features are still missing.

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 93213e9af1a0fc00003aaba46d205275e90e56e1..b5e72d07d7f331b1cb77255f221f5859c160f9e4 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -1,5 +1,6 @@
 # DSL - easy Display Setup for Laptops
 # 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
 #
 # 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,14 +16,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # 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)))
 
 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)
+    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):
     return fallback
 
 def run (internalResolutions, externalResolutions):


@@ -30,10 +35,19 @@ def run (internalResolutions, externalResolutions):
     if relpos == None:
         return None
     intres = internalResolutions[0]
     if relpos == None:
         return None
     intres = internalResolutions[0]

+    extres = externalResolutions[0]
+    extprim = None

     if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
     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)
+        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
     if extprim == None:
         return None

-    return ScreenSetup(relpos,intres,extres,extprim)
+    return ScreenSetup(intres,extres,relpos,extprim)