1. set slider label font.

# Conflicts:
#	NameCreater/customlogo2.cpp
#	NameCreater/def.h

.gitignore

@@ -8,4 +8,3 @@
 /buildwed
 /NameCreater/*.aps
 /buildweb/
-/NameCreater/build/*

NameCreater/BirthdayCreater.cpp

@@ -13,7 +13,7 @@
 #define MAX_LABEL_IN_PAPER		10
 #define FONT_PIXEL_SIZE			120
 
-static QPoint LABEL_POS_START = QPoint(163, 70);
+static QPoint LABEL_POS_START = QPoint(163, 115);
 static QPoint NAME_OFFSET_START = QPoint(82, 712);
 static QPoint NAME_OFFSET_REVERSE_START = QPoint(214, 1745);
 
@@ -135,7 +135,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
 
 			int chrismas_y_offset = 0;
 			if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
-                /*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
+				name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
 				chrismas_y_offset = 30;
 			}
 
@@ -191,7 +191,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
 
             int chrismas_y_offset = 0;
             if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
-                /*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
+                name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
                 chrismas_y_offset = 30;
             }
 
@@ -203,20 +203,20 @@ 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) ? 280.0 : 170.0;
+                qreal x_offset = (i == 0) ? 290.0 : 170.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,label_item);
+                QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng);
                 eng_word_item->setFont(_new_font);
                 QRectF rect = eng_word_item->boundingRect();
                 eng_word_item->setDefaultTextColor(font_color);
 
                 eng_word_item->setRotation(i == 0 ? 90 : -90);
-                eng_word_item->setPos(x_offset - rect.height()/2.0, y_offset + sp_y_offset + (rect.width()/2*dir));
+                eng_word_item->setPos(label_item->x() + x_offset - rect.height()/2.0, label_item->y() + y_offset + sp_y_offset + (rect.width()/2*dir));
 
 
-                //scene.addItem(eng_word_item);
+                scene.addItem(eng_word_item);
             }
 
 
@@ -253,7 +253,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
 
 			int chrismas_y_offset = 0;
 			if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
-                /*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
+				name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
 				chrismas_y_offset = 30;
 			}
 

NameCreater/INameCreater.cpp

@@ -177,5 +177,3 @@ int INameCreater::getFontSizebyStr(const QFont& font, int max_font_size,int max_
 
 	return font_size;
 }
-
-

NameCreater/NameCreater.cpp

@@ -33,12 +33,10 @@
 
 //#define FONT_CHT_URL "https://bazaar1688.ddns.net/font/TaiwanPearl-SemiBold.ttf"
 
-#define FONT_JSON_URL "https://namecreater.bazaar1688.duckdns.org/font/fonts.json"
+#define FONT_JSON_URL "https://bazaar1688.ddns.net/font/fonts.json"
 
 //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf"
 
-static CustomLogo* s_custom_logo_widget = nullptr;
-
 NameCreater::NameCreater(QWidget* parent)
 	: QMainWindow(parent)
 {
@@ -251,14 +249,12 @@ void NameCreater::execCreater(QObject* sender, const QString& fileName, const QB
 
 
 void NameCreater::OnClickedCustomLogoBtn() {
-	//QEventLoop loop;
+	QEventLoop loop;
-	if (s_custom_logo_widget == nullptr) {
+	CustomLogo widget(&this->font);
-		s_custom_logo_widget = new CustomLogo(&this->font);
+	widget.show();
-	}
+	connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
-	s_custom_logo_widget->show();
+	loop.exec();
-
+	qDebug() << "exit event loop";
-	//connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
-	//loop.exec();
 
 }
 

NameCreater/NameCreater.h

@@ -25,7 +25,6 @@ private:
   
 	QFont font, font_towel, font_english;
 
-
 	QColor font_color;
 
     QNetworkAccessManager network_mgr;

NameCreater/NameCreater.vcxproj

@@ -57,7 +57,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
     <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets;network</QtModules>
+    <QtModules>core;gui;widgets;network;core5compat</QtModules>
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'" Label="QtSettings">

NameCreater/NewFiveCreater.h

@@ -12,5 +12,8 @@ protected:
 public:
     virtual void generaImageFromCSV(Name_Type_e type, const QString& filename, const QByteArray& filecontent, const QFont& font, const QColor& font_color);
 
+
+
+
 };
 

NameCreater/customlogo.cpp

@@ -329,9 +329,7 @@ QList<NameInfo_t> CustomLogo::getNameByFileContent(Name_Type_e type, const QByte
 {
 	QList<NameInfo_t> nameList;
 
-	QString codec_text = ui->codec_comboBox->currentText();
+	QTextCodec* tc = QTextCodec::codecForName("Big5");
-
-	QTextCodec* tc = QTextCodec::codecForName(codec_text.toStdString().c_str()); // can also using "Utf8" or "Big5" codec
 	QString codec = tc->toUnicode(conetent.data());
 	QTextStream stream(&codec);
 

NameCreater/customlogo.ui

@@ -145,10 +145,10 @@
     <item row="3" column="1">
      <widget class="QSlider" name="y_adjust_slider">
       <property name="minimum">
-       <number>-120</number>
+       <number>-100</number>
       </property>
       <property name="maximum">
-       <number>120</number>
+       <number>100</number>
       </property>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -191,48 +191,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="horizontalLayoutWidget_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>311</width>
-     <height>41</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_2">
-    <item>
-     <widget class="QLabel" name="label">
-      <property name="maximumSize">
-       <size>
-        <width>80</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Codec:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QComboBox" name="codec_comboBox">
-      <item>
-       <property name="text">
-        <string>Big5</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Utf8</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-   </layout>
-  </widget>
  </widget>
  <resources>
   <include location="NameCreater.qrc"/>

NameCreater/def.h

@@ -1,7 +1,7 @@
 #ifndef DEF_H
 #define DEF_H
 
-#define VERSION "v2.10.3"
+#define VERSION "v2.10.0"
 
 
 #endif // DEF_H