From 5bc600c0ecce6db63cf539659182085fb83567a8 Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Wed, 10 Jul 2024 09:04:14 +0800 Subject: [PATCH] 1. Change chinese font. 2. adjust Five to Single zh_eng english x posistion. --- NameCreater/FiveToSingle.cpp | 7 +- NameCreater/INameCreater.cpp | 2 +- NameCreater/NameCreater.cpp | 15 +- NameCreater/NameCreater.pro | 2 +- NameCreater/NameCreater.pro.user | 343 ++++++++++++++++--------------- NameCreater/NameCreater.ui | 32 ++- NameCreater/def.h | 2 +- 7 files changed, 223 insertions(+), 180 deletions(-) diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index 8eba59a..f7d393e 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -326,12 +326,15 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, _new_font.setPixelSize(_new_size); eng_word_item->setFont(_new_font); - QRectF rect = eng_word_item->boundingRect(); + eng_word_item->adjustSize(); + + QRectF rect = eng_word_item->boundingRect(); eng_word_item->setDefaultTextColor(font_color); eng_word_item->setRotation(-90); - eng_word_item->setPos((name_bgItem->boundingRect().width()/2 - rect.height()/2)+10, 1230 + rect.width() / 2); + // the position export from web is different. + eng_word_item->setPos((name_bgItem->boundingRect().width()/2 - rect.height()/2)+20, 1230 + rect.width() / 2); } diff --git a/NameCreater/INameCreater.cpp b/NameCreater/INameCreater.cpp index 3e3ec79..35dea29 100644 --- a/NameCreater/INameCreater.cpp +++ b/NameCreater/INameCreater.cpp @@ -162,7 +162,7 @@ int INameCreater::getFontSizebyStr(const QFont& font, int max_font_size,int max_ while (font_size > 10) { _font.setPixelSize(font_size); QFontMetrics fm(_font); - if (fm.horizontalAdvance(str) <= max_label_width) break; + if (fm.horizontalAdvance(str) <= max_label_width) return font_size; font_size--; } diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 4b3b299..c2f0017 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -26,6 +26,7 @@ #define FONT_CHT_URL "https://bazaar1688.ddns.net/font/TaiwanPearl-SemiBold.ttf" +//#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf" NameCreater::NameCreater(QWidget *parent) : QMainWindow(parent) @@ -43,6 +44,8 @@ NameCreater::NameCreater(QWidget *parent) connect(ui.customlogo_btn, &QPushButton::released, this , &NameCreater::OnClickedCustomLogoBtn); + //qDebug()<<"QSslSocket="<setFont(tital_font); - QTextCodec *codec = QTextCodec::codecForName("Big5"); - QString fontname = codec->toUnicode(family_list.at(0).toStdString().c_str()); + + char c_font_name[64] = {0}; + sprintf(c_font_name,"%s", cht_fontname.toStdString().c_str()); + ui.font_name_label->setFont(version_font); + ui.font_name_label->setText(QString::fromLocal8Bit(c_font_name)); ui.version_label->setFont(version_font); - ui.version_label->setText(QString(VERSION).append("/cht font:").append(fontname)); + ui.version_label->setText(VERSION); QList titals = findChildren(QRegularExpression("tital_label")); foreach(auto tital, titals) { diff --git a/NameCreater/NameCreater.pro b/NameCreater/NameCreater.pro index abc5199..4ee0e0b 100644 --- a/NameCreater/NameCreater.pro +++ b/NameCreater/NameCreater.pro @@ -19,6 +19,6 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864 +QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864 diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 34f271e..2762d33 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {fcddcb90-0e4f-4f41-99d2-8ce9f168d92c} + {4a5c8cc9-7483-402d-a0a2-3701e5257fd0} ProjectExplorer.Project.ActiveTarget @@ -54,7 +54,6 @@ *.md, *.MD, Makefile false true - true @@ -71,12 +70,16 @@ 0 true + + -fno-delayed-template-parsing + + true + Builtin.BuildSystem true true Builtin.DefaultTidyAndClazy 4 - true @@ -87,17 +90,17 @@ ProjectExplorer.Project.Target.0 - Desktop - Desktop Qt 5.15.2 clang 64bit - Desktop Qt 5.15.2 clang 64bit - qt.qt5.5152.clang_64_kit + WebAssemblyDeviceType + Qt 5.15.2 WebAssembly + Qt 5.15.2 WebAssembly + qt.qt5.5152.wasm_32_kit 0 - 0 + -1 0 0 - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug true @@ -135,8 +138,8 @@ 2 - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Release - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Release + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release true @@ -176,8 +179,159 @@ 0 - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Profile - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Profile + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Profile + D:/_develop/_project/NameCreater/build-NameCreater-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 + true + + NameCreater + WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + false + true + false + 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 + 0 + 0 + 0 + + 0 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_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 + + + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Release + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_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 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile true @@ -237,163 +391,14 @@ 2 - false - Qt4ProjectManager.Qt4RunConfiguration:/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro - /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + false true true + false true - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug/NameCreater.app/Contents/MacOS - - 1 - - - - ProjectExplorer.Project.Target.1 - - WebAssemblyDeviceType - Qt 5.15.2 WebAssembly - Qt 5.15.2 WebAssembly - qt.qt5.5152.wasm_32_kit - 0 - -1 - 0 - - 0 - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug - /Users/shouchih/dev/namecreater/build-NameCreater-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 - - - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release - /Users/shouchih/dev/namecreater/build-NameCreater-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 - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile - /Users/shouchih/dev/namecreater/build-NameCreater-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 - true - - 2 - - false - ProjectExplorer.CustomExecutableRunConfiguration - - true - true + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug 1 diff --git a/NameCreater/NameCreater.ui b/NameCreater/NameCreater.ui index 57ecd93..a617cab 100644 --- a/NameCreater/NameCreater.ui +++ b/NameCreater/NameCreater.ui @@ -30,7 +30,7 @@ 10 10 - 311 + 171 16 @@ -398,6 +398,34 @@ color: rgb(250, 250, 250); + + + + 230 + 10 + 171 + 16 + + + + + Yu Gothic UI + 10 + false + false + + + + color: rgb(255, 255, 255); + + + + font_name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + @@ -405,7 +433,7 @@ color: rgb(250, 250, 250); 0 0 946 - 24 + 21 diff --git a/NameCreater/def.h b/NameCreater/def.h index 41990d2..68be24c 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.7.0" +#define VERSION "v2.7.1" #endif // DEF_H