diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 9cab75f..f4b205e 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2e5b9b7d-86cb-4086-85fb-32be36077845} + {4a5c8cc9-7483-402d-a0a2-3701e5257fd0} ProjectExplorer.Project.ActiveTarget @@ -41,7 +41,7 @@ false true false - 0 + 2 true true 0 @@ -74,17 +74,12 @@ 0 true - - -fno-delayed-template-parsing - - true - Builtin.BuildSystem true true Builtin.DefaultTidyAndClazy - 2 - false + 4 + true @@ -96,16 +91,16 @@ ProjectExplorer.Project.Target.0 WebAssemblyDeviceType - QwbAssembly Qt 5.15.2 - QwbAssembly Qt 5.15.2 - {7751e2ea-88c1-4df7-b6c4-78f8275796e2} + Qt 5.15.2 WebAssembly + Qt 5.15.2 WebAssembly + qt.qt5.5152.wasm_32_kit 0 -1 0 0 - C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Debug - C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Debug + D:\_develop\_project\NameCreater\NameCreater\build\Qt_5_15_2_WebAssembly-Debug + D:/_develop/_project/NameCreater/NameCreater/build/Qt_5_15_2_WebAssembly-Debug true @@ -143,8 +138,8 @@ 2 - C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Release - C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Release + D:\_develop\_project\NameCreater\NameCreater\build\Qt_5_15_2_WebAssembly-Release + D:/_develop/_project/NameCreater/NameCreater/build/Qt_5_15_2_WebAssembly-Release true @@ -184,8 +179,8 @@ 0 - C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Profile - C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Profile + D:\_develop\_project\NameCreater\NameCreater\build\Qt_5_15_2_WebAssembly-Profile + D:/_develop/_project/NameCreater/NameCreater/build/Qt_5_15_2_WebAssembly-Profile true @@ -235,8 +230,8 @@ -e cpu-cycles --call-graph "dwarf,4096" -F 250 NameCreater - WebAssembly.RunConfiguration.EmrunC:/dev/namecreater/NameCreater/NameCreater.pro - C:/dev/namecreater/NameCreater/NameCreater.pro + WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro false true true @@ -251,14 +246,14 @@ Desktop Desktop Qt 5.15.2 MSVC2019 64bit Desktop Qt 5.15.2 MSVC2019 64bit - {c81acbfe-eec2-40c2-b148-0e5ee627adfb} + qt.qt5.5152.win64_msvc2019_64_kit 0 0 0 0 - C:\dev\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Debug - C:/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + D:\_develop\_project\NameCreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + D:/_develop/_project/NameCreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug true @@ -296,8 +291,8 @@ 2 - C:\dev\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Release - C:/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Release + D:\_develop\_project\NameCreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Release + D:/_develop/_project/NameCreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Release true @@ -337,8 +332,8 @@ 0 - C:\dev\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Profile - C:/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + D:\_develop\_project\NameCreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + D:/_develop/_project/NameCreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Profile true @@ -403,349 +398,18 @@ false -e cpu-cycles --call-graph "dwarf,4096" -F 250 - Qt4ProjectManager.Qt4RunConfiguration:C:/dev/namecreater/NameCreater/NameCreater.pro - C:/dev/namecreater/NameCreater/NameCreater.pro + ProjectExplorer.CustomExecutableRunConfiguration + false true - true true 1 - - ProjectExplorer.Project.Target.2 - - Desktop - Desktop Qt 6.7.2 MSVC2019 64bit - Desktop Qt 6.7.2 MSVC2019 64bit - qt.qt6.672.win64_msvc2019_64_kit - 0 - 0 - 0 - - 0 - C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Debug - C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MSVC2019_64bit-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 - - - C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Release - C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MSVC2019_64bit-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 - C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Profile - C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MSVC2019_64bit-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:C:/dev/namecreater/NameCreater/NameCreater.pro - C:/dev/namecreater/NameCreater/NameCreater.pro - false - true - true - true - - 1 - - - - ProjectExplorer.Project.Target.3 - - Desktop - Desktop Qt 5.12.12 MinGW 64-bit - Desktop Qt 5.12.12 MinGW 64-bit - qt.qt5.51212.win64_mingw73_kit - 0 - 0 - 0 - - 0 - C:\dev\namecreater\build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-Debug - C:/dev/namecreater/build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-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 - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - C:\dev\namecreater\build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-Release - C:/dev/namecreater/build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-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 - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - C:\dev\namecreater\build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-Profile - C:/dev/namecreater/build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-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 - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - true - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:C:/dev/namecreater/NameCreater/NameCreater.pro - C:/dev/namecreater/NameCreater/NameCreater.pro - false - true - true - false - true - C:/dev/namecreater/build-NameCreater-Desktop_Qt_5_12_12_MinGW_64_bit-Debug - - 1 - - ProjectExplorer.Project.TargetCount - 4 + 2 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/customlogo.cpp b/NameCreater/customlogo.cpp index d51e3cd..bc45de9 100644 --- a/NameCreater/customlogo.cpp +++ b/NameCreater/customlogo.cpp @@ -329,7 +329,7 @@ QList CustomLogo::getNameByFileContent(Name_Type_e type, const QByte { QList nameList; - QTextCodec* tc = QTextCodec::codecForName("Big5"); + QTextCodec* tc = QTextCodec::codecForName("Utf8"); // can also using "Utf8" or "Big5" codec QString codec = tc->toUnicode(conetent.data()); QTextStream stream(&codec); diff --git a/NameCreater/customlogo.ui b/NameCreater/customlogo.ui index 5cc6a16..bfc0614 100644 --- a/NameCreater/customlogo.ui +++ b/NameCreater/customlogo.ui @@ -145,10 +145,10 @@ - -100 + -120 - 100 + 120 Qt::Horizontal