diff --git a/.gitignore b/.gitignore index 92f34a7..a70f4e4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /*.db /_bin /web_build +/buildwed diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 740d190..c2aabd3 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -23,7 +23,7 @@ #define BG_BOY_TYPE_STR "boy" #define BG_GIRL_TYPE_STR "girl" - +#define VERSION "v1.2.0" struct NameInfo_t { QString name1; @@ -377,6 +377,15 @@ NameCreater::NameCreater(QWidget *parent) font.setPixelSize(FONT_SIZE); font_color = QColor(0, 0, 0); + QFont tital_font = QFont(font); + tital_font.setPixelSize(20); + + QFont version_font = QFont(font); + version_font.setPixelSize(12); + + ui.tital_label->setFont(tital_font); + ui.version_label->setFont(version_font); + ui.version_label->setText(VERSION); font_res.close(); qDebug() << ui.label->font().family(); diff --git a/NameCreater/NameCreater.ui b/NameCreater/NameCreater.ui index 83f2bcb..efce780 100644 --- a/NameCreater/NameCreater.ui +++ b/NameCreater/NameCreater.ui @@ -6,8 +6,8 @@ 0 0 - 977 - 716 + 532 + 458 @@ -47,8 +47,8 @@ background-color: rgb(0, 0, 0); - 70 - 50 + 80 + 100 181 161 @@ -57,13 +57,71 @@ background-color: rgb(0, 0, 0); Open File + + + + 50 + 20 + 261 + 71 + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + 五入組拆成單入產生器 + + + Qt::AlignCenter + + + + + + 50 + 60 + 261 + 41 + + + + + Yu Gothic UI + 10 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + 五入組拆成單入產生器 + + + Qt::AlignCenter + + 0 0 - 977 + 532 21 diff --git a/NameCreater/_exp/name.csv b/NameCreater/_exp/name.csv index ecd7ed8..10d2c83 100644 --- a/NameCreater/_exp/name.csv +++ b/NameCreater/_exp/name.csv @@ -1,13 +1,26 @@ name_1,bg_type pF,1 Lp,2 -dw,y -p,y -p,r +dw,3 +p,4 +p,5 Lp,g dw,b p,y p,r Lp,g -p,2 -Lp,1 +p,6 +Lp,7 +pF,8 +Lp,9 +dw,10 +u,11 +Ŵr,12 +dιa,13 +u,14 +Ŵr,15 +dιa,16 +u,17 +Ŵr,18 +dιa,19 +pF,20