Merge branch 'staging' into modules

# Conflicts:
#	CHANGELOG.md

fpakman/app.py

@@ -20,6 +20,7 @@ from fpakman.util.cache import Cache
 from fpakman.util.memory import CacheCleaner
 from fpakman.view.qt import dialog
 from fpakman.view.qt.systray import TrayIcon
+from fpakman.view.qt.window import ManageWindow
 
 
 def log_msg(msg: str, color: int = None):
@@ -40,6 +41,7 @@ parser.add_argument('-n', '--update-notification', action="store", choices=[0, 1
 parser.add_argument('-dc', '--disk-cache', action="store", choices=[0, 1], default=os.getenv('FPAKMAN_DISK_CACHE', 1), type=int, help='Enables / disables disk cache. When disk cache is enabled, the installed applications data are loaded faster. Default: %(default)s')
 parser.add_argument('-di', '--download-icons', action="store", choices=[0, 1], default=os.getenv('FPAKMAN_DOWNLOAD_ICONS', 1), type=int, help='Enables / disables app icons download. It may improve the application speed, depending of how applications data are retrieved by their extensions.')
 parser.add_argument('-co', '--check-packaging-once', action="store", default=os.getenv('FPAKMAN_CHECK_PACKAGING_ONCE', 0), choices=[0, 1], type=int, help='If the available supported packaging types should be checked ONLY once. It improves the application speed if enabled, but can generate errors if you uninstall any packaging technology while using it, and every time a supported packaging type is installed it will only be available after a restart. Default: %(default)s')
+parser.add_argument('--tray', action="store", default=os.getenv('FPAKMAN_TRAY', 1), choices=[0, 1], type=int, help='If the tray icon and update-check daemon should be created. Default: %(default)s')
 args = parser.parse_args()
 
 if args.cache_exp < 0:
@@ -114,16 +116,27 @@ app.setApplicationName(__app_name__)
 app.setApplicationVersion(__version__)
 app.setWindowIcon(QIcon(resource.get_path('img/logo.svg')))
 
-trayIcon = TrayIcon(locale_keys=locale_keys,
-                    manager=manager,
-                    check_interval=args.check_interval,
-                    icon_cache=icon_cache,
-                    disk_cache=args.disk_cache,
-                    update_notification=bool(args.update_notification),
-                    download_icons=args.download_icons,
-                    screen_size=app.primaryScreen().size())
+screen_size = app.primaryScreen().size()
 
-trayIcon.show()
+manage_window = ManageWindow(locale_keys=locale_keys,
+                             manager=manager,
+                             icon_cache=icon_cache,
+                             disk_cache=args.disk_cache,
+                             download_icons=bool(args.download_icons),
+                             screen_size=screen_size)
+
+if args.tray:
+    trayIcon = TrayIcon(locale_keys=locale_keys,
+                        manager=manager,
+                        manage_window=manage_window,
+                        check_interval=args.check_interval,
+                        update_notification=bool(args.update_notification))
+
+    manage_window.tray_icon = trayIcon
+    trayIcon.show()
+else:
+    manage_window.refresh_apps()
+    manage_window.show()
 
 CacheCleaner(caches).start()