From fc685d47ce7b800610449e71c6564314285285bc Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Sun, 1 Jun 2025 19:49:51 +0800 Subject: [PATCH] update to 2.10.2 detail for update: change domain name to "bazaar1688.duckdns.org" --- .gitignore | 1 + NameCreater/NameCreater.cpp | 2 +- NameCreater/NameCreater.pro.user | 1145 +++++++++++++++++++++++++----- NameCreater/NameCreater.vcxproj | 2 +- NameCreater/NewFiveCreater.h | 3 - NameCreater/def.h | 2 +- 6 files changed, 970 insertions(+), 185 deletions(-) diff --git a/.gitignore b/.gitignore index d36d765..3b4d4b8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /buildwed /NameCreater/*.aps /buildweb/ +/NameCreater/build/* diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 469f75b..8fbdbcf 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -33,7 +33,7 @@ //#define FONT_CHT_URL "https://bazaar1688.ddns.net/font/TaiwanPearl-SemiBold.ttf" -#define FONT_JSON_URL "https://bazaar1688.ddns.net/font/fonts.json" +#define FONT_JSON_URL "https://namecreater.bazaar1688.duckdns.org/font/fonts.json" //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf" diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index a10f821..2730aac 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 2 + 0 ProjectExplorer.Project.EditorSettings @@ -91,8 +91,963 @@ ProjectExplorer.Project.Target.0 WebAssemblyDeviceType - WebAssembly Qt 6.8.0 (single-threaded) - WebAssembly Qt 6.8.0 (single-threaded) + WebAssembly Qt 5.15.2 + WebAssembly Qt 5.15.2 + {7cd6acfa-0c6b-40fc-8671-e3da0d9bd2f8} + 0 + -1 + 0 + + 0 + C:\dev\qt\namecreater\NameCreater\build\WebAssembly + C:/dev/qt/namecreater/NameCreater/build/WebAssembly + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_5_15_2-Release + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_5_15_2-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_5_15_2-Profile + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_5_15_2-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + 0 + + true + true + 0 + true + + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + NameCreater2 + WebAssembly.RunConfiguration.EmrunC:/dev/qt/namecreater/NameCreater/NameCreater.pro + C:/dev/qt/namecreater/NameCreater/NameCreater.pro + true + true + true + chrome + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop + Desktop Qt 5.15.2 MSVC + Desktop Qt 5.15.2 MSVC + {87810562-0438-4dfa-a57e-8c46992895e0} + 0 + 0 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + 0 + true + + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/qt/namecreater/NameCreater/NameCreater.pro + D:/dev/qt/namecreater/NameCreater/NameCreater.pro + false + true + true + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop + Desktop Qt 6.7.3 MinGW 64-bit + Desktop Qt 6.7.3 MinGW 64-bit + qt.qt6.673.win64_mingw_kit + 0 + 0 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MinGW_64_bit-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MinGW_64_bit-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MinGW_64_bit-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + 0 + true + + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + true + + 1 + + + + ProjectExplorer.Project.Target.3 + + Desktop + Desktop Qt 6.7.3 MSVC2022 64bit + Desktop Qt 6.7.3 MSVC2022 64bit + qt.qt6.673.win64_msvc2022_64_kit + 0 + 0 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MSVC2022_64bit-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MSVC2022_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MSVC2022_64bit-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MSVC2022_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_7_3_MSVC2022_64bit-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_7_3_MSVC2022_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + 0 + true + + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + true + + 1 + + + + ProjectExplorer.Project.Target.4 + + WebAssemblyDeviceType + WebAssembly Qt 5.15.2 + WebAssembly Qt 5.15.2 + {b7b99f46-0db0-465c-bc94-a8117d23b94d} + 0 + -1 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_5_15_2-Debug + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_5_15_2-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_5_15_2-Release + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_5_15_2-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_5_15_2-Profile + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_5_15_2-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + 0 + + true + true + 0 + true + + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + true + + 1 + + + + ProjectExplorer.Project.Target.5 + + WebAssemblyDeviceType + WebAssembly Qt 6.7.3 (single-threaded) + WebAssembly Qt 6.7.3 (single-threaded) + qt.qt6.673.wasm_singlethread_kit + 0 + -1 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_7_3_single_threaded-Debug + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_7_3_single_threaded-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_7_3_single_threaded-Release + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_7_3_single_threaded-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_7_3_single_threaded-Profile + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_7_3_single_threaded-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + 3 + 0 + + true + true + 0 + true + + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + NameCreater + WebAssembly.RunConfiguration.EmrunD:/dev/qt/namecreater/NameCreater/NameCreater.pro + D:/dev/qt/namecreater/NameCreater/NameCreater.pro + false + true + true + chrome + + 1 + + + + ProjectExplorer.Project.Target.6 + + WebAssemblyDeviceType + WebAssembly Qt (single-threaded) + WebAssembly Qt (single-threaded) qt.qt6.680.wasm_singlethread_kit 0 -1 @@ -238,11 +1193,11 @@ - ProjectExplorer.Project.Target.1 + ProjectExplorer.Project.Target.7 Desktop - Desktop Qt 6.8.0 MSVC2022 64bit - Desktop Qt 6.8.0 MSVC2022 64bit + Desktop Qt MSVC2022 64bit + Desktop Qt MSVC2022 64bit qt.qt6.680.win64_msvc2022_64_kit 0 0 @@ -405,179 +1360,11 @@ - ProjectExplorer.Project.Target.2 + ProjectExplorer.Project.Target.8 Desktop - Desktop Qt 5.15.2 MSVC - Desktop Qt 5.15.2 MSVC - {87810562-0438-4dfa-a57e-8c46992895e0} - 0 - 0 - 0 - - 0 - D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Debug - D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Release - D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Profile - D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - 0 - true - - 2 - - false - -e cpu-cycles --call-graph "dwarf,4096" -F 250 - - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/qt/namecreater/NameCreater/NameCreater.pro - D:/dev/qt/namecreater/NameCreater/NameCreater.pro - false - true - true - true - D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Debug - - 1 - - - - ProjectExplorer.Project.Target.3 - - Desktop - Desktop Qt 6.8.0 MinGW 64-bit - Desktop Qt 6.8.0 MinGW 64-bit + Desktop Qt MinGW 64-bit + Desktop Qt MinGW 64-bit qt.qt6.680.win64_mingw_kit 0 0 @@ -740,7 +1527,7 @@ ProjectExplorer.Project.TargetCount - 4 + 9 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/NameCreater.vcxproj b/NameCreater/NameCreater.vcxproj index 24712a3..9911fca 100644 --- a/NameCreater/NameCreater.vcxproj +++ b/NameCreater/NameCreater.vcxproj @@ -57,7 +57,7 @@ $(DefaultQtVersion) - core;gui;widgets;network;core5compat + core;gui;widgets;network debug diff --git a/NameCreater/NewFiveCreater.h b/NameCreater/NewFiveCreater.h index 76d94bf..258594c 100644 --- a/NameCreater/NewFiveCreater.h +++ b/NameCreater/NewFiveCreater.h @@ -12,8 +12,5 @@ protected: public: virtual void generaImageFromCSV(Name_Type_e type, const QString& filename, const QByteArray& filecontent, const QFont& font, const QColor& font_color); - - - }; diff --git a/NameCreater/def.h b/NameCreater/def.h index 228fb83..20d15fe 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,7 +1,7 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.10.1" +#define VERSION "v2.10.2" #endif // DEF_H