From e8a4557906fb8d7b465f79207f8a223c26d5984d Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Sat, 14 Sep 2024 16:35:01 +0800 Subject: [PATCH] 1. update version 2.8.0. 2. change save path dir in customlogo2 in MAC setting. --- NameCreater/NameCreater.pro.user | 2 +- NameCreater/NameCreater.pro.user.b811b07 | 417 ----------------------- NameCreater/customlogo2.cpp | 25 +- NameCreater/customlogo2.ui | 52 +-- NameCreater/def.h | 2 +- 5 files changed, 23 insertions(+), 475 deletions(-) delete mode 100644 NameCreater/NameCreater.pro.user.b811b07 diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 503fe24..9f8ec1c 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/NameCreater/NameCreater.pro.user.b811b07 b/NameCreater/NameCreater.pro.user.b811b07 deleted file mode 100644 index fc67cae..0000000 --- a/NameCreater/NameCreater.pro.user.b811b07 +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - EnvironmentId - {b811b073-5bd9-459e-9aa0-418d2f1f6d39} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - false - true - false - 0 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - - 0 - true - - true - true - Builtin.DefaultTidyAndClazy - 4 - - - - true - - - true - - - - - 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 - /home/shouchih/qt_ws/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug - /home/shouchih/qt_ws/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 - - - /home/shouchih/qt_ws/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release - /home/shouchih/qt_ws/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 - /home/shouchih/qt_ws/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile - /home/shouchih/qt_ws/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.Emrun/home/shouchih/qt_ws/namecreater/NameCreater/NameCreater.pro - /home/shouchih/qt_ws/namecreater/NameCreater/NameCreater.pro - false - true - false - true - firefox - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop - Desktop Qt 5.15.2 GCC 64bit - Desktop Qt 5.15.2 GCC 64bit - qt.qt5.5152.gcc_64_kit - 0 - 0 - 0 - - 0 - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_64bit-Debug - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_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 - - - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_64bit-Release - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_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 - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_64bit-Profile - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_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 - true - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:/home/shouchih/qt_ws/namecreater/NameCreater/NameCreater.pro - /home/shouchih/qt_ws/namecreater/NameCreater/NameCreater.pro - false - true - true - false - true - /home/shouchih/qt_ws/namecreater/build-NameCreater-Desktop_Qt_5_15_2_GCC_64bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/NameCreater/customlogo2.cpp b/NameCreater/customlogo2.cpp index b9c6cd1..1d48796 100644 --- a/NameCreater/customlogo2.cpp +++ b/NameCreater/customlogo2.cpp @@ -31,9 +31,10 @@ customlogo2::customlogo2(QFont *font, QWidget *parent) { ui->setupUi(this); - connect(ui->loadfont_btn, &QPushButton::released, this,&customlogo2::OnClickedBtn); connect(ui->loadcsv_btn, &QPushButton::released, this,&customlogo2::OnClickedBtn); + + // read ubuntu font QFile font_file(FONT_PATH); if (!font_file.open(QIODevice::ReadOnly)) { QMessageBox msgBox; @@ -42,16 +43,15 @@ customlogo2::customlogo2(QFont *font, QWidget *parent) font_file.close(); } + int id = QFontDatabase::addApplicationFontFromData(font_file.readAll()); QString font_families = QFontDatabase::applicationFontFamilies(id).at(0); enFont = QFont(font_families); enFont.setPixelSize(60); + // set zh font size zhFont->setPixelSize(120); - qDebug()<<"word space" << QString::number(zhFont->wordSpacing()); - zhFont->setWordSpacing(300); - qDebug()<loadfont_btn){ - - - - }else if(sender == ui->loadcsv_btn){ - + if(sender == ui->loadcsv_btn){ loadListFromFile(); - } - - } @@ -118,7 +110,7 @@ QList customlogo2::getNameByFileContent(Name_Type_e type, const QByt QString name_tc = line; QStringList csvList = name_tc.split(','); - QString name, eng_name, bg_type; + QString name, eng_name; switch (type) { case Name_zh: @@ -256,13 +248,16 @@ void customlogo2::saveToImage(const QString& filename, QGraphicsScene* scene) QPainter painter(&image); scene->render(&painter); + + #ifdef Q_OS_MAC QString folder_name = QCoreApplication::applicationDirPath() + "/../../../export_" + QDateTime::currentDateTime().toString("yyyyMMdd"); + qDebug() << "app director path" < 0 0 - 400 - 300 + 338 + 182 Form - - - - 90 - 90 - 100 - 32 - - - - Load Font - - - - - - 240 - 90 - 100 - 32 - - - - Load CSV - - - - - - 160 - 220 - 100 - 32 - - - - Export - - + + + + + Load CSV + + + + diff --git a/NameCreater/def.h b/NameCreater/def.h index 68be24c..bfa4290 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.7.1" +#define VERSION "v2.8.0" #endif // DEF_H