From 56550ba5a49010c6b3c9ea0622823f838d02b76d Mon Sep 17 00:00:00 2001
From: Dummerle <lennardbaeumer@gmail.com>
Date: Fri, 9 Apr 2021 13:00:40 +0200
Subject: [PATCH] Hide launch_dialog.py on login; Better compare version
 numbers

---
 rare/components/dialogs/launch_dialog.py |  2 ++
 rare/components/tabs/account/__init__.py |  2 +-
 rare/components/tabs/settings/about.py   | 11 ++++++++---
 rare/components/tray_icon.py             |  2 +-
 start.sh                                 |  0
 5 files changed, 12 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 start.sh

diff --git a/rare/components/dialogs/launch_dialog.py b/rare/components/dialogs/launch_dialog.py
index 3ecf2d51..ab04a9e1 100644
--- a/rare/components/dialogs/launch_dialog.py
+++ b/rare/components/dialogs/launch_dialog.py
@@ -69,7 +69,9 @@ class LaunchDialog(QDialog):
         self.setLayout(self.layout)
 
     def login(self):
+        self.hide()
         if LoginDialog(core=self.core).login():
+            self.show()
             self.login_thread.start()
         else:
             exit(0)
diff --git a/rare/components/tabs/account/__init__.py b/rare/components/tabs/account/__init__.py
index 8aff5de0..ddaad71d 100644
--- a/rare/components/tabs/account/__init__.py
+++ b/rare/components/tabs/account/__init__.py
@@ -37,4 +37,4 @@ class MiniWidget(QWidget):
         if reply == QMessageBox.Yes:
             self.core.lgd.invalidate_userdata()
             # restart app
-            QCoreApplication.instance().exit_action(-133742)  # restart exit code
+            QCoreApplication.instance().exit(-133742)  # restart exit code
diff --git a/rare/components/tabs/settings/about.py b/rare/components/tabs/settings/about.py
index 15b9793c..618f4098 100644
--- a/rare/components/tabs/settings/about.py
+++ b/rare/components/tabs/settings/about.py
@@ -6,6 +6,10 @@ from rare import __version__
 from rare.utils.utils import get_latest_version
 
 
+def versiontuple(v):
+    return tuple(map(int, (v.split("."))))
+
+
 class About(QWidget):
     def __init__(self):
         super(About, self).__init__()
@@ -17,14 +21,15 @@ class About(QWidget):
         self.version = QLabel("Version: " + __version__)
         self.layout.addWidget(self.version)
         latest_tag = get_latest_version()
-        self.update_available = latest_tag != __version__
-        if latest_tag != __version__:
+        self.update_available = versiontuple(latest_tag) > versiontuple(__version__)
+        if self.update_available:
             print(f"Update available: {__version__} -> {latest_tag}")
             self.update_available = QLabel(self.tr("Update available: {} -> {}").format(__version__, latest_tag))
             self.layout.addWidget(self.update_available)
             self.open_browser = QPushButton(self.tr("Download latest release"))
             self.layout.addWidget(self.open_browser)
-            self.open_browser.clicked.connect(lambda: webbrowser.open("https://github.com/Dummerle/Rare/releases/latest"))
+            self.open_browser.clicked.connect(
+                lambda: webbrowser.open("https://github.com/Dummerle/Rare/releases/latest"))
 
         self.dev = QLabel(self.tr("Developer:") + "<a href='https://github.com/Dummerle'>Dummerle</a>")
         self.dev.setToolTip("Github")
diff --git a/rare/components/tray_icon.py b/rare/components/tray_icon.py
index 3b80f061..c3393bdc 100644
--- a/rare/components/tray_icon.py
+++ b/rare/components/tray_icon.py
@@ -6,7 +6,7 @@ from qtawesome import icon
 class TrayIcon(QSystemTrayIcon):
     def __init__(self, parent):
         super(TrayIcon, self).__init__(parent)
-        self.setIcon(icon("ei.cogs", color="white"))
+        self.setIcon(icon("ei.cogs", color="white"))  # TODO change icon to logo
         self.setVisible(True)
         self.setToolTip("Rare")
 
diff --git a/start.sh b/start.sh
old mode 100644
new mode 100755