Hide launch_dialog.py on login; Better compare version numbers
This commit is contained in:
parent
9111b2eecb
commit
56550ba5a4
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in a new issue