diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index db0bc42..09272a6 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -1,8 +1,11 @@ #include "FiveToSingle.h" #include #include +#include +#include +#include - +#define BG_PATH_FORMAT ":/NameCreater/resource/background_%1.jpg" static QPointF BG_POS[] = { QPointF(159, 61), QPointF(482, 61), QPointF(802, 61), @@ -46,14 +49,72 @@ static QPointF NAME_POS_NUMBER[] = { static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]); -FiveToSingle::FiveToSingle():INameCreater() +FiveToSingle::FiveToSingle() :INameCreater() { + + } FiveToSingle::~FiveToSingle() { } +QList FiveToSingle::getNameByFileContent(Name_Type_e type, const QByteArray& conetent) +{ + QList nameList; + + QTextCodec* tc = QTextCodec::codecForName("Big5"); + QString codec = tc->toUnicode(conetent.data()); + QTextStream stream(&codec); + + int row = 0; + while (!stream.atEnd()) + { + NameInfo_t info; + QString line = stream.readLine(); + QString name_tc = line; + QStringList csvList = name_tc.split(','); + + QString name, eng_name, bg_type; + + switch (type) { + case Name_zh: + name = csvList.at(0); + bg_type = csvList.at(1); + + break; + case Name_zh_eng: + name = csvList.at(0); + eng_name = csvList.at(1); + bg_type = csvList.at(2); + + break; + case Name_eng: + eng_name = csvList.at(0); + bg_type = csvList.at(1); + default: + break; + + } + + qDebug() << "row :" << row << " " << name << ", eng: " << eng_name << ", bg_type: " << bg_type; + + if (name.compare("name_1") == 0 || eng_name.compare("eng_name") == 0) { + //pass first line + continue; + } + + info.name1 = name; + info.name_eng = eng_name; + info.name2 = QString(BG_PATH_FORMAT).arg(bg_type); + + nameList.append(info); + + row++; + } + return nameList; +} + void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, const QByteArray& filecontent, const QFont& font, const QColor& font_color) { int export_times = 0; @@ -76,112 +137,264 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, scene.addItem(bgItem);*/ - for (int n = 0; n < nameList.length(); n++) { - int idx = n % BG_POS_COUNT; - NameInfo_t name_info = nameList.at(n); - QImage name_image(name_info.bg_path); - if (idx == 0) { + switch (type) { + case Name_zh: + { + for (int n = 0; n < nameList.length(); n++) { + int idx = n % BG_POS_COUNT; + NameInfo_t name_info = nameList.at(n); + QImage name_image(name_info.name2); + if (idx == 0) { - QGraphicsRectItem* bg_item = new QGraphicsRectItem(0, 0, BG_WIDTH, BG_HEIGHT); - bg_item->setBrush(QBrush(QColor(255, 255, 255))); - scene.addItem(bg_item); - } + QGraphicsRectItem* bg_item = new QGraphicsRectItem(0, 0, BG_WIDTH, BG_HEIGHT); + bg_item->setBrush(QBrush(QColor(255, 255, 255))); + scene.addItem(bg_item); + } - QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(QPixmap::fromImage(name_image)); - bool rot = (idx == 10 || idx == 11); - name_bgItem->setRotation(rot ? -90 : 0); - name_bgItem->setPos(BG_POS[idx]); - scene.addItem(name_bgItem); + QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(QPixmap::fromImage(name_image)); + bool rot = (idx == 10 || idx == 11); + name_bgItem->setRotation(rot ? -90 : 0); + name_bgItem->setPos(BG_POS[idx]); + scene.addItem(name_bgItem); - if (name_info.name1.isEmpty()) { - QMessageBox msgBox; - msgBox.setText(QString().asprintf("Name is Empty at %d", export_times + 1)); - msgBox.exec(); - } - QString name = name_info.name1; - int name_len = name.length(); - for (int j = 0; j < 2; j++) { - int pos_idx = idx * 2 + j; - qreal xscale, yscale; + if (name_info.name1.isEmpty()) { + QMessageBox msgBox; + msgBox.setText(QString().asprintf("Name is Empty at %d", export_times + 1)); + msgBox.exec(); + } + QString name = name_info.name1; + int name_len = name.length(); + for (int j = 0; j < 2; j++) { + int pos_idx = idx * 2 + j; + qreal xscale, yscale; - xscale = yscale = (j == 1) ? -1 : 1; - QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS[pos_idx]; - qreal y_offset[2] = { 0 }; - if (name_len == 2) { + xscale = yscale = (j == 1) ? -1 : 1; + QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS[pos_idx]; + qreal y_offset[2] = { 0 }; + if (name_len == 2) { + if (!rot) { + pos.setY(pos.y() + 82.0 * xscale); + } + else { + pos.setX(pos.x() + 82.0 * xscale); + + } + + y_offset[0] = 25; + } + + QGraphicsTextItem* textItem1 = new QGraphicsTextItem(name.mid(0, 1)); + textItem1->setFont(font); + textItem1->setDefaultTextColor(font_color); if (!rot) { - pos.setY(pos.y() + 82.0 * xscale); + textItem1->setPos(pos); + textItem1->setTransform(QTransform::fromScale(xscale, yscale)); } else { - pos.setX(pos.x() + 82.0 * xscale); - + textItem1->setPos(pos); + textItem1->setRotation(-90); + textItem1->setTransform(QTransform::fromScale(xscale, yscale)); } - y_offset[0] = 25; - } - QGraphicsTextItem* textItem1 = new QGraphicsTextItem(name.mid(0, 1)); - textItem1->setFont(font); - textItem1->setDefaultTextColor(font_color); - if (!rot) { - textItem1->setPos(pos); - textItem1->setTransform(QTransform::fromScale(xscale, yscale)); - } - else { - textItem1->setPos(pos); - textItem1->setRotation(-90); - textItem1->setTransform(QTransform::fromScale(xscale, yscale)); - } + scene.addItem(textItem1); - - scene.addItem(textItem1); - - QGraphicsTextItem* textItem2 = new QGraphicsTextItem(name.mid(1, 1)); - textItem2->setFont(font); - textItem2->setDefaultTextColor(font_color); - if (!rot) { - - textItem2->setPos(pos.x(), pos.y() + (145 + y_offset[0]) * xscale); - textItem2->setTransform(QTransform::fromScale(xscale, yscale)); - } - else { - textItem2->setPos(pos.x() + (145 + y_offset[0]) * xscale, pos.y()); - textItem2->setRotation(-90); - textItem2->setTransform(QTransform::fromScale(xscale, yscale)); - } - - scene.addItem(textItem2); - - if (name_len > 2) { - QGraphicsTextItem* textItem3 = new QGraphicsTextItem(name.mid(2, 1)); - textItem3->setFont(font); - textItem3->setDefaultTextColor(font_color); + QGraphicsTextItem* textItem2 = new QGraphicsTextItem(name.mid(1, 1)); + textItem2->setFont(font); + textItem2->setDefaultTextColor(font_color); if (!rot) { - textItem3->setPos(pos.x(), pos.y() + 290 * xscale); - textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + + textItem2->setPos(pos.x(), pos.y() + (145 + y_offset[0]) * xscale); + textItem2->setTransform(QTransform::fromScale(xscale, yscale)); } else { - textItem3->setPos(pos.x() + 290 * xscale, pos.y()); - textItem3->setRotation(-90); - textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + textItem2->setPos(pos.x() + (145 + y_offset[0]) * xscale, pos.y()); + textItem2->setRotation(-90); + textItem2->setTransform(QTransform::fromScale(xscale, yscale)); } - scene.addItem(textItem3); + scene.addItem(textItem2); + + if (name_len > 2) { + QGraphicsTextItem* textItem3 = new QGraphicsTextItem(name.mid(2, 1)); + textItem3->setFont(font); + textItem3->setDefaultTextColor(font_color); + if (!rot) { + textItem3->setPos(pos.x(), pos.y() + 290 * xscale); + textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + } + else { + textItem3->setPos(pos.x() + 290 * xscale, pos.y()); + textItem3->setRotation(-90); + textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + } + + scene.addItem(textItem3); + } + + } + bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0); + if (is_export_page || n == nameList.count() - 1) { + QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); + QString file_name = QString("Signal_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + saveToImage(file_name, &scene); + export_times++; - - } - bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0); - if (is_export_page || n == nameList.count() - 1) { - QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("Signal_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); - saveToImage(file_name, &scene); - export_times++; - - scene.clear(); + scene.clear(); + } } } + break; + case Name_zh_eng: + { + QFont _new_font = QFont(this->EnglisthFont()); + _new_font.setWeight(QFont::ExtraLight); + + for (int n = 0; n < nameList.length(); n++) { + int idx = n % BG_POS_COUNT; + NameInfo_t name_info = nameList.at(n); + QImage name_image(name_info.name2); + if (idx == 0) { + + QGraphicsRectItem* bg_item = new QGraphicsRectItem(0, 0, BG_WIDTH, BG_HEIGHT); + bg_item->setBrush(QBrush(QColor(255, 255, 255))); + scene.addItem(bg_item); + } + + + QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(QPixmap::fromImage(name_image)); + bool rot = (idx == 10 || idx == 11); + name_bgItem->setRotation(rot ? -90 : 0); + name_bgItem->setPos(BG_POS[idx]); + scene.addItem(name_bgItem); + + + if (name_info.name1.isEmpty()) { + QMessageBox msgBox; + msgBox.setText(QString().asprintf("Name is Empty at %d", export_times + 1)); + msgBox.exec(); + } + QString name = name_info.name1; + int name_len = name.length(); + for (int j = 0; j < 2; j++) { + int pos_idx = idx * 2 + j; + QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS[pos_idx]; + if (j == 0) { + qreal xscale, yscale; + xscale = yscale = 1; + + qreal y_offset[2] = { 0 }; + if (name_len == 2) { + if (!rot) { + pos.setY(pos.y() + 82.0 * xscale); + } + else { + pos.setX(pos.x() + 82.0 * xscale); + + } + + y_offset[0] = 25; + } + + QGraphicsTextItem* textItem1 = new QGraphicsTextItem(name.mid(0, 1)); + textItem1->setFont(font); + textItem1->setDefaultTextColor(font_color); + if (!rot) { + textItem1->setPos(pos); + textItem1->setTransform(QTransform::fromScale(xscale, yscale)); + } + else { + textItem1->setPos(pos); + textItem1->setRotation(-90); + textItem1->setTransform(QTransform::fromScale(xscale, yscale)); + } + + + scene.addItem(textItem1); + + QGraphicsTextItem* textItem2 = new QGraphicsTextItem(name.mid(1, 1)); + textItem2->setFont(font); + textItem2->setDefaultTextColor(font_color); + if (!rot) { + + textItem2->setPos(pos.x(), pos.y() + (145 + y_offset[0]) * xscale); + textItem2->setTransform(QTransform::fromScale(xscale, yscale)); + } + else { + textItem2->setPos(pos.x() + (145 + y_offset[0]) * xscale, pos.y()); + textItem2->setRotation(-90); + textItem2->setTransform(QTransform::fromScale(xscale, yscale)); + } + + scene.addItem(textItem2); + + if (name_len > 2) { + QGraphicsTextItem* textItem3 = new QGraphicsTextItem(name.mid(2, 1)); + textItem3->setFont(font); + textItem3->setDefaultTextColor(font_color); + if (!rot) { + textItem3->setPos(pos.x(), pos.y() + 290 * xscale); + textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + } + else { + textItem3->setPos(pos.x() + 290 * xscale, pos.y()); + textItem3->setRotation(-90); + textItem3->setTransform(QTransform::fromScale(xscale, yscale)); + } + + scene.addItem(textItem3); + } + } + else if (j == 1) { + //TODO: add English world + QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng); + + + int _new_size = getFontSizebyStr(_new_font, 120, 480, name_info.name_eng); + _new_font.setPixelSize(_new_size); + + eng_word_item->setFont(_new_font); + QRectF rect = eng_word_item->boundingRect(); + eng_word_item->setDefaultTextColor(font_color); + + if (!rot) { + eng_word_item->setRotation(-90); + eng_word_item->setPos(pos.x() + 20 - rect.height(), (pos.y() - 200) + rect.width() / 2); + scene.addItem(eng_word_item); + } + else { + eng_word_item->setRotation(0); + eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()-20); + scene.addItem(eng_word_item); + } + + } + + + + } + bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0); + if (is_export_page || n == nameList.count() - 1) { + QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); + QString file_name = QString("Signal_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + saveToImage(file_name, &scene); + export_times++; + + scene.clear(); + } + } + + } + break; + + default: + break; + } + + diff --git a/NameCreater/FiveToSingle.h b/NameCreater/FiveToSingle.h index 725f71d..7b1743f 100644 --- a/NameCreater/FiveToSingle.h +++ b/NameCreater/FiveToSingle.h @@ -6,6 +6,8 @@ public: FiveToSingle(); ~FiveToSingle(); +protected: + QList getNameByFileContent(Name_Type_e type, const QByteArray& conetent); public: virtual void generaImageFromCSV(Name_Type_e type, const QString& filename, const QByteArray& filecontent, const QFont& font, const QColor& font_color); diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 817ae16..881c85c 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -23,7 +23,7 @@ #define ENGLISH_FONT_PATH ":/NameCreater/_exp/FontsFree-Net-Acumin-Pro-Semibold.ttf" #define FONT_SIZE 120 -#define VERSION "v2.3.2" +#define VERSION "v2.4.0" NameCreater::NameCreater(QWidget *parent) @@ -38,6 +38,7 @@ NameCreater::NameCreater(QWidget *parent) connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); + connect(ui.fivesingle_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); QString font_path = FONT_PATH; QFile font_res(font_path); @@ -116,7 +117,7 @@ void NameCreater::OnClickedReadBtn() { else { // Use fileName and fileContent if(sender == ui.fivesingle_btn) FiveToSingle().generaImageFromCSV(Name_Type_e::Name_zh,fileName, fileContent, this->font, this->font_color); - //if(sender == ui.fiveold_btn) OldFiveCreater().generaImageFromCSV(fileName, fileContent, this->font, this->font_color); + if(sender == ui.birthday_btn) BirthdayCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color); if(sender == ui.fivenew_btn) NewFiveCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color); if(sender == ui.towel_btn) TowelCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font_towel, this->font_color); @@ -136,7 +137,12 @@ void NameCreater::OnClickedReadBtn() { QColor newColor(0,0,0); HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor); } - + if (sender == ui.fivesingle_zh_eng_btn) { + FiveToSingle f; + f.setEnglishFont(this->font_english); + f.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color); + return; + } } }; diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 549d722..80df516 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 @@ -89,157 +89,6 @@ ProjectExplorer.Project.Target.0 - - WebAssemblyDeviceType - Qt 5.15.2 WebAssembly - Qt 5.15.2 WebAssembly - qt.qt5.5152.wasm_32_kit - 0 - -1 - 0 - - 0 - D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug - D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-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:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release - D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-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:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Profile - D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-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 - - true - true - true - - NameCreater - WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - false - true - false - true - chrome - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Desktop Qt 5.15.2 MSVC2019 64bit @@ -295,7 +144,7 @@ true QtProjectManager.QMakeBuildStep - false + true @@ -336,7 +185,7 @@ true QtProjectManager.QMakeBuildStep - false + true @@ -388,23 +237,6 @@ true true true - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 2 @@ -420,6 +252,157 @@ 1 + + ProjectExplorer.Project.Target.1 + + WebAssemblyDeviceType + Qt 5.15.2 WebAssembly + Qt 5.15.2 WebAssembly + qt.qt5.5152.wasm_32_kit + 0 + -1 + 0 + + 0 + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-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:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + 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:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Profile + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + 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 + + true + true + true + + NameCreater + WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + false + true + false + true + chrome + + 1 + + ProjectExplorer.Project.TargetCount 2 diff --git a/NameCreater/NameCreater.qrc b/NameCreater/NameCreater.qrc index 485ff15..04a1fd4 100644 --- a/NameCreater/NameCreater.qrc +++ b/NameCreater/NameCreater.qrc @@ -80,5 +80,25 @@ resource/hk_holder/pg.jpg resource/a.jpg resource/pg.jpg + resource/background_21.jpg + resource/background_22.jpg + resource/background_23.jpg + resource/background_24.jpg + resource/background_25.jpg + resource/background_26.jpg + resource/background_27.jpg + resource/background_28.jpg + resource/background_29.jpg + resource/background_30.jpg + resource/five/kb_1.jpg + resource/five/kb_2.jpg + resource/five/kb_3.jpg + resource/five/kb_4.jpg + resource/five/kb_5.jpg + resource/five/kg_1.jpg + resource/five/kg_2.jpg + resource/five/kg_3.jpg + resource/five/kg_4.jpg + resource/five/kg_5.jpg diff --git a/NameCreater/NameCreater.ui b/NameCreater/NameCreater.ui index 5fd2b98..b9a2fcc 100644 --- a/NameCreater/NameCreater.ui +++ b/NameCreater/NameCreater.ui @@ -77,6 +77,91 @@ border-color: rgb(255, 255, 255); QFrame::Raised + + + + + 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 + + + @@ -100,8 +185,21 @@ border-color: rgb(255, 255, 255); - - + + + + + 0 + 76 + + + + Open File + + + + + Yu Gothic UI @@ -113,19 +211,42 @@ border-color: rgb(255, 255, 255); -color: rgb(255, 255, 255); +color: rgb(250, 250, 250); - 生日禮產生器(英/英) + 手帕夾產生器 Qt::AlignCenter - - + + + + + Yu Gothic UI + 20 + 50 + false + false + + + + color: rgb(255, 255, 255); + + + + 五入組產生器 + + + Qt::AlignCenter + + + + + 0 @@ -161,68 +282,6 @@ color: rgb(255, 255, 255); - - - - - 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 - - - @@ -236,29 +295,6 @@ color: rgb(255, 255, 255); - - - - - Yu Gothic UI - 20 - 50 - false - false - - - - color: rgb(255, 255, 255); - - - - 五入組產生器 - - - Qt::AlignCenter - - - @@ -283,8 +319,8 @@ color: rgb(255, 255, 255); - - + + 0 @@ -296,8 +332,8 @@ color: rgb(255, 255, 255); - - + + Yu Gothic UI @@ -309,19 +345,19 @@ color: rgb(255, 255, 255); -color: rgb(250, 150, 150); +color: rgb(255, 255, 255); - 手帕夾產生器 + 生日禮產生器(英/英) Qt::AlignCenter - - + + 0 diff --git a/NameCreater/NameCreater.vcxproj.user b/NameCreater/NameCreater.vcxproj.user index e6de230..716ee7d 100644 --- a/NameCreater/NameCreater.vcxproj.user +++ b/NameCreater/NameCreater.vcxproj.user @@ -17,15 +17,15 @@ WindowsLocalDebugger - 2023-05-03T01:40:38.2815240Z + 2023-10-04T01:50:11.5655668Z - 2023-05-03T01:40:24.3278197Z + 2023-10-04T01:50:11.7070780Z - 2023-05-03T01:40:24.4724332Z + 2023-10-04T01:50:11.8781219Z - 2023-05-03T01:40:24.7925769Z + 2023-10-04T01:50:12.0266361Z \ No newline at end of file diff --git a/NameCreater/_exp/五入拆單入範例_中英.csv b/NameCreater/_exp/五入拆單入範例_中英.csv new file mode 100644 index 0000000..554352e --- /dev/null +++ b/NameCreater/_exp/五入拆單入範例_中英.csv @@ -0,0 +1,32 @@ +name_1,eng_name,bg_type +pF,Elsa,1 +Lp,Ana,2 +dw,Jolin,3 +p,Elsa,4 +p,Elsa,5 +Lp,Elsa,g +dw,Elsa,b +p,Elsa,y +p,Elsa,r +Lp,Elsa,g +p,Elsa,21 +Lp,Elsa,22 +pF,Elsa,23 +Lp,Elsa,24 +dw,Elsa,10 +u,ShouChih,11 +Ŵr,Shirly,12 +dιa,Elsa,13 +u,Elsa,14 +Ŵr,Elsa,15 +dιa,Jolin,16 +u,Elsa,17 +Ŵr,Elsa,18 +dιa,Elsa,19 +pF,Elsa,25 +pF,Elsa,26 +pF,Elsa,27 +pF,Elsa,28 +pF,Elsa,29 +pF,Elsa,30 +pF,Elsa,1 diff --git a/NameCreater/_exp/五入組範例.csv b/NameCreater/_exp/五入組範例.csv index b028bde..a9adb38 100644 --- a/NameCreater/_exp/五入組範例.csv +++ b/NameCreater/_exp/五入組範例.csv @@ -1,8 +1,8 @@ name,bg_type -L§,nb -Ŵr,b -Ŵr,g -Ŵr,g +L§,kb +Ŵr,kb +Ŵr,kg +Ŵr,kg Ŵr,nb Ŵr,nb w,ng @@ -16,6 +16,6 @@ name,bg_type ,b dιa,b dιa,ng -da,ng -da,nb +da,kg +da,kb da,nb diff --git a/NameCreater/resource/background_21.jpg b/NameCreater/resource/background_21.jpg new file mode 100644 index 0000000..2559b4e Binary files /dev/null and b/NameCreater/resource/background_21.jpg differ diff --git a/NameCreater/resource/background_22.jpg b/NameCreater/resource/background_22.jpg new file mode 100644 index 0000000..9a1af10 Binary files /dev/null and b/NameCreater/resource/background_22.jpg differ diff --git a/NameCreater/resource/background_23.jpg b/NameCreater/resource/background_23.jpg new file mode 100644 index 0000000..8381c64 Binary files /dev/null and b/NameCreater/resource/background_23.jpg differ diff --git a/NameCreater/resource/background_24.jpg b/NameCreater/resource/background_24.jpg new file mode 100644 index 0000000..d1277cb Binary files /dev/null and b/NameCreater/resource/background_24.jpg differ diff --git a/NameCreater/resource/background_25.jpg b/NameCreater/resource/background_25.jpg new file mode 100644 index 0000000..7d03038 Binary files /dev/null and b/NameCreater/resource/background_25.jpg differ diff --git a/NameCreater/resource/background_26.jpg b/NameCreater/resource/background_26.jpg new file mode 100644 index 0000000..5b72232 Binary files /dev/null and b/NameCreater/resource/background_26.jpg differ diff --git a/NameCreater/resource/background_27.jpg b/NameCreater/resource/background_27.jpg new file mode 100644 index 0000000..345038f Binary files /dev/null and b/NameCreater/resource/background_27.jpg differ diff --git a/NameCreater/resource/background_28.jpg b/NameCreater/resource/background_28.jpg new file mode 100644 index 0000000..9108f4d Binary files /dev/null and b/NameCreater/resource/background_28.jpg differ diff --git a/NameCreater/resource/background_29.jpg b/NameCreater/resource/background_29.jpg new file mode 100644 index 0000000..77ac05f Binary files /dev/null and b/NameCreater/resource/background_29.jpg differ diff --git a/NameCreater/resource/background_30.jpg b/NameCreater/resource/background_30.jpg new file mode 100644 index 0000000..53bfc5c Binary files /dev/null and b/NameCreater/resource/background_30.jpg differ diff --git a/NameCreater/resource/five/kb_1.jpg b/NameCreater/resource/five/kb_1.jpg new file mode 100644 index 0000000..2559b4e Binary files /dev/null and b/NameCreater/resource/five/kb_1.jpg differ diff --git a/NameCreater/resource/five/kb_2.jpg b/NameCreater/resource/five/kb_2.jpg new file mode 100644 index 0000000..9a1af10 Binary files /dev/null and b/NameCreater/resource/five/kb_2.jpg differ diff --git a/NameCreater/resource/five/kb_3.jpg b/NameCreater/resource/five/kb_3.jpg new file mode 100644 index 0000000..8381c64 Binary files /dev/null and b/NameCreater/resource/five/kb_3.jpg differ diff --git a/NameCreater/resource/five/kb_4.jpg b/NameCreater/resource/five/kb_4.jpg new file mode 100644 index 0000000..d1277cb Binary files /dev/null and b/NameCreater/resource/five/kb_4.jpg differ diff --git a/NameCreater/resource/five/kb_5.jpg b/NameCreater/resource/five/kb_5.jpg new file mode 100644 index 0000000..7d03038 Binary files /dev/null and b/NameCreater/resource/five/kb_5.jpg differ diff --git a/NameCreater/resource/five/kg_1.jpg b/NameCreater/resource/five/kg_1.jpg new file mode 100644 index 0000000..5b72232 Binary files /dev/null and b/NameCreater/resource/five/kg_1.jpg differ diff --git a/NameCreater/resource/five/kg_2.jpg b/NameCreater/resource/five/kg_2.jpg new file mode 100644 index 0000000..345038f Binary files /dev/null and b/NameCreater/resource/five/kg_2.jpg differ diff --git a/NameCreater/resource/five/kg_3.jpg b/NameCreater/resource/five/kg_3.jpg new file mode 100644 index 0000000..9108f4d Binary files /dev/null and b/NameCreater/resource/five/kg_3.jpg differ diff --git a/NameCreater/resource/five/kg_4.jpg b/NameCreater/resource/five/kg_4.jpg new file mode 100644 index 0000000..77ac05f Binary files /dev/null and b/NameCreater/resource/five/kg_4.jpg differ diff --git a/NameCreater/resource/five/kg_5.jpg b/NameCreater/resource/five/kg_5.jpg new file mode 100644 index 0000000..53bfc5c Binary files /dev/null and b/NameCreater/resource/five/kg_5.jpg differ