diff --git a/NameCreater/BirthdayCreater.cpp b/NameCreater/BirthdayCreater.cpp index d861716..dfb4d9c 100644 --- a/NameCreater/BirthdayCreater.cpp +++ b/NameCreater/BirthdayCreater.cpp @@ -204,7 +204,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena for(int i = 0; i < 2; i++){ qreal dir = (i == 0) ? -1.0:1.0; qreal x_offset = (i == 0) ? 290.0 : 170.0; - qreal y_offset = (i == 0) ? 820.0 : 1550.0; + qreal y_offset = (i == 0) ? 890.0 : 1550.0; int sp_y_offset = (i == 0)? 1.0*chrismas_y_offset:-1.0*chrismas_y_offset; //add English world QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng); diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 0927f4b..db86365 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings diff --git a/NameCreater/_exp/生日禮範例_英英.csv b/NameCreater/_exp/生日禮範例_英英.csv index 457a049..743812e 100644 --- a/NameCreater/_exp/生日禮範例_英英.csv +++ b/NameCreater/_exp/生日禮範例_英英.csv @@ -1,5 +1,5 @@ eng_name,bg_type -Alice,r +Churchill,m Alice,r Alice,r Alice,r diff --git a/NameCreater/def.h b/NameCreater/def.h index a863f28..69ff0e4 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.5.1" +#define VERSION "v2.6.0" #endif // DEF_H diff --git a/NameCreater/resource/background_16.jpg b/NameCreater/resource/background_16.jpg index 0610074..1cf470b 100644 Binary files a/NameCreater/resource/background_16.jpg and b/NameCreater/resource/background_16.jpg differ diff --git a/NameCreater/resource/background_17.jpg b/NameCreater/resource/background_17.jpg index 550f3aa..02696d7 100644 Binary files a/NameCreater/resource/background_17.jpg and b/NameCreater/resource/background_17.jpg differ diff --git a/NameCreater/resource/background_18.jpg b/NameCreater/resource/background_18.jpg index 8d7664d..2182430 100644 Binary files a/NameCreater/resource/background_18.jpg and b/NameCreater/resource/background_18.jpg differ diff --git a/NameCreater/resource/background_19.jpg b/NameCreater/resource/background_19.jpg index 19b6cbf..42fe700 100644 Binary files a/NameCreater/resource/background_19.jpg and b/NameCreater/resource/background_19.jpg differ diff --git a/NameCreater/resource/background_20.jpg b/NameCreater/resource/background_20.jpg index aade1a8..55e5ccf 100644 Binary files a/NameCreater/resource/background_20.jpg and b/NameCreater/resource/background_20.jpg differ diff --git a/NameCreater/resource/five/ng_1.jpg b/NameCreater/resource/five/ng_1.jpg index 0610074..2182430 100644 Binary files a/NameCreater/resource/five/ng_1.jpg and b/NameCreater/resource/five/ng_1.jpg differ diff --git a/NameCreater/resource/five/ng_2.jpg b/NameCreater/resource/five/ng_2.jpg index 550f3aa..42fe700 100644 Binary files a/NameCreater/resource/five/ng_2.jpg and b/NameCreater/resource/five/ng_2.jpg differ diff --git a/NameCreater/resource/five/ng_3.jpg b/NameCreater/resource/five/ng_3.jpg index 8d7664d..55e5ccf 100644 Binary files a/NameCreater/resource/five/ng_3.jpg and b/NameCreater/resource/five/ng_3.jpg differ diff --git a/NameCreater/resource/five/ng_4.jpg b/NameCreater/resource/five/ng_4.jpg index 19b6cbf..02696d7 100644 Binary files a/NameCreater/resource/five/ng_4.jpg and b/NameCreater/resource/five/ng_4.jpg differ diff --git a/NameCreater/resource/five/ng_5.jpg b/NameCreater/resource/five/ng_5.jpg index aade1a8..1cf470b 100644 Binary files a/NameCreater/resource/five/ng_5.jpg and b/NameCreater/resource/five/ng_5.jpg differ