lastSetup support in question frontends

[lilass.git] / lilass

diff --git a/lilass b/lilass
index 42c15c67775b08774cfb8d3ba3a73f10a1300079..5dfd19a70cd21d0bb7a38400ecef4dcb65c421a8 100755 (executable)
--- a/lilass
+++ b/lilass
@@ -112,7 +112,7 @@ if __name__ == "__main__":
                             dest="internal_only", action='store_true',
                             help="Enable internal screen, disable all the others.")
         parser.add_argument("-s", "--show",
                             dest="internal_only", action='store_true',
                             help="Enable internal screen, disable all the others.")
         parser.add_argument("-s", "--show",

-                            dest="show", choices=ShowLevels.getNames(),
+                            dest="show", choices=ShowLevels.getNames(), default=ShowLevels.ONEXTERNAL.text,

                             help="In which situations should the UI be displayed?")
         cmdArgs = parser.parse_args()
     
                             help="In which situations should the UI be displayed?")
         cmdArgs = parser.parse_args()
     


@@ -163,11 +163,21 @@ if __name__ == "__main__":
                 else:
                     setup = screen.ScreenSetup(intResolution = situation.internalResolutions()[0], extResolution = situation.externalResolutions()[0], relPosition = relPos)
             else:
                 else:
                     setup = screen.ScreenSetup(intResolution = situation.internalResolutions()[0], extResolution = situation.externalResolutions()[0], relPosition = relPos)
             else:

-                # ask the user
-                setup = frontend.setup(situation)
-                if setup is None: sys.exit(1) # the user canceled
-                with database.Database(databaseFilePath) as db:
-                    situation.putDBInfo(db, setup)
+                showlvl = ShowLevels(cmdArgs.show)
+                if showlvl != ShowLevels.ONEXTERNAL and situation.lastSetup:
+                    # use last config
+                    setup = situation.lastSetup
+                elif showlvl == ShowLevels.ONERROR:
+                    # guess config
+                    setup = screen.ScreenSetup(situation.internalResolutions()[0], situation.externalResolutions()[0], screen.RelativeScreenPosition.RIGHT)
+                    # TODO make default relative position configurable in the config file
+                    # TODO this has a bit of code duplication with the cmdArgs method above
+                else:
+                    # ask the user
+                    setup = frontend.setup(situation)
+                    if setup is None: sys.exit(1) # the user canceled
+                    with database.Database(databaseFilePath) as db:
+                        situation.putDBInfo(db, setup)

         else:
             # use first resolution of internal connector
             setup = screen.ScreenSetup(intResolution = situation.internalConnector.getResolutionList()[0], extResolution = None)
         else:
             # use first resolution of internal connector
             setup = screen.ScreenSetup(intResolution = situation.internalConnector.getResolutionList()[0], extResolution = None)