diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 86f8ff2..2b89b2d 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -41,6 +41,10 @@ NameCreater::NameCreater(QWidget* parent) : QMainWindow(parent) { ui.setupUi(this); + + + ui.scrollAreaWidgetContents->setMinimumSize(ui.frame->size()); + connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); //connect(ui.fiveold_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); @@ -67,6 +71,11 @@ NameCreater::NameCreater(QWidget* parent) } +NameCreater::~NameCreater() +{ + +} + void NameCreater::parseFontJson(const QByteArray& data) { QJsonDocument jsonDoc = QJsonDocument::fromJson(data); diff --git a/NameCreater/NameCreater.h b/NameCreater/NameCreater.h index 5d5a2c5..93c1b98 100644 --- a/NameCreater/NameCreater.h +++ b/NameCreater/NameCreater.h @@ -10,15 +10,19 @@ + class NameCreater : public QMainWindow { Q_OBJECT public: NameCreater(QWidget *parent = Q_NULLPTR); + ~NameCreater(); private: Ui::NameCreaterClass ui; + + QFont font, font_towel, font_english; QColor font_color; diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index d4970ff..9f12b37 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 2 ProjectExplorer.Project.EditorSettings @@ -94,159 +94,6 @@ ProjectExplorer.Project.Target.0 - - WebAssemblyDeviceType - WebAssembly Qt 6.7.2 (single-threaded) - WebAssembly Qt 6.7.2 (single-threaded) - qt.qt6.672.wasm_singlethread_kit - 0 - -1 - 0 - - 0 - C:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Debug - C:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-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 - - - device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Release - device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_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 - device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Profile - device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_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 - - - 2 - - false - -e cpu-cycles --call-graph "dwarf,4096" -F 250 - - ProjectExplorer.CustomExecutableRunConfiguration - - false - true - true - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Desktop Qt 5.15.2 MSVC2019 64bit @@ -414,7 +261,7 @@ - ProjectExplorer.Project.Target.2 + ProjectExplorer.Project.Target.1 Desktop Desktop Qt 6.7.2 MSVC2019 64bit @@ -582,7 +429,7 @@ - ProjectExplorer.Project.Target.3 + ProjectExplorer.Project.Target.2 WebAssemblyDeviceType QwbAssembly Qt 5.15.2 @@ -735,7 +582,7 @@ - ProjectExplorer.Project.Target.4 + ProjectExplorer.Project.Target.3 Desktop Desktop Qt 5.12.12 MinGW 64-bit @@ -898,7 +745,7 @@ ProjectExplorer.Project.TargetCount - 5 + 4 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/NameCreater.ui b/NameCreater/NameCreater.ui index 16e2b0b..588ff21 100644 --- a/NameCreater/NameCreater.ui +++ b/NameCreater/NameCreater.ui @@ -6,8 +6,8 @@ 0 0 - 916 - 816 + 902 + 780 @@ -25,485 +25,519 @@ background-color: rgb(0, 0, 0); } - - - - 10 - 10 - 171 - 16 - - - - - Yu Gothic UI - 10 - 50 - false - false - - - - color: rgb(255, 255, 255); + + + + + 100 + + + QLayout::SetDefaultConstraint + + + 0 + + + + + + Yu Gothic UI + 10 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - v1.0.0 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 10 - 40 - 851 - 681 - - - - QFrame#frame{ + + + v1.0.0 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + Yu Gothic UI + 10 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + font_name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 200 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + QFrame::NoFrame + + + QAbstractScrollArea::AdjustToContents + + + true + + + + + 0 + 0 + 884 + 734 + + + + + 0 + 0 + + + + QWidget#scrollAreaWidgetContents{ + background-color: rgb(0, 0, 0); +} + + + + + 0 + 0 + 861 + 681 + + + + QFrame#frame{ border: 3px solid #FFFFFF; border-color: rgb(255, 255, 255); } - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - 0 - 76 - - - - Open File - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 客製底圖產生器 - - - Qt::AlignCenter - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - + + + 生日禮產生器(英/英) + + + Qt::AlignCenter + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 生日禮產生器(英/英) - - - Qt::AlignCenter - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - + + + 生日禮產生器 + + + Qt::AlignCenter + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + 五入組產生器 + + + Qt::AlignCenter + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 生日禮產生器(中/英) - - - Qt::AlignCenter - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - + + + 客製底圖產生器 + + + Qt::AlignCenter + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + 小方巾產生器 + + + Qt::AlignCenter + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 生日禮產生器 - - - Qt::AlignCenter - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - color: rgb(255, 255, 255); + + + 生日禮產生器(中/英) + + + Qt::AlignCenter + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + 0 + 76 + + + + Open Dialog + + + + + + + + 0 + 76 + + + + Open Dialog + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 五入組拆成單入產生器 - - - Qt::AlignCenter - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - color: rgb(255, 255, 255); + + + 五入組拆成單入產生器 + + + Qt::AlignCenter + + + + + + + + 0 + 76 + + + + Open File + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + +color: rgb(255, 255, 255); - - - 五入組拆成單入產生器(中/英) - - - Qt::AlignCenter - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - color: rgb(255, 255, 255); + + + 扶輪社 + + + Qt::AlignCenter + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); - - - 五入組產生器 - - - Qt::AlignCenter - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - color: rgb(255, 255, 255); - - - - 小方巾產生器 - - - Qt::AlignCenter - - - - - - - - 0 - 76 - - - - Open File - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - + + + 五入組拆成單入產生器(中/英) + + + Qt::AlignCenter + + + + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(250, 250, 250); - - - 手帕夾產生器 - - - Qt::AlignCenter - + + + 手帕夾產生器 + + + Qt::AlignCenter + + + + + - - - - - - 0 - 76 - - - - Open Dialog - - - - - - - - 0 - 76 - - - - Open Dialog - - - - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - -color: rgb(255, 255, 255); - - - - 扶輪社 - - - Qt::AlignCenter - - - - - - - - - 230 - 10 - 171 - 16 - - - - - Yu Gothic UI - 10 - 50 - false - false - - - - color: rgb(255, 255, 255); - - - - font_name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 380 - 10 - 201 - 21 - - - + + + - - - - 0 - 0 - 916 - 21 - - - - - - TopToolBarArea - - - false - - - Open File diff --git a/NameCreater/def.h b/NameCreater/def.h index 727a598..f7335d8 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,11 +1,7 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.9.0" - - - - +#define VERSION "v2.9.1" #endif // DEF_H