rework GUI frontend selection

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 8cba4d9dff7b7dc351308b362c9baacc3e4c3a60..45cf557a9bea9edbca5b744bee84f094c7f79090 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -12,32 +12,29 @@
 # 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.
 
 import subprocess
 from dsl import RelativeScreenPosition, ScreenSetup, res2user
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import subprocess
 from dsl import RelativeScreenPosition, ScreenSetup, res2user
 

-def userChoose (title, choices, returns):
+def userChoose (title, choices, returns, fallback):

        assert len(choices) == len(returns)
        p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
        assert len(choices) == len(returns)
        p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)

-       switch = zip (choices,returns)
+       switch = dict (zip (choices,returns))

        for line in p.stdout:
        for line in p.stdout:

-               return switch.get(line, None)
+               return switch.get(line.strip(), fallback)
+       return fallback

 
 def run (internalResolutions, externalResolutions):
 
 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])
+       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:
        if relpos == None:
                return None
        intres = internalResolutions[0]
        if relpos != RelativeScreenPosition.EXTERNAL_ONLY:

-               intres = userChoose ("internal display resolution", map(res2user,internalResolutions), internalResolutions)
-       if intres == None:
-               return None
-       extres = userChoose ("external display resolution", map(res2user,externalResolutions), externalResolutions)
-       if extres == None:
-               return None
-       extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True])
+               intres = userChoose ("internal display resolution", map(res2user,internalResolutions), internalResolutions, internalResolutions[0])
+       extres = userChoose ("external display resolution", 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)
        if extprim == None:
                return None
        return ScreenSetup(relpos,intres,extres,extprim)