diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a503fc..eb0b0c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ cmake_minimum_required(VERSION 3.0.0) project(TTKOCR) -set(TTK_MAJOR_VERSION 2) -set(TTK_MINOR_VERSION 8) +set(TTK_MAJOR_VERSION 3) +set(TTK_MINOR_VERSION 0) set(TTK_PATCH_VERSION 0) set(TTK_VERSION "${TTK_MAJOR_VERSION}.${TTK_MINOR_VERSION}.${TTK_PATCH_VERSION}.0") diff --git a/ChangeLog b/ChangeLog index 7b11f73..0576485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v2.8.0.0 Final 2024.03.29 +v3.0.0.0 Final 2024.12.05 优化部分交互逻辑 优化其他一些细节 diff --git a/Doxyfile b/Doxyfile index 83ff469..2443bd6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKOCR -PROJECT_NUMBER = 2.8.0.0 +PROJECT_NUMBER = 3.0.0.0 PROJECT_BRIEF = "TTKOCR recognizes text from images, based on Qt for windows and linux" PROJECT_LOGO = TTKUtils/resource/qicon.dll OUTPUT_DIRECTORY = TTKDocs diff --git a/TTKCommon/TTKRun/ttkrunobject.cpp b/TTKCommon/TTKRun/ttkrunobject.cpp index f685ee8..f490119 100644 --- a/TTKCommon/TTKRun/ttkrunobject.cpp +++ b/TTKCommon/TTKRun/ttkrunobject.cpp @@ -37,7 +37,7 @@ void TTKRunObject::run(int argc, char **argv) const } args.append(TTK_STR_QUOTES(arg)); - args.append(" "); + args.append(TTK_SPACE); } } @@ -66,6 +66,6 @@ void TTKRunObject::run(int argc, char **argv) const } } - system((filePath + suffix + " " + args).c_str()); + system((filePath + suffix + TTK_SPACE + args).c_str()); #endif } diff --git a/TTKCommon/TTKRun/ttkrunobject.h b/TTKCommon/TTKRun/ttkrunobject.h index 6daf23d..7400a6d 100644 --- a/TTKCommon/TTKRun/ttkrunobject.h +++ b/TTKCommon/TTKRun/ttkrunobject.h @@ -21,7 +21,7 @@ #include "ttkobject.h" -#ifdef _MSC_VER +#ifdef _MSC_VER // do not show console window # pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"") #endif diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 0b6901e..4c0fb0d 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -19,14 +19,14 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2024.03.28 -#define TTK_MAJOR_VERSION 2 -#define TTK_MINOR_VERSION 8 +//update time 2024.12.05 +#define TTK_MAJOR_VERSION 3 +#define TTK_MINOR_VERSION 0 #define TTK_PATCH_VERSION 0 #define TTK_VERSION TTK_VERSION_CHECK(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) #define TTK_VERSION_STR TTK_VERSION_CHECK_STR(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) -#define TTK_VERSION_TIME_STR "(2024/03/28)" +#define TTK_VERSION_TIME_STR "(2024/12/05)" #define TTK_RC_FILEVERSION TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 871aaca..7a437cc 100644 --- a/TTKResource/_extras/TTKRoutine.sh +++ b/TTKResource/_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.8.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.0.0.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKUtils/auc/make_auc.bat b/TTKUtils/auc/make_auc.bat index af17110..be0fe3b 100644 --- a/TTKUtils/auc/make_auc.bat +++ b/TTKUtils/auc/make_auc.bat @@ -1,3 +1,3 @@ "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKOCR.exe" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"4.1.1.0/TTKService.exe" +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"3.0.0.0/TTKService.exe" diff --git a/TTKUtils/deploy/make_desktop.sh b/TTKUtils/deploy/make_desktop.sh index 347cc5a..90e1e7c 100644 --- a/TTKUtils/deploy/make_desktop.sh +++ b/TTKUtils/deploy/make_desktop.sh @@ -13,7 +13,7 @@ execpath="$PWD/../TTKOCR" echo -n "[Desktop Entry] Type=Application -Version=2.8.0.0 +Version=3.0.0.0 Name=TTKOCR Name[zh_CN]=文字识别 Name[zh_TW]=文字識別 diff --git a/TTKUtils/deploy/share/appdata/ttkocr.appdata.xml b/TTKUtils/deploy/share/appdata/ttkocr.appdata.xml index bca2ca0..c719c83 100644 --- a/TTKUtils/deploy/share/appdata/ttkocr.appdata.xml +++ b/TTKUtils/deploy/share/appdata/ttkocr.appdata.xml @@ -23,6 +23,7 @@ https://github.com/Greedysky/TTKOCR Greedysky Studio + diff --git a/TTKUtils/linux_time.sh b/TTKUtils/linux_time.sh index 73b8473..bf18602 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2024-03-28 12:00" {} \; +find . -exec touch -c -m -d "2024-12-05 12:00" {} \; diff --git a/TTKVersion.pri b/TTKVersion.pri index e6fcd83..bbf8153 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -23,5 +23,5 @@ RCC_DIR = ./.build/rcc greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 QT_DEPRECATED_WARNINGS -# update time 2024.03.28 -TTK_VERSION = 2.8.0.0 +# update time 2024.12.05 +TTK_VERSION = 3.0.0.0