diff options
-rwxr-xr-x | alot/init.py | 12 | ||||
-rw-r--r-- | alot/ui.py | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/alot/init.py b/alot/init.py index 1221f216..92e8aeeb 100755 --- a/alot/init.py +++ b/alot/init.py @@ -142,19 +142,22 @@ def main(): except ConfigError, e: # exit on parse errors sys.exit(e) + # store options given by config swiches to the settingsManager: + if args['colour-mode']: + settings.set('colourmode', args['colour-mode']) + # logging - ## reset root_logger = logging.getLogger() for log_handler in root_logger.handlers: root_logger.removeHandler(log_handler) root_logger = None - ## setup numeric_loglevel = getattr(logging, args['debug-level'].upper(), None) logfilename = os.path.expanduser(args['logfile']) logformat = '%(levelname)s:%(module)s:%(message)s' logging.basicConfig(level=numeric_loglevel, filename=logfilename, format=logformat) + # get ourselves a database manager dbman = DBManager(path=args['mailindex-path'], ro=args['read-only']) @@ -175,10 +178,7 @@ def main(): sys.exit(e) # set up and start interface - UI(dbman, - cmd, - args['colour-mode'], - ) + UI(dbman, cmd) if __name__ == "__main__": main() @@ -71,7 +71,7 @@ class UI(object): dbman = None """Database manager (:class:`~alot.db.DBManager`)""" - def __init__(self, dbman, initialcmd, colourmode): + def __init__(self, dbman, initialcmd): """ :param dbman: :class:`~alot.db.DBManager` :param initialcmd: commandline applied after setting up interface @@ -81,9 +81,7 @@ class UI(object): """ self.dbman = dbman - if not colourmode: - # explicit int-constructor because we used "options" in specfile - colourmode = int(settings.get('colourmode')) + colourmode = int(settings.get('colourmode')) logging.info('setup gui in %d colours' % colourmode) self.mainframe = urwid.Frame(urwid.SolidFill()) self.inputwrap = InputWrap(self, self.mainframe) |