diff --git a/LunaTranslator/LunaTranslator/gui/setting.py b/LunaTranslator/LunaTranslator/gui/setting.py index 2175d5a6..8ac5befd 100644 --- a/LunaTranslator/LunaTranslator/gui/setting.py +++ b/LunaTranslator/LunaTranslator/gui/setting.py @@ -13,8 +13,7 @@ from gui.setting_lang import setTablang from gui.setting_proxy import setTab_proxy from gui.setting_transopti import setTab7_lazy, delaysetcomparetext from gui.setting_about import ( - setTab_aboutlazy, - setTab_update, + setTab_about, versionlabelmaybesettext, versioncheckthread, ) @@ -105,8 +104,7 @@ class Setting(closeashidewindow): "快捷按键", "语言设置", "网络设置", - "版本更新", - "资源下载", + "关于软件", ], [ functools.partial(setTabOne_lazy, self), @@ -118,8 +116,7 @@ class Setting(closeashidewindow): functools.partial(setTab_quick, self), functools.partial(setTablang, self), functools.partial(setTab_proxy, self), - functools.partial(setTab_update, self), - functools.partial(setTab_aboutlazy, self), + functools.partial(setTab_about, self), ], klass=TabWidget, delay=True, diff --git a/LunaTranslator/LunaTranslator/gui/setting_about.py b/LunaTranslator/LunaTranslator/gui/setting_about.py index 5001d58b..6cb7f65b 100644 --- a/LunaTranslator/LunaTranslator/gui/setting_about.py +++ b/LunaTranslator/LunaTranslator/gui/setting_about.py @@ -288,34 +288,7 @@ def setTab_aboutlazy(self, basel): resourcegrid(self, basel) -def setTab_update(self, basel): - version = winsharedutils.queryversion(getcurrexe()) - if version is None: - versionstring = "unknown" - else: - versionstring = ( - f"v{version[0]}.{version[1]}.{version[2]} {platform.architecture()[0]}" - ) - grid2 = [ - [ - "自动更新", - ( - D_getsimpleswitch( - globalconfig, "autoupdate", callback=versionchecktask.put - ), - 0, - ), - ], - [ - "当前版本", - versionstring, - "", - "最新版本", - functools.partial(createversionlabel, self), - "", - ], - [(functools.partial(createdownloadprogress, self), 0)], - ] +def setTab_about1(self, basel): shuominggrid = [ ["Github", makehtml("https://github.com/HIllya51/LunaTranslator")], @@ -329,7 +302,7 @@ def setTab_update(self, basel): shuominggrid += [ [ "交流群", - makehtml("{main_server}/Resource/QQGroup", show="QQ群"), + makehtml("{main_server}/Resource/QQGroup", show="QQ群963119821"), ], [ " ", @@ -356,16 +329,6 @@ def setTab_update(self, basel): ] makescrollgrid( [ - [ - ( - dict( - grid=grid2, - type="grid", - ), - 0, - "group", - ) - ], [ ( dict( @@ -378,3 +341,53 @@ def setTab_update(self, basel): ], basel, ) + + +def setTab_about(self, basel): + tab_widget, do = makesubtab_lazy( + [ + "关于软件", + "版本更新", + "资源下载", + ], + [ + functools.partial(setTab_about1, self), + functools.partial(setTab_update, self), + functools.partial(setTab_aboutlazy, self), + ], + delay=True, + ) + basel.addWidget(tab_widget) + do() + + +def setTab_update(self, basel): + version = winsharedutils.queryversion(getcurrexe()) + if version is None: + versionstring = "unknown" + else: + versionstring = ( + f"v{version[0]}.{version[1]}.{version[2]} {platform.architecture()[0]}" + ) + grid2 = [ + [ + "自动更新", + ( + D_getsimpleswitch( + globalconfig, "autoupdate", callback=versionchecktask.put + ), + 0, + ), + ], + [ + "当前版本", + versionstring, + "", + "最新版本", + functools.partial(createversionlabel, self), + "", + ], + [(functools.partial(createdownloadprogress, self), 0)], + ] + + makescrollgrid(grid2, basel) diff --git a/LunaTranslator/LunaTranslator/myutils/utils.py b/LunaTranslator/LunaTranslator/myutils/utils.py index a5bd7827..6c6b075e 100644 --- a/LunaTranslator/LunaTranslator/myutils/utils.py +++ b/LunaTranslator/LunaTranslator/myutils/utils.py @@ -517,10 +517,10 @@ def makehtml(text, show=None): else: __ = True text = dynamiclink(text) - if __: - show = text.split("/")[-1] - elif show: + if show: pass + elif __: + show = text.split("/")[-1] else: show = text return '{}'.format(text, show) diff --git a/LunaTranslator/files/lang/ar.json b/LunaTranslator/files/lang/ar.json index 451b8245..85ab3fa3 100644 --- a/LunaTranslator/files/lang/ar.json +++ b/LunaTranslator/files/lang/ar.json @@ -823,5 +823,6 @@ "华为云": "هوا وي يون", "逐行匹配": "خط مطابقة", "游戏适配": "لعبة مباراة", - "指定翻译器": "تعيين مترجم" + "指定翻译器": "تعيين مترجم", + "关于软件": "عن البرمجيات" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/cht.json b/LunaTranslator/files/lang/cht.json index 2780ff6b..9e814c75 100644 --- a/LunaTranslator/files/lang/cht.json +++ b/LunaTranslator/files/lang/cht.json @@ -823,5 +823,6 @@ "华为云": "華為雲", "逐行匹配": "逐行匹配", "游戏适配": "遊戲適配", - "指定翻译器": "指定翻譯器" + "指定翻译器": "指定翻譯器", + "关于软件": "關於軟件" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/cs.json b/LunaTranslator/files/lang/cs.json index 1d607de5..9413ff4e 100644 --- a/LunaTranslator/files/lang/cs.json +++ b/LunaTranslator/files/lang/cs.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun.", "逐行匹配": "Shoda řádku po řádku", "游戏适配": "Úprava hry", - "指定翻译器": "Upřesnit překladatele" + "指定翻译器": "Upřesnit překladatele", + "关于软件": "O softwaru" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/de.json b/LunaTranslator/files/lang/de.json index db07cb3a..661cc25d 100644 --- a/LunaTranslator/files/lang/de.json +++ b/LunaTranslator/files/lang/de.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Zeile für Zeile übereinstimmen", "游戏适配": "Anpassung des Spiels", - "指定翻译器": "Übersetzer angeben" + "指定翻译器": "Übersetzer angeben", + "关于软件": "Über Software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/en.json b/LunaTranslator/files/lang/en.json index a10e4389..53269df6 100644 --- a/LunaTranslator/files/lang/en.json +++ b/LunaTranslator/files/lang/en.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Match line by line", "游戏适配": "Game adaptation", - "指定翻译器": "Specify translator" + "指定翻译器": "Specify translator", + "关于软件": "About software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/es.json b/LunaTranslator/files/lang/es.json index 3b79cb9f..623479a7 100644 --- a/LunaTranslator/files/lang/es.json +++ b/LunaTranslator/files/lang/es.json @@ -823,5 +823,6 @@ "华为云": "Hua weiyun", "逐行匹配": "Coincidencia línea a línea", "游戏适配": "Adaptación del juego", - "指定翻译器": "Especificar traductor" + "指定翻译器": "Especificar traductor", + "关于软件": "Sobre el software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/fr.json b/LunaTranslator/files/lang/fr.json index 1474ccca..ea6d8d8b 100644 --- a/LunaTranslator/files/lang/fr.json +++ b/LunaTranslator/files/lang/fr.json @@ -823,5 +823,6 @@ "华为云": "Huawei Cloud", "逐行匹配": "Correspondance ligne par ligne", "游戏适配": "Adaptation du jeu", - "指定翻译器": "Spécifier le traducteur" + "指定翻译器": "Spécifier le traducteur", + "关于软件": "À propos du logiciel" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/it.json b/LunaTranslator/files/lang/it.json index 3ed70b66..6be0821b 100644 --- a/LunaTranslator/files/lang/it.json +++ b/LunaTranslator/files/lang/it.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Corrisponda linea per linea", "游戏适配": "Adattamento del gioco", - "指定翻译器": "Specifica traduttore" + "指定翻译器": "Specifica traduttore", + "关于软件": "Informazioni sul software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ja.json b/LunaTranslator/files/lang/ja.json index d8b115f0..90508377 100644 --- a/LunaTranslator/files/lang/ja.json +++ b/LunaTranslator/files/lang/ja.json @@ -823,5 +823,6 @@ "华为云": "華を雲と為す", "逐行匹配": "プログレッシブマッチング", "游戏适配": "ゲームアダプタ", - "指定翻译器": "翻訳機の指定" + "指定翻译器": "翻訳機の指定", + "关于软件": "ソフトウェアについて" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ko.json b/LunaTranslator/files/lang/ko.json index 45b596a0..e1a10da6 100644 --- a/LunaTranslator/files/lang/ko.json +++ b/LunaTranslator/files/lang/ko.json @@ -823,5 +823,6 @@ "华为云": "화위운", "逐行匹配": "행별 일치", "游戏适配": "게임 적합성", - "指定翻译器": "번역기 지정" + "指定翻译器": "번역기 지정", + "关于软件": "소프트웨어 정보" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/nl.json b/LunaTranslator/files/lang/nl.json index e3be0ed5..67702968 100644 --- a/LunaTranslator/files/lang/nl.json +++ b/LunaTranslator/files/lang/nl.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun.", "逐行匹配": "Lijn voor regel overeenkomen", "游戏适配": "Game aanpassing", - "指定翻译器": "Vertaler opgeven" + "指定翻译器": "Vertaler opgeven", + "关于软件": "Over software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/pl.json b/LunaTranslator/files/lang/pl.json index 21e14540..4c3e8448 100644 --- a/LunaTranslator/files/lang/pl.json +++ b/LunaTranslator/files/lang/pl.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun.", "逐行匹配": "Dopasuj linię po linii", "游戏适配": "Adaptacja gry", - "指定翻译器": "Określ tłumacza" + "指定翻译器": "Określ tłumacza", + "关于软件": "O oprogramowaniu" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/pt.json b/LunaTranslator/files/lang/pt.json index fb818438..e1e7909a 100644 --- a/LunaTranslator/files/lang/pt.json +++ b/LunaTranslator/files/lang/pt.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Corresponder linha por linha", "游戏适配": "Adaptação do jogo", - "指定翻译器": "Especificar o tradutor" + "指定翻译器": "Especificar o tradutor", + "关于软件": "Sobre o software" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/ru.json b/LunaTranslator/files/lang/ru.json index 3e6da24b..9d5e0e7b 100644 --- a/LunaTranslator/files/lang/ru.json +++ b/LunaTranslator/files/lang/ru.json @@ -823,5 +823,6 @@ "华为云": "Хуа как облако", "逐行匹配": "Постепенное согласование", "游戏适配": "Игра подходит", - "指定翻译器": "Назначить переводчика" + "指定翻译器": "Назначить переводчика", + "关于软件": "О программном обеспечении" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/sv.json b/LunaTranslator/files/lang/sv.json index 5779edb6..daf54b37 100644 --- a/LunaTranslator/files/lang/sv.json +++ b/LunaTranslator/files/lang/sv.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Matcha rad för rad", "游戏适配": "Spelanpassning", - "指定翻译器": "Ange översättare" + "指定翻译器": "Ange översättare", + "关于软件": "Om programvara" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/th.json b/LunaTranslator/files/lang/th.json index 7a5c606b..3a5850c2 100644 --- a/LunaTranslator/files/lang/th.json +++ b/LunaTranslator/files/lang/th.json @@ -823,5 +823,6 @@ "华为云": "Huawei เมฆ", "逐行匹配": "จับคู่ตามบรรทัด", "游戏适配": "การปรับเกม", - "指定翻译器": "ระบุนักแปล" + "指定翻译器": "ระบุนักแปล", + "关于软件": "เกี่ยวกับซอฟต์แวร์" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/tr.json b/LunaTranslator/files/lang/tr.json index ea5cadf4..373d87df 100644 --- a/LunaTranslator/files/lang/tr.json +++ b/LunaTranslator/files/lang/tr.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Satırla eşleştir", "游戏适配": "Oyun uygulaması", - "指定翻译器": "Çevirmeyi belirtin" + "指定翻译器": "Çevirmeyi belirtin", + "关于软件": "Yazılım hakkında" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/uk.json b/LunaTranslator/files/lang/uk.json index bdab0d71..d9fa012d 100644 --- a/LunaTranslator/files/lang/uk.json +++ b/LunaTranslator/files/lang/uk.json @@ -823,5 +823,6 @@ "华为云": "Hua Weiyun", "逐行匹配": "Порівнювати рядок за рядком", "游戏适配": "Адаптація гри", - "指定翻译器": "Вкажіть перекладач" + "指定翻译器": "Вкажіть перекладач", + "关于软件": "Про програмне забезпечення" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/vi.json b/LunaTranslator/files/lang/vi.json index 24f2bb1b..3c1f4fd6 100644 --- a/LunaTranslator/files/lang/vi.json +++ b/LunaTranslator/files/lang/vi.json @@ -823,5 +823,6 @@ "华为云": "Hoa Vi Vân", "逐行匹配": "Khớp từng dòng", "游戏适配": "Trò chơi phù hợp", - "指定翻译器": "Chỉ định trình dịch" + "指定翻译器": "Chỉ định trình dịch", + "关于软件": "Về phần mềm" } \ No newline at end of file diff --git a/LunaTranslator/files/lang/zh.json b/LunaTranslator/files/lang/zh.json index 2250df47..e3aa458f 100644 --- a/LunaTranslator/files/lang/zh.json +++ b/LunaTranslator/files/lang/zh.json @@ -823,5 +823,6 @@ "拉丁语": "", "华为云": "", "逐行匹配": "", - "指定翻译器": "" + "指定翻译器": "", + "关于软件": "" } \ No newline at end of file diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index dcc7c531..3382736a 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -29,7 +29,7 @@ include(generate_product_version) set(VERSION_MAJOR 5) set(VERSION_MINOR 38) -set(VERSION_PATCH 4) +set(VERSION_PATCH 5) add_library(pch pch.cpp) target_precompile_headers(pch PUBLIC pch.h)