0.97

seuyh · Mar 17, 2024 · 3e8b8ef · 3e8b8ef
1 parent a787420
commit 3e8b8ef
Show file tree

Hide file tree

Showing 9 changed files with 608 additions and 402 deletions.
diff --git a/design/languages/en.txt b/design/languages/en.txt
@@ -1,5 +1,6 @@
 update_found_title: New version
-update_found_text: A new version has been detected on the server!\nClick 'OK' to update\nAfter the update, the new version will be automatically opened\n\nYour version: {iversion} Server version: {version}
+update_found_text: A new version has been detected on the server!\nClick 'OK' to update\nAfter the update, the new version will be automatically opened\n\nYour version: {iversion} Server version: {version}\n\nIf auto-update does not work, download the latest version using the link:\n{url}
+open_link: Open link
 update_load: Updating...
 update: Update
 cancel_title: Exit
@@ -12,7 +13,7 @@ dlc_get: Getting DLC info:
 dlc_get_format: connecting to api
 done: Done!
 speed: Speed: {speed} MB/s
-download_error: File download error\nMost likely the server is currently unavailable.\nPlease try again later or report the issue to me.
+download_error: File download error\nMost likely the server is currently unavailable.\nPlease try again later or report the issue to me.\n\nThe download server is not available in Ukraine, please use VPN.
 attention: Attention
 launcher_reinstall_1: The launcher installer will now open, please select 'Remove' if prompted, or simply continue installation.
 launcher_reinstall_2: The launcher installer will now open, please proceed with the installation.

diff --git a/design/languages/installer_en.py b/design/languages/installer_en.py
@@ -383,21 +383,29 @@ def setupUi(self, MainWindow):
         self.label.setGeometry(QtCore.QRect(210, 86, 91, 20))
         self.label.setObjectName("label")
         self.label_2 = QtWidgets.QLabel(self.page_5)
-        self.label_2.setGeometry(QtCore.QRect(210, 180, 251, 20))
+        self.label_2.setGeometry(QtCore.QRect(210, 260, 121, 20))
         self.label_2.setObjectName("label_2")
         self.creamapi_progressBar_2 = QtWidgets.QProgressBar(self.page_5)
-        self.creamapi_progressBar_2.setGeometry(QtCore.QRect(210, 204, 281, 21))
+        self.creamapi_progressBar_2.setGeometry(QtCore.QRect(340, 260, 171, 21))
         self.creamapi_progressBar_2.setProperty("value", 0)
         self.creamapi_progressBar_2.setObjectName("creamapi_progressBar_2")
-        self.creamapi_label = QtWidgets.QLabel(self.page_5)
-        self.creamapi_label.setGeometry(QtCore.QRect(210, 234, 281, 20))
-        self.creamapi_label.setObjectName("creamapi_label")
-        self.label_3 = QtWidgets.QLabel(self.page_5)
-        self.label_3.setGeometry(QtCore.QRect(210, 260, 281, 20))
-        self.label_3.setObjectName("label_3")
         self.speed_label = QtWidgets.QLabel(self.page_5)
         self.speed_label.setGeometry(QtCore.QRect(376, 140, 121, 20))
         self.speed_label.setObjectName("speed_label")
+        self.label_3 = QtWidgets.QLabel(self.page_5)
+        self.label_3.setGeometry(QtCore.QRect(210, 170, 241, 20))
+        self.label_3.setObjectName("label_3")
+        self.download_progressBar_2 = QtWidgets.QProgressBar(self.page_5)
+        self.download_progressBar_2.setGeometry(QtCore.QRect(210, 200, 281, 21))
+        self.download_progressBar_2.setProperty("value", 0)
+        self.download_progressBar_2.setObjectName("download_progressBar_2")
+        self.download_text_2 = QtWidgets.QLineEdit(self.page_5)
+        self.download_text_2.setGeometry(QtCore.QRect(210, 230, 291, 20))
+        self.download_text_2.setStyleSheet("background-color: rgb(240, 240, 240);")
+        self.download_text_2.setText("")
+        self.download_text_2.setFrame(False)
+        self.download_text_2.setReadOnly(True)
+        self.download_text_2.setObjectName("download_text_2")
         self.stackedWidget.addWidget(self.page_5)
         self.page_6 = QtWidgets.QWidget()
         self.page_6.setObjectName("page_6")
@@ -505,12 +513,12 @@ def setupUi(self, MainWindow):
 "}")
         self.finish_button.setObjectName("finish_button")
         self.launch_game = QtWidgets.QCheckBox(self.page_7)
-        self.launch_game.setGeometry(QtCore.QRect(210, 200, 121, 21))
+        self.launch_game.setGeometry(QtCore.QRect(210, 200, 231, 21))
         self.launch_game.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
         self.launch_game.setObjectName("launch_game")
         self.checkBox = QtWidgets.QCheckBox(self.page_7)
         self.checkBox.setEnabled(False)
-        self.checkBox.setGeometry(QtCore.QRect(210, 250, 141, 21))
+        self.checkBox.setGeometry(QtCore.QRect(210, 250, 251, 21))
         self.checkBox.setCheckable(True)
         self.checkBox.setChecked(True)
         self.checkBox.setObjectName("checkBox")
@@ -539,6 +547,12 @@ def setupUi(self, MainWindow):
         self.textBrowser_15.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.textBrowser_15.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.textBrowser_15.setObjectName("textBrowser_15")
+        self.dlc_list = QtWidgets.QListWidget(self.centralwidget)
+        self.dlc_list.setGeometry(QtCore.QRect(510, 11, 201, 311))
+        self.dlc_list.setStyleSheet("background-color: rgb(240, 240, 240);\n"
+"border: 1px solid #B22222;")
+        self.dlc_list.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.dlc_list.setObjectName("dlc_list")
         MainWindow.setCentralWidget(self.centralwidget)
 
         self.retranslateUi(MainWindow)
@@ -655,9 +669,8 @@ def retranslateUi(self, MainWindow):
         self.cancel_button_5.setText(_translate("MainWindow", "Cancel"))
         self.label.setText(_translate("MainWindow", "DLC downloading:"))
         self.label_2.setText(_translate("MainWindow", "Generating creamapi:"))
-        self.creamapi_label.setText(_translate("MainWindow", "Getting DLC info: connecting to the API"))
-        self.label_3.setText(_translate("MainWindow", "The generation speed depends on the server."))
         self.speed_label.setText(_translate("MainWindow", "Speed: %nan%"))
+        self.label_3.setText(_translate("MainWindow", "DLC download progress:"))
         self.textBrowser_12.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
@@ -702,3 +715,4 @@ def retranslateUi(self, MainWindow):
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8.25pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><img src=\":/images/GitHub-Logo.wine (1).png\" /><span style=\" font-size:10pt; color:#000000;\"> </span><a href=\"https://github.com/seuyh/stellaris-dlc-unlocker\"><span style=\" font-size:10pt; text-decoration: underline; color:#000000;\">GitHub</span></a></p></body></html>"))
+