[config] finished moving

bauh/view/qt/gem_selector.py

@@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QWidget, QLabel, QGridLayout, QPushButton
 
 from bauh import ROOT_DIR
 from bauh.api.abstract.view import MultipleSelectComponent, InputOption
-from bauh.view.core.config import Configuration, save
+from bauh.view.core.config import save
 from bauh.view.core.controller import GenericSoftwareManager
 from bauh.view.util import resource
 from bauh.view.qt import qt_utils, css
@@ -14,7 +14,7 @@ from bauh.view.util.translation import I18n
 
 class GemSelectorPanel(QWidget):
 
-    def __init__(self, window: QWidget, manager: GenericSoftwareManager, i18n: I18n, config: Configuration, show_panel_after_restart: bool = False):
+    def __init__(self, window: QWidget, manager: GenericSoftwareManager, i18n: I18n, config: dict, show_panel_after_restart: bool = False):
         super(GemSelectorPanel, self).__init__()
         self.window = window
         self.manager = manager
@@ -57,8 +57,8 @@ class GemSelectorPanel(QWidget):
                 if m.is_enabled() and m in manager.working_managers:
                     default.add(op)
 
-        if self.config.enabled_gems:
-            default_ops = {o for o in gem_options if o.value in self.config.enabled_gems}
+        if self.config['gems']:
+            default_ops = {o for o in gem_options if o.value in self.config['gems']}
         else:
             default_ops = default
 
@@ -89,7 +89,7 @@ class GemSelectorPanel(QWidget):
             enabled = module in enabled_gems
             man.set_enabled(enabled)
 
-        self.config.enabled_gems = enabled_gems
+        self.config['gems'] = enabled_gems
         save(self.config)
 
         self.manager.reset_cache()

bauh/view/qt/styles.py

@@ -35,7 +35,7 @@ class StylesComboBox(QComboBox):
             style = self.styles[idx]
 
             user_config = config.read_config()
-            user_config.style = style
+            user_config['ui']['style'] = style
             config.save(user_config)
 
             util.restart_app(self.show_panel_after_restart)

bauh/view/qt/systray.py

@@ -36,13 +36,13 @@ class UpdateCheck(QThread):
 
 class TrayIcon(QSystemTrayIcon):
 
-    def __init__(self, i18n: I18n, manager: SoftwareManager, manage_window: ManageWindow, check_interval: int = 60, update_notification: bool = True):
+    def __init__(self, i18n: I18n, manager: SoftwareManager, manage_window: ManageWindow, config: dict):
         super(TrayIcon, self).__init__()
         self.i18n = i18n
         self.manager = manager
 
-        self.icon_default = QIcon(os.getenv('BAUH_TRAY_DEFAULT_ICON_PATH', resource.get_path('img/logo.png')))
-        self.icon_update = QIcon(os.getenv('BAUH_TRAY_UPDATES_ICON_PATH', resource.get_path('img/logo_update.png')))
+        self.icon_default = QIcon(config['ui']['tray']['default_icon'] or resource.get_path('img/logo.png'))
+        self.icon_update = QIcon(config['ui']['tray']['updates_icon'] or resource.get_path('img/logo_update.png'))
         self.setIcon(self.icon_default)
 
         self.menu = QMenu()
@@ -60,12 +60,12 @@ class TrayIcon(QSystemTrayIcon):
 
         self.manage_window = None
         self.dialog_about = None
-        self.check_thread = UpdateCheck(check_interval=check_interval, manager=self.manager)
+        self.check_thread = UpdateCheck(check_interval=int(config['updates']['check_interval']), manager=self.manager)
         self.check_thread.signal.connect(self.notify_updates)
         self.check_thread.start()
 
         self.last_updates = set()
-        self.update_notification = update_notification
+        self.update_notification = bool(config['system']['notifications'])
         self.lock_notify = Lock()
 
         self.activated.connect(self.handle_click)

bauh/view/qt/window.py

@@ -17,7 +17,6 @@ from bauh.api.abstract.model import SoftwarePackage, PackageAction
 from bauh.api.abstract.view import MessageType
 from bauh.api.http import HttpClient
 from bauh.commons.html import bold
-from bauh.view.core.config import Configuration
 from bauh.view.core.controller import GenericSoftwareManager
 from bauh.view.qt import dialog, commons, qt_utils
 from bauh.view.qt.about import AboutDialog
@@ -51,7 +50,7 @@ class ManageWindow(QWidget):
     signal_user_res = pyqtSignal(bool)
     signal_table_update = pyqtSignal()
 
-    def __init__(self, i18n: I18n, icon_cache: MemoryCache, manager: SoftwareManager, screen_size, config: Configuration,
+    def __init__(self, i18n: I18n, icon_cache: MemoryCache, manager: SoftwareManager, screen_size, config: dict,
                  context: ApplicationContext, http_client: HttpClient, logger: logging.Logger, tray_icon=None):
         super(ManageWindow, self).__init__()
         self.i18n = i18n
@@ -62,7 +61,7 @@ class ManageWindow(QWidget):
         self.pkgs = []  # packages current loaded in the table
         self.pkgs_available = []  # all packages loaded in memory
         self.pkgs_installed = []  # cached installed packages
-        self.display_limit = config.max_displayed
+        self.display_limit = config['ui']['table']['max_displayed']
         self.icon_cache = icon_cache
         self.screen_size = screen_size
         self.config = config
@@ -208,7 +207,9 @@ class ManageWindow(QWidget):
 
         self.layout.addWidget(self.toolbar)
 
-        self.table_apps = AppsTable(self, self.icon_cache, disk_cache=self.config.disk_cache, download_icons=self.config.download_icons)
+        self.table_apps = AppsTable(self, self.icon_cache,
+                                    disk_cache=bool(self.config['disk_cache']['enabled']),
+                                    download_icons=bool(self.config['download']['icons']))
         self.table_apps.change_headers_policy()
 
         self.layout.addWidget(self.table_apps)
@@ -260,7 +261,7 @@ class ManageWindow(QWidget):
         self.thread_apply_filters.signal_table.connect(self._update_table_and_upgrades)
         self.signal_table_update.connect(self.thread_apply_filters.stop_waiting)
 
-        self.thread_install = InstallPackage(manager=self.manager, disk_cache=self.config.disk_cache, icon_cache=self.icon_cache, i18n=self.i18n)
+        self.thread_install = InstallPackage(manager=self.manager, disk_cache=bool(self.config['disk_cache']['enabled']), icon_cache=self.icon_cache, i18n=self.i18n)
         self._bind_async_action(self.thread_install, finished_call=self._finish_install)
 
         self.thread_animate_progress = AnimateProgress()
@@ -308,7 +309,7 @@ class ManageWindow(QWidget):
         self.types_changed = False
 
         self.dialog_about = None
-        self.first_refresh = config.suggestions
+        self.first_refresh = bool(config['suggestions']['enabled'])
 
         self.thread_warnings = ListWarnings(man=manager, i18n=i18n)
         self.thread_warnings.signal_warnings.connect(self._show_warnings)
@@ -533,6 +534,9 @@ class ManageWindow(QWidget):
             only_pkg_type = len([p for p in self.pkgs if p.model.get_type() == pkgv.model.get_type()]) >= 2
             self.recent_uninstall = True
             self.refresh_apps(pkg_types={pkgv.model.__class__} if only_pkg_type else None)
+
+            if self.tray_icon:
+                self.tray_icon.verify_updates()
         else:
             if self._can_notify_user():
                 util.notify_user('{}: {}'.format(pkgv.model.name, self.i18n['notification.uninstall.failed']))
@@ -540,7 +544,7 @@ class ManageWindow(QWidget):
             self.checkbox_console.setChecked(True)
 
     def _can_notify_user(self):
-        return self.config.system_notifications and (self.isHidden() or self.isMinimized())
+        return bool(self.config['system']['notifications']) and (self.isHidden() or self.isMinimized())
 
     def _finish_downgrade(self, res: dict):
         self.finish_action()