diff --git a/cpp/version.cmake b/cpp/version.cmake index 4282817b..f490be5d 100644 --- a/cpp/version.cmake +++ b/cpp/version.cmake @@ -1,7 +1,7 @@ set(VERSION_MAJOR 6) set(VERSION_MINOR 9) -set(VERSION_PATCH 0) +set(VERSION_PATCH 1) set(VERSION_REVISION 0) set(LUNA_VERSION "{${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_REVISION}}") add_library(VERSION_DEF ${CMAKE_CURRENT_LIST_DIR}/version_def.cpp) diff --git a/py/LunaTranslator/gui/setting_cishu.py b/py/LunaTranslator/gui/setting_cishu.py index 1820398c..cd8e3beb 100644 --- a/py/LunaTranslator/gui/setting_cishu.py +++ b/py/LunaTranslator/gui/setting_cishu.py @@ -44,7 +44,7 @@ def gethiragrid(self): items[-1]["callback"] = gobject.baseobject.starthira _3 = D_getIconButton( callback=functools.partial( - autoinitdialogx, + autoinitdialog, self, globalconfig["hirasetting"][name]["args"], globalconfig["hirasetting"][name]["name"], diff --git a/py/LunaTranslator/myutils/localetools.py b/py/LunaTranslator/myutils/localetools.py index 8f227cee..ae76663e 100644 --- a/py/LunaTranslator/myutils/localetools.py +++ b/py/LunaTranslator/myutils/localetools.py @@ -53,9 +53,7 @@ class le_internal(LEbase): def getlrpath(self): LEProc = globalconfig.get("le_extra_path", "") if not (LEProc and os.path.exists(LEProc)): - LEProc = os.path.abspath( - "files/plugins/Locale/Locale.Emulator/LEProc.exe" - ) + LEProc = os.path.abspath("files/plugins/Locale/Locale.Emulator/LEProc.exe") return LEProc def profiles(self, config): @@ -131,11 +129,15 @@ class le_internal(LEbase): layout.addRow( "路径", getsimplepatheditor( - globalconfig.get("le_extra_path", ""), + self.getlrpath(), False, False, filter1="LEProc.exe", callback=functools.partial(self.reselect, config, Guids), + clearset=lambda: os.path.abspath( + "files/plugins/Locale/Locale.Emulator/LEProc.exe" + ), + icons=("fa.gear", "fa.refresh"), ), ) layout.addRow( @@ -168,9 +170,7 @@ class NTLEAS64(LEbase): def getlrpath(self): LEProc = globalconfig.get("ntleas_extra_path", "") if not (LEProc and os.path.exists(LEProc)): - LEProc = os.path.abspath( - "files/plugins/Locale/ntleas046_x64/_no_use_for_dir" - ) + LEProc = os.path.abspath("files/plugins/Locale/ntleas046_x64/Placeholder") return LEProc def runX(self, exe, usearg, dirpath, config): @@ -204,11 +204,15 @@ class NTLEAS64(LEbase): layout.addRow( "路径", getsimplepatheditor( - globalconfig.get("ntleas_extra_path", ""), + self.getlrpath(), False, False, filter1="ntleasWin.exe", callback=self.reselect, + clearset=lambda: os.path.abspath( + "files/plugins/Locale/ntleas046_x64/Placeholder" + ), + icons=("fa.gear", "fa.refresh"), ), ) layout.addRow( @@ -264,9 +268,7 @@ class lr_internal(LEbase): def getlrpath(self): LEProc = globalconfig.get("lr_extra_path", "") if not (LEProc and os.path.exists(LEProc)): - LEProc = os.path.abspath( - "files/plugins/Locale/Locale_Remulator/LRProc.exe" - ) + LEProc = os.path.abspath("files/plugins/Locale/Locale_Remulator/LRProc.exe") return LEProc def runX(self, exe, usearg, dirpath, config): @@ -301,11 +303,15 @@ class lr_internal(LEbase): layout.addRow( "路径", getsimplepatheditor( - globalconfig.get("lr_extra_path", ""), + self.getlrpath(), False, False, filter1="LRProc.exe", callback=functools.partial(self.reselect, config, Guids), + clearset=lambda: os.path.abspath( + "files/plugins/Locale/Locale_Remulator/LRProc.exe" + ), + icons=("fa.gear", "fa.refresh"), ), ) layout.addRow(