diff --git a/NameCreater/BirthdayCreater.cpp b/NameCreater/BirthdayCreater.cpp index ca59e24..8b91466 100644 --- a/NameCreater/BirthdayCreater.cpp +++ b/NameCreater/BirthdayCreater.cpp @@ -207,7 +207,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena //TODO: add English world QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng); QFont _new_font = QFont(EnglisthFont()); - _new_font.setWeight(QFont::ExtraBold); + _new_font.setWeight(QFont::ExtraLight); int _new_size = getFontSizebyStr(_new_font, 120, 480, name_info.name_eng); _new_font.setPixelSize(_new_size); @@ -216,7 +216,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena eng_word_item->setDefaultTextColor(font_color); eng_word_item->setRotation(-90); - eng_word_item->setPos(label_item->x() + 140.0 - rect.height()/2.0, label_item->y() + 1580 - chrismas_y_offset + rect.width()/2); + eng_word_item->setPos(label_item->x() + 160.0 - rect.height()/2.0, label_item->y() + 1580 - chrismas_y_offset + rect.width()/2); scene.addItem(eng_word_item); diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 5dc2af5..d972dc5 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -19,7 +19,7 @@ #define FONT_PATH ":/NameCreater/_exp/DFYuanStd-W8.otf" #define TOWEL_FONT_PATH ":/NameCreater/_exp/W1.ttc" -#define ENGLISH_FONT_PATH ":/NameCreater/_exp/AcuminVariableConcept.otf" +#define ENGLISH_FONT_PATH ":/NameCreater/_exp/AcuminVariableConcept-Medium.ttf" #define FONT_SIZE 120 #define VERSION "v2.1.0" diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 10e5bcb..0728b57 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/NameCreater/NameCreater.qrc b/NameCreater/NameCreater.qrc index 6ab0166..e15cb49 100644 --- a/NameCreater/NameCreater.qrc +++ b/NameCreater/NameCreater.qrc @@ -66,6 +66,6 @@ resource/five/ng_3.jpg resource/five/ng_4.jpg resource/five/ng_5.jpg - _exp/AcuminVariableConcept.otf + _exp/AcuminVariableConcept-Medium.ttf diff --git a/NameCreater/_exp/AcuminVariableConcept-Medium.ttf b/NameCreater/_exp/AcuminVariableConcept-Medium.ttf new file mode 100644 index 0000000..8ad3690 Binary files /dev/null and b/NameCreater/_exp/AcuminVariableConcept-Medium.ttf differ diff --git a/NameCreater/_exp/AcuminVariableConcept.otf b/NameCreater/_exp/AcuminVariableConcept.otf deleted file mode 100644 index b8e47cf..0000000 Binary files a/NameCreater/_exp/AcuminVariableConcept.otf and /dev/null differ