Merge branch 'webassembly_birthday' of https://gitlab.com/portfolio91/namecreater into webassembly_birthday

# Conflicts:
#	NameCreater/NameCreater.cpp

.gitignore

@@ -5,3 +5,4 @@
 /*.db
 /_bin
 /web_build
+/buildwed

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();

NameCreater/NameCreater.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>977</width>
-    <height>716</height>
+    <width>532</width>
+    <height>458</height>
    </rect>
   </property>
   <property name="font">
@@ -47,8 +47,8 @@ background-color: rgb(0, 0, 0);
    <widget class="QPushButton" name="openfile_btn">
     <property name="geometry">
      <rect>
-      <x>70</x>
-      <y>50</y>
+      <x>80</x>
+      <y>100</y>
       <width>181</width>
       <height>161</height>
      </rect>
@@ -57,13 +57,71 @@ background-color: rgb(0, 0, 0);
      <string>Open File</string>
     </property>
    </widget>
+   <widget class="QLabel" name="tital_label">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>20</y>
+      <width>261</width>
+      <height>71</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Yu Gothic UI</family>
+      <pointsize>20</pointsize>
+      <weight>50</weight>
+      <italic>false</italic>
+      <bold>false</bold>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: rgb(255, 255, 255);
+</string>
+    </property>
+    <property name="text">
+     <string>五入組拆成單入產生器</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
+   <widget class="QLabel" name="version_label">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>60</y>
+      <width>261</width>
+      <height>41</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Yu Gothic UI</family>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <italic>false</italic>
+      <bold>false</bold>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: rgb(255, 255, 255);
+</string>
+    </property>
+    <property name="text">
+     <string>五入組拆成單入產生器</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>977</width>
+     <width>532</width>
      <height>21</height>
     </rect>
    </property>

NameCreater/_exp/name.csv

@@ -1,13 +1,26 @@
 name_1,bg_type
 ｦ网pｨF,1
 ｮL､p,2
-吳苡需,y
-尹小,y
-艾小,r
+吳苡需,3
+尹小,4
+艾小,5
 ｮL､p,g
 ｧdﾐw,b
 ､ｨ､p,y
 ｦ网p,r
 ｮL､p,g
-艾小,2
-夏小天,1
+艾小,6
+夏小天,7
+艾小沙,8
+夏小,9
+吳苡需,10
+陳守志,11
+陳宣愉,12
+吳佳鈴,13
+陳守志,14
+陳宣愉,15
+吳佳鈴,16
+陳守志,17
+陳宣愉,18
+吳佳鈴,19
+艾小沙,20