diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index b35340f..469f75b 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -37,6 +37,8 @@ //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf" +static CustomLogo* s_custom_logo_widget = nullptr; + NameCreater::NameCreater(QWidget* parent) : QMainWindow(parent) { @@ -249,12 +251,14 @@ void NameCreater::execCreater(QObject* sender, const QString& fileName, const QB void NameCreater::OnClickedCustomLogoBtn() { - QEventLoop loop; - CustomLogo widget(&this->font); - widget.show(); - connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit); - loop.exec(); - qDebug() << "exit event loop"; + //QEventLoop loop; + if (s_custom_logo_widget == nullptr) { + s_custom_logo_widget = new CustomLogo(&this->font); + } + s_custom_logo_widget->show(); + + //connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit); + //loop.exec(); } diff --git a/NameCreater/NameCreater.h b/NameCreater/NameCreater.h index c6d194e..2dc8ff8 100644 --- a/NameCreater/NameCreater.h +++ b/NameCreater/NameCreater.h @@ -24,6 +24,7 @@ private: QFont font, font_towel, font_english; + QColor font_color; diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 3ee69fb..a10f821 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {2e5b9b7d-86cb-4086-85fb-32be36077845} + {a426b19b-0307-4ed7-a601-36b62b8d929a} ProjectExplorer.Project.ActiveTarget - 0 + 2 ProjectExplorer.Project.EditorSettings @@ -78,7 +78,7 @@ true true Builtin.DefaultTidyAndClazy - 2 + 8 true @@ -90,17 +90,17 @@ ProjectExplorer.Project.Target.0 - Desktop - Desktop Qt 5.15.2 MSVC2019 64bit - Desktop Qt 5.15.2 MSVC2019 64bit - {c81acbfe-eec2-40c2-b148-0e5ee627adfb} + WebAssemblyDeviceType + WebAssembly Qt 6.8.0 (single-threaded) + WebAssembly Qt 6.8.0 (single-threaded) + qt.qt6.680.wasm_singlethread_kit 0 - 0 + -1 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:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_8_0_single_threaded-Debug + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_8_0_single_threaded-Debug true @@ -138,8 +138,158 @@ 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:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_8_0_single_threaded-Release + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_8_0_single_threaded-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 + D:\dev\qt\namecreater\NameCreater\build\WebAssembly_Qt_6_8_0_single_threaded-Profile + D:/dev/qt/namecreater/NameCreater/build/WebAssembly_Qt_6_8_0_single_threaded-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 + + 3 + 0 + + true + true + 0 + true + + -e cpu-cycles --call-graph "dwarf,4096" -F 250 + NameCreater + WebAssembly.RunConfiguration.EmrunD:/dev/qt/namecreater/NameCreater/NameCreater.pro + D:/dev/qt/namecreater/NameCreater/NameCreater.pro + false + true + true + chrome + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop + Desktop Qt 6.8.0 MSVC2022 64bit + Desktop Qt 6.8.0 MSVC2022 64bit + qt.qt6.680.win64_msvc2022_64_kit + 0 + 0 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MSVC2022_64bit-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_MSVC2022_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:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MSVC2022_64bit-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_MSVC2022_64bit-Release true @@ -179,8 +329,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:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MSVC2022_64bit-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_MSVC2022_64bit-Profile true @@ -238,36 +388,36 @@ true 0 true - 2 false -e cpu-cycles --call-graph "dwarf,4096" -F 250 - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/qt/namecreater/NameCreater/NameCreater.pro + D:/dev/qt/namecreater/NameCreater/NameCreater.pro false true + true true 1 - ProjectExplorer.Project.Target.1 + ProjectExplorer.Project.Target.2 - WebAssemblyDeviceType - QwbAssembly Qt 5.15.2 - QwbAssembly Qt 5.15.2 - {7751e2ea-88c1-4df7-b6c4-78f8275796e2} + Desktop + Desktop Qt 5.15.2 MSVC + Desktop Qt 5.15.2 MSVC + {87810562-0438-4dfa-a57e-8c46992895e0} 0 - -1 + 0 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:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Debug true @@ -304,14 +454,275 @@ Qt4ProjectManager.Qt4BuildConfiguration 2 - 1 - 0 + + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-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:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_5_15_2_MSVC-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-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:D:/dev/qt/namecreater/NameCreater/NameCreater.pro + D:/dev/qt/namecreater/NameCreater/NameCreater.pro + false + true + true + true + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_5_15_2_MSVC-Debug + + 1 + + + + ProjectExplorer.Project.Target.3 + + Desktop + Desktop Qt 6.8.0 MinGW 64-bit + Desktop Qt 6.8.0 MinGW 64-bit + qt.qt6.680.win64_mingw_kit + 0 + 0 + 0 + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MinGW_64_bit-Debug + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_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 + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MinGW_64_bit-Release + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_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 + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + D:\dev\qt\namecreater\NameCreater\build\Desktop_Qt_6_8_0_MinGW_64_bit-Profile + D:/dev/qt/namecreater/NameCreater/build/Desktop_Qt_6_8_0_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 + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 true true 0 true - 2 @@ -329,7 +740,7 @@ ProjectExplorer.Project.TargetCount - 2 + 4 ProjectExplorer.Project.Updater.FileVersion