X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/4dd0918b62956f292f8448c32d8c61fbbeacfeb4..5bc8a4bb1394bdf8c3fb0f662725da2e2927ea83:/zenity_dialogue.py?ds=sidebyside

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index e926b3a..7dbbc87 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,7 +16,7 @@
 # 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)
@@ -30,23 +31,17 @@ def userChoose (title, choices, returns, 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)
+    relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT], 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(res2user,internalResolutions)), internalResolutions, None)
-        if intres == None:
-            return None
-    else:
-        extprim = True
-    extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, None)
+    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(relpos,intres,extres,extprim)
+    return ScreenSetup(intres, extres, relpos, extIsPrimary = extprim)