From 6fc1220bff9ecd64e077f77bbb9e7a8ae0ed61df Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Fri, 1 Nov 2024 08:36:13 +0800 Subject: [PATCH] 1. add codec selector. --- NameCreater/INameCreater.cpp | 2 + NameCreater/NameCreater.pro.user | 246 +++++++++++-------------------- NameCreater/customlogo.cpp | 4 +- NameCreater/customlogo.ui | 42 ++++++ NameCreater/def.h | 2 +- 5 files changed, 131 insertions(+), 165 deletions(-) diff --git a/NameCreater/INameCreater.cpp b/NameCreater/INameCreater.cpp index fd35cf1..e6da27a 100644 --- a/NameCreater/INameCreater.cpp +++ b/NameCreater/INameCreater.cpp @@ -177,3 +177,5 @@ int INameCreater::getFontSizebyStr(const QFont& font, int max_font_size,int max_ return font_size; } + + diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index f4b205e..3ee69fb 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {4a5c8cc9-7483-402d-a0a2-3701e5257fd0} + {2e5b9b7d-86cb-4086-85fb-32be36077845} ProjectExplorer.Project.ActiveTarget @@ -78,7 +78,7 @@ true true Builtin.DefaultTidyAndClazy - 4 + 2 true @@ -89,171 +89,18 @@ ProjectExplorer.Project.Target.0 - - WebAssemblyDeviceType - Qt 5.15.2 WebAssembly - Qt 5.15.2 WebAssembly - qt.qt5.5152.wasm_32_kit - 0 - -1 - 0 - - 0 - 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 - 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:\_develop\_project\NameCreater\NameCreater\build\Qt_5_15_2_WebAssembly-Release - D:/_develop/_project/NameCreater/NameCreater/build/Qt_5_15_2_WebAssembly-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:\_develop\_project\NameCreater\NameCreater\build\Qt_5_15_2_WebAssembly-Profile - D:/_develop/_project/NameCreater/NameCreater/build/Qt_5_15_2_WebAssembly-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 - - - -e cpu-cycles --call-graph "dwarf,4096" -F 250 - NameCreater - WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - false - true - true - chrome - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Desktop Qt 5.15.2 MSVC2019 64bit Desktop Qt 5.15.2 MSVC2019 64bit - qt.qt5.5152.win64_msvc2019_64_kit + {c81acbfe-eec2-40c2-b148-0e5ee627adfb} 0 0 0 0 - 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 + 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 true @@ -291,8 +138,8 @@ 2 - 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 + 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 true @@ -332,8 +179,8 @@ 0 - 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 + 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 true @@ -407,6 +254,79 @@ 1 + + ProjectExplorer.Project.Target.1 + + WebAssemblyDeviceType + QwbAssembly Qt 5.15.2 + QwbAssembly Qt 5.15.2 + {7751e2ea-88c1-4df7-b6c4-78f8275796e2} + 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 + + + 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 + + 1 + 0 + + true + true + 0 + true + + + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + true + + 1 + + ProjectExplorer.Project.TargetCount 2 diff --git a/NameCreater/customlogo.cpp b/NameCreater/customlogo.cpp index bc45de9..47c5cec 100644 --- a/NameCreater/customlogo.cpp +++ b/NameCreater/customlogo.cpp @@ -329,7 +329,9 @@ QList CustomLogo::getNameByFileContent(Name_Type_e type, const QByte { QList nameList; - QTextCodec* tc = QTextCodec::codecForName("Utf8"); // can also using "Utf8" or "Big5" codec + QString codec_text = ui->codec_comboBox->currentText(); + + QTextCodec* tc = QTextCodec::codecForName(codec_text.toStdString().c_str()); // 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 bfc0614..32c2666 100644 --- a/NameCreater/customlogo.ui +++ b/NameCreater/customlogo.ui @@ -191,6 +191,48 @@ + + + + 10 + 10 + 311 + 41 + + + + + + + + 80 + 16777215 + + + + Codec: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + Big5 + + + + + Utf8 + + + + + + diff --git a/NameCreater/def.h b/NameCreater/def.h index c15871f..228fb83 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,7 +1,7 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.10.0" +#define VERSION "v2.10.1" #endif // DEF_H