Skip to content

Commit 6790e88

Browse files
seuyhseuyh
committed
Try to fix new launcher error
1 parent 2ff8789 commit 6790e88

File tree

8 files changed

+14
-10
lines changed

8 files changed

+14
-10
lines changed

‎design/languages/en.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ after_launcher_download_text: We've downloaded the corrected launcher,\nnow go b
4040
warning_title: Warning!
4141
documents_remove_text: Warning!\nThis action will delete the folder with all game saves and mod presets in the launcher.\nAre you sure you want to continue?
4242
after_documents_remove_text: Done! You can continue with the installation.
43+
new_launcher_error: Reinstallation error!\try pressing "help" on the start screen and select the second option.

‎design/languages/installer_en.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,9 @@ def retranslateUi(self, MainWindow):
668668
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
669669
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">2. THIS UNLOCKER IS PROVIDED &quot;AS IS&quot;. NO WARRANTIES ARE PROVIDED OR IMPLIED. YOU USE THIS MODIFICATION OF THE ORIGINAL GAME AT YOUR OWN RISK. THE AUTHORS OF THE MODIFICATION WILL NOT BE LIABLE FOR ANY LOSSES OR DATA CORRUPTION, ANY LOST PROFITS IN THE PROCESS OF USE OR MISUSE OF THIS MODIFICATION.</p>\n"
670670
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
671-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">4. All rights not expressly granted here are reserved by the copyright holders.</p>\n"
671+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3. All rights not expressly granted here are reserved by the copyright holders.</p>\n"
672672
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
673-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">5. Installation and use of this modification implies that you have read and understand the terms of this license agreement and agree to them.</p>\n"
673+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">4. Installation and use of this modification implies that you have read and understand the terms of this license agreement and agree to them.</p>\n"
674674
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
675675
self.eula_true.setText(_translate("MainWindow", "I accept the terms of the agreement"))
676676
self.eula_false.setText(_translate("MainWindow", "I do not accept the terms of the agreement"))

‎design/languages/installer_ru.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,9 @@ def retranslateUi(self, MainWindow):
668668
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
669669
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> 2. ДАННЫЙ РАЗБЛОКИРОВЩИК ПОСТАВЛЯЕТСЯ ПО ПРИНЦИПУ «AS IS». НИКАКИХ ГАРАНТИЙ НЕ ПРИЛАГАЕТСЯ И НЕ ПРЕДУСМАТРИВАЕТСЯ. ВЫ ИСПОЛЬЗУЕТЕ ЭТУ МОДИФИКАЦИЮ ОРИГИНАЛЬНОЙ ИГРЫ НА СВОЙ СТРАХ И РИСК. АВТОРЫ МОДИФИКАЦИИ НЕ БУДУТ ОТВЕЧАТЬ НИ ЗА КАКИЕ ПОТЕРИ ИЛИ ИСКАЖЕНИЯ ДАННЫХ, ЛЮБУЮ УПУЩЕННУЮ ВЫГОДУ В ПРОЦЕССЕ ИСПОЛЬЗОВАНИЯ ИЛИ НЕПРАВИЛЬНОГО ИСПОЛЬЗОВАНИЯ ДАННОЙ МОДИФИКАЦИИ.</p>\n"
670670
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
671-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> 4. Все права, не предоставленные здесь явно, сохраняются за правообладателями.</p>\n"
671+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> 3. Все права, не предоставленные здесь явно, сохраняются за правообладателями.</p>\n"
672672
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
673-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> 5. Установка и использование данной модификации означает, что вы ознакомились и понимаете положения настоящего лицензионного соглашения и согласны с ними.</p>\n"
673+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"> 4. Установка и использование данной модификации означает, что вы ознакомились и понимаете положения настоящего лицензионного соглашения и согласны с ними.</p>\n"
674674
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
675675
self.eula_true.setText(_translate("MainWindow", "Я принимаю условия соглашения"))
676676
self.eula_false.setText(_translate("MainWindow", "Я не принимаю условия соглашения"))

‎design/languages/installer_zh_cn.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,9 @@ def retranslateUi(self, MainWindow):
670670
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
671671
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">2. 本解锁器“按原样”提供，不提供任何形式的担保。使用此修改版游戏风险自负。修改者不承担因使用或误用此修改版而导致的任何损失或数据损坏，以及在使用过程中可能发生的任何利润损失。</p>\n"
672672
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
673-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">4. 未在此明确授予的所有权利均由版权持有者保留。</p>\n"
673+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3. 未在此明确授予的所有权利均由版权持有者保留。</p>\n"
674674
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
675-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">5. 安装并使用此修改意味着您已阅读并理解了本许可协议的条款，并同意遵守。</p>\n"
675+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">4. 安装并使用此修改意味着您已阅读并理解了本许可协议的条款，并同意遵守。</p>\n"
676676
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>"))
677677
self.eula_true.setText(_translate("MainWindow", "我接受协议条款"))
678678
self.eula_false.setText(_translate("MainWindow", "我不接受协议条款"))

‎design/languages/ru.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ after_launcher_download_text: Мы загрузили исправленный
3838
warning_title: Предупреждение!
3939
documents_remove_text: Внимание!\nЭто действие удалит папку со всеми сохранениями игры и пресетами модов в лаунчере.\nВы уверены, что хотите продолжить?
4040
after_documents_remove_text: Готово! Вы можете продолжить установку.
41+
new_launcher_error: Ошибка переустановки!\nПопробуйте на стартовом экране выжать "помощь" и выбрать вторую опцию

‎design/languages/zh_cn.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ after_launcher_download_text: 我们已经下载了正确的启动器，现在
4040
warning_title: 警告！
4141
documents_remove_text: 警告！\n此操作将删除启动器中包含所有游戏保存和模式预设的文件夹。\n你确定要继续吗？
4242
after_documents_remove_text: 完成！您可以继续安装。
43+
new_launcher_error: 重新安装错误！\尝试在开始屏幕上按"帮助"并选择第二个选项

‎gui/main_window.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import json
21
import os
32
import webbrowser
43
from time import sleep
@@ -68,7 +67,7 @@ def __init__(self, language):
6867
self.now_reinstalling.setVisible(False)
6968
self.next_button_5.setEnabled(False)
7069

71-
self.iversion = '1.13'
70+
self.iversion = '1.14'
7271

7372
# -------------------------------------------- #
7473

@@ -492,7 +491,10 @@ def reinstall_2(self, paradox_folder1):
492491
try:
493492
self.replace_files(os.path.join(os.path.join(paradox_folder1, launcher_folders[0])))
494493
except Exception as e:
495-
raise e
494+
if self.ok_dialog(self.translations.get("error", ""),
495+
self.translations.get("new_launcher_error", ""),
496+
QMessageBox.Critical):
497+
self.close()
496498

497499
def replace_files(self, launcher_folder):
498500
# try:

‎main.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def show_crash_message():
1717

1818
QTimer.singleShot(0, lambda: sys.exit(2))
1919

20-
# test
2120
def excepthookk(exctype, value, tb):
2221
"""Обработчик исключений для перехвата ошибок."""
2322
crashlog_path = "unlocker_crashlog.txt"

0 commit comments

Comments
 (0)