diff --git a/Rare/Components/Launch/LaunchDialog.py b/Rare/Components/Launch/LaunchDialog.py
index fb21e467..8943451c 100644
--- a/Rare/Components/Launch/LaunchDialog.py
+++ b/Rare/Components/Launch/LaunchDialog.py
@@ -6,8 +6,10 @@ from legendary.core import LegendaryCore
from Rare.Components.Dialogs.Login.LoginDialog import LoginDialog
from Rare.utils.utils import download_images
+
logger = getLogger("Login")
+
class LaunchThread(QThread):
download_progess = pyqtSignal(int)
action = pyqtSignal(str)
@@ -22,8 +24,11 @@ class LaunchThread(QThread):
download_images(self.download_progess, self.core)
self.action.emit("finish")
+
class LoginThread(QThread):
login = pyqtSignal()
+ start_app = pyqtSignal(LegendaryCore)
+
def __init__(self, core: LegendaryCore):
super(LoginThread, self).__init__()
self.core = core
@@ -33,6 +38,7 @@ class LoginThread(QThread):
try:
if self.core.login():
logger.info("You are logged in")
+ self.start_app.emit(self.core)
else:
self.run()
except ValueError:
@@ -46,10 +52,10 @@ class LaunchDialog(QDialog):
self.core = core
self.login_thread = LoginThread(core)
self.login_thread.login.connect(self.login)
- self.login_thread.finished.connect(self.launch)
+ self.login_thread.start_app.connect(self.launch)
self.login_thread.start()
- self.title = QLabel("
"+self.tr("Launching Rare")+"
")
+ self.title = QLabel("" + self.tr("Launching Rare") + "
")
self.info_pb = QProgressBar()
self.info_text = QLabel(self.tr("Logging in"))
self.layout = QVBoxLayout()
@@ -64,9 +70,8 @@ class LaunchDialog(QDialog):
if not LoginDialog(core=self.core).login():
exit(0)
-
-
- def launch(self):
+ def launch(self, core: LegendaryCore):
+ self.core = core
self.info_pb.setMaximum(len(self.core.get_game_list()))
self.info_text.setText("Downloading Images")
self.thread = LaunchThread(self.core, self)
diff --git a/Rare/Components/Tabs/Account/AccountWidget.py b/Rare/Components/Tabs/Account/AccountWidget.py
index c2a83727..ccb136dd 100644
--- a/Rare/Components/Tabs/Account/AccountWidget.py
+++ b/Rare/Components/Tabs/Account/AccountWidget.py
@@ -11,7 +11,7 @@ class MiniWidget(QWidget):
self.layout = QVBoxLayout()
self.core = core
self.layout.addWidget(QLabel("Account"))
- self.layout.addWidget(QLabel("Logged in as " + self.core.lgd.userdata.get("display_name")))
+ self.layout.addWidget(QLabel("Logged in as " + str(self.core.lgd.userdata.get("display_name"))))
self.open_browser = QPushButton("Account settings")
self.open_browser.clicked.connect(self.open_account)
diff --git a/Rare/Components/Tabs/Account/__pycache__/AccountWidget.cpython-39.pyc b/Rare/Components/Tabs/Account/__pycache__/AccountWidget.cpython-39.pyc
index 8a1a5003..756e24aa 100644
Binary files a/Rare/Components/Tabs/Account/__pycache__/AccountWidget.cpython-39.pyc and b/Rare/Components/Tabs/Account/__pycache__/AccountWidget.cpython-39.pyc differ
diff --git a/Rare/Components/Tabs/Games/__pycache__/GameList.cpython-39.pyc b/Rare/Components/Tabs/Games/__pycache__/GameList.cpython-39.pyc
index 0a020d58..2c762c19 100644
Binary files a/Rare/Components/Tabs/Games/__pycache__/GameList.cpython-39.pyc and b/Rare/Components/Tabs/Games/__pycache__/GameList.cpython-39.pyc differ
diff --git a/Rare/Components/Tabs/Games/__pycache__/GameWidgetInstalled.cpython-39.pyc b/Rare/Components/Tabs/Games/__pycache__/GameWidgetInstalled.cpython-39.pyc
index a306ff1c..12665593 100644
Binary files a/Rare/Components/Tabs/Games/__pycache__/GameWidgetInstalled.cpython-39.pyc and b/Rare/Components/Tabs/Games/__pycache__/GameWidgetInstalled.cpython-39.pyc differ
diff --git a/Rare/Components/Tabs/Games/__pycache__/GameWidgetUninstalled.cpython-39.pyc b/Rare/Components/Tabs/Games/__pycache__/GameWidgetUninstalled.cpython-39.pyc
index 723e5f14..47884c73 100644
Binary files a/Rare/Components/Tabs/Games/__pycache__/GameWidgetUninstalled.cpython-39.pyc and b/Rare/Components/Tabs/Games/__pycache__/GameWidgetUninstalled.cpython-39.pyc differ
diff --git a/Rare/Components/Tabs/Games/__pycache__/Games.cpython-38.pyc b/Rare/Components/Tabs/Games/__pycache__/Games.cpython-38.pyc
deleted file mode 100644
index ae80f252..00000000
Binary files a/Rare/Components/Tabs/Games/__pycache__/Games.cpython-38.pyc and /dev/null differ
diff --git a/Rare/Components/Tabs/Games/__pycache__/Games.cpython-39.pyc b/Rare/Components/Tabs/Games/__pycache__/Games.cpython-39.pyc
deleted file mode 100644
index 2062f1a7..00000000
Binary files a/Rare/Components/Tabs/Games/__pycache__/Games.cpython-39.pyc and /dev/null differ
diff --git a/Rare/Components/__pycache__/TabWidget.cpython-39.pyc b/Rare/Components/__pycache__/TabWidget.cpython-39.pyc
index fa3244eb..c2ba93ed 100644
Binary files a/Rare/Components/__pycache__/TabWidget.cpython-39.pyc and b/Rare/Components/__pycache__/TabWidget.cpython-39.pyc differ
diff --git a/Rare/Main.py b/Rare/Main.py
index 905e5553..fe7c2252 100644
--- a/Rare/Main.py
+++ b/Rare/Main.py
@@ -2,7 +2,7 @@ import logging
import os
import sys
-from PyQt5.QtCore import QTranslator, QSettings
+from PyQt5.QtCore import QTranslator, QSettings, QCoreApplication
from PyQt5.QtWidgets import QApplication
from legendary.core import LegendaryCore
@@ -21,6 +21,9 @@ core = LegendaryCore()
def main():
app = QApplication(sys.argv)
+ #app2 = QCoreApplication()
+ app.setApplicationName("Rare")
+ app.setOrganizationName("Rare")
settings = QSettings()
# Translator
translator = QTranslator()
diff --git a/Rare/__pycache__/__init__.cpython-39.pyc b/Rare/__pycache__/__init__.cpython-39.pyc
index 4f5677f1..048e31aa 100644
Binary files a/Rare/__pycache__/__init__.cpython-39.pyc and b/Rare/__pycache__/__init__.cpython-39.pyc differ
diff --git a/Rare/utils/Dialogs/__pycache__/InstallDialog.cpython-39.pyc b/Rare/utils/Dialogs/__pycache__/InstallDialog.cpython-39.pyc
deleted file mode 100644
index 572f985e..00000000
Binary files a/Rare/utils/Dialogs/__pycache__/InstallDialog.cpython-39.pyc and /dev/null differ
diff --git a/Rare/utils/__pycache__/RareConfig.cpython-38.pyc b/Rare/utils/__pycache__/RareConfig.cpython-38.pyc
deleted file mode 100644
index 1ac5af23..00000000
Binary files a/Rare/utils/__pycache__/RareConfig.cpython-38.pyc and /dev/null differ
diff --git a/Rare/utils/__pycache__/RareConfig.cpython-39.pyc b/Rare/utils/__pycache__/RareConfig.cpython-39.pyc
deleted file mode 100644
index 651a84d1..00000000
Binary files a/Rare/utils/__pycache__/RareConfig.cpython-39.pyc and /dev/null differ