From c13e225d29e38ea43b670147c1b86952757e01e7 Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Fri, 20 Sep 2024 12:45:36 +0800 Subject: [PATCH] update for testing vs 2022 --- NameCreater/NameCreater.cpp | 12 +- NameCreater/NameCreater.h | 3 +- NameCreater/NameCreater.pro.user | 416 +++++++++++++++++++++--- NameCreater/NameCreater.vcxproj | 23 +- NameCreater/NameCreater.vcxproj.filters | 9 + NameCreater/customlogo.cpp | 3 +- NameCreater/customlogo2.cpp | 4 +- NameCreater/customlogo2.h | 6 +- 8 files changed, 412 insertions(+), 64 deletions(-) diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 1d67310..4786358 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -18,6 +18,7 @@ #include "NewFiveCreater.h" #include "HKHolderCreater.h" #include "customlogo.h" +#include "customlogo2.h" #define TOWEL_FONT_PATH ":/NameCreater/_exp/W1.ttc" @@ -30,7 +31,7 @@ //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf" NameCreater::NameCreater(QWidget *parent) - : QMainWindow(parent),custom2(NULL) + : QMainWindow(parent) { ui.setupUi(this); connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); @@ -171,10 +172,11 @@ void NameCreater::OnClickedCustomLogoBtn() { } void NameCreater::OnClickedCustomLogo2Btn(){ - if (custom2 == NULL){ - custom2 = new customlogo2(&this->font); - } - custom2->show(); + QEventLoop loop; + customlogo2 widget(&this->font); + connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit); + widget.show(); + loop.exec(); } void NameCreater::onFontDownloadFinished(QNetworkReply *reply){ diff --git a/NameCreater/NameCreater.h b/NameCreater/NameCreater.h index 5d43239..62487f6 100644 --- a/NameCreater/NameCreater.h +++ b/NameCreater/NameCreater.h @@ -7,7 +7,6 @@ #include #include -#include "customlogo2.h" class NameCreater : public QMainWindow { @@ -22,7 +21,7 @@ private: QColor font_color; - customlogo2 *custom2; + QNetworkAccessManager network_mgr; void loadFont(const QByteArray& fontdata); diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 9f8ec1c..2a02054 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {fcddcb90-0e4f-4f41-99d2-8ce9f168d92c} + {2e5b9b7d-86cb-4086-85fb-32be36077845} ProjectExplorer.Project.ActiveTarget - 0 + 2 ProjectExplorer.Project.EditorSettings @@ -41,7 +41,7 @@ false true false - 2 + 0 true true 0 @@ -74,12 +74,17 @@ 0 true + + -fno-delayed-template-parsing + + true + Builtin.BuildSystem true true Builtin.DefaultTidyAndClazy - 4 - true + 2 + false @@ -90,17 +95,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 + QwbAssembly Qt 5.15.2 + QwbAssembly Qt 5.15.2 + {7751e2ea-88c1-4df7-b6c4-78f8275796e2} 0 - 0 + -1 0 0 - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Debug - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Debug + C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Debug + C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Debug true @@ -138,8 +143,8 @@ 2 - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Release - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Release + C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Release + C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Release true @@ -179,8 +184,161 @@ 0 - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Profile - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Profile + C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Profile + C:/dev/namecreater/NameCreater/build/QwbAssembly_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 + + + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + NameCreater + WebAssembly.RunConfiguration.EmrunC:/dev/namecreater/NameCreater/NameCreater.pro + C:/dev/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 + {c81acbfe-eec2-40c2-b148-0e5ee627adfb} + 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 + + + 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_5_15_2_MSVC2019_64bit-Release + C:/dev/namecreater/NameCreater/build/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 + 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 @@ -238,37 +396,36 @@ true 0 true + 2 false - -e cpu-cycles --call-graph dwarf,4096 -F 250 + -e cpu-cycles --call-graph "dwarf,4096" -F 250 - Qt4ProjectManager.Qt4RunConfiguration:/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro - /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + ProjectExplorer.CustomExecutableRunConfiguration + false true - true true - /Users/shouchih/dev/namecreater/NameCreater/build/Desktop_Qt_5_15_2_clang_64bit-Debug/NameCreater.app/Contents/MacOS 1 - ProjectExplorer.Project.Target.1 + ProjectExplorer.Project.Target.2 - WebAssemblyDeviceType - Qt 5.15.2 WebAssembly - Qt 5.15.2 WebAssembly - qt.qt5.5152.wasm_32_kit + Desktop + Desktop Qt 6.7.2 MinGW 64-bit + Desktop Qt 6.7.2 MinGW 64-bit + qt.qt6.672.win64_mingw_kit 0 - -1 + 0 0 0 - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Debug - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Debug + C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MinGW_64_bit-Debug + C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug true @@ -306,8 +463,8 @@ 2 - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Release - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Release + C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MinGW_64_bit-Release + C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MinGW_64_bit-Release true @@ -347,8 +504,8 @@ 0 - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Profile - /Users/shouchih/dev/namecreater/NameCreater/build/Qt_5_15_2_WebAssembly-Profile + C:\dev\namecreater\NameCreater\build\Desktop_Qt_6_7_2_MinGW_64_bit-Profile + C:/dev/namecreater/NameCreater/build/Desktop_Qt_6_7_2_MinGW_64_bit-Profile true @@ -388,28 +545,205 @@ 0 3 - 0 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 true true 0 true + - -e cpu-cycles --call-graph dwarf,4096 -F 250 - NameCreater - WebAssembly.RunConfiguration.Emrun/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro - /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + 2 + + false + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + false true true - chrome 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 - 2 + 4 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/NameCreater.vcxproj b/NameCreater/NameCreater.vcxproj index bfb8cd6..49de0e4 100644 --- a/NameCreater/NameCreater.vcxproj +++ b/NameCreater/NameCreater.vcxproj @@ -21,28 +21,28 @@ {B66B108B-6DA8-408D-936D-988FF8B6B722} QtVS_v304 - 10.0.16299.0 + 10.0 10.0 10.0.16299.0 - 10.0.19041.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild Application - v140 + v143 Application - v142 + v143 Application - v140 + v143 Application - v142 + v143 @@ -50,12 +50,12 @@ 5.15.2_msvc2019_64 - core;gui;widgets + core;gui;widgets;network debug - 5.15.2_msvc2019_64 - core;gui;widgets;network + $(DefaultQtVersion) + core;gui;widgets;network;core5compat debug @@ -65,7 +65,7 @@ $(DefaultQtVersion) - core;gui;widgets;network + core;gui;widgets;network; release @@ -186,12 +186,14 @@ + + @@ -202,6 +204,7 @@ + diff --git a/NameCreater/NameCreater.vcxproj.filters b/NameCreater/NameCreater.vcxproj.filters index d574e34..d9dc486 100644 --- a/NameCreater/NameCreater.vcxproj.filters +++ b/NameCreater/NameCreater.vcxproj.filters @@ -67,6 +67,9 @@ Creaters + + Creaters + @@ -103,10 +106,16 @@ Form Files + + Form Files + Creaters + + Creaters + \ No newline at end of file diff --git a/NameCreater/customlogo.cpp b/NameCreater/customlogo.cpp index 60efdb7..4f97b25 100644 --- a/NameCreater/customlogo.cpp +++ b/NameCreater/customlogo.cpp @@ -108,8 +108,9 @@ void CustomLogo::gerneraImageFromList(const QList& nameList, Name_Ty scene.addItem(bg_item); } + QPixmap* _bg = new QPixmap(ui->display_label->pixmap().copy()); - QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(*ui->display_label->pixmap()); + QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(*_bg); bool rot = (idx == 10 || idx == 11); name_bgItem->setRotation(rot ? -90 : 0); name_bgItem->setPos(BG_POS[idx]); diff --git a/NameCreater/customlogo2.cpp b/NameCreater/customlogo2.cpp index 1d48796..874d9f3 100644 --- a/NameCreater/customlogo2.cpp +++ b/NameCreater/customlogo2.cpp @@ -24,8 +24,8 @@ static int BG_POS_COUNT = 12; -customlogo2::customlogo2(QFont *font, QWidget *parent) - : QWidget(parent) +customlogo2::customlogo2(QFont *font, QDialog*parent) + : QDialog(parent) , ui(new Ui::customlogo2) , zhFont(font) { diff --git a/NameCreater/customlogo2.h b/NameCreater/customlogo2.h index d0c39d0..c19460c 100644 --- a/NameCreater/customlogo2.h +++ b/NameCreater/customlogo2.h @@ -1,7 +1,7 @@ #ifndef CUSTOMLOGO2_H #define CUSTOMLOGO2_H -#include +#include #include "INameCreater.h" #include "QFont" @@ -9,12 +9,12 @@ namespace Ui { class customlogo2; } -class customlogo2 : public QWidget +class customlogo2 : public QDialog { Q_OBJECT public: - explicit customlogo2(QFont *font ,QWidget *parent = nullptr); + explicit customlogo2(QFont *font , QDialog*parent = nullptr); ~customlogo2(); private: