Merge branch 'master-webassembly' of gitlab.com:portfolio91/namecreater into master-webassembly

# Conflicts:
#	NameCreater/NameCreater.pro.user

NameCreater/HKHolderCreater.cpp

@@ -27,10 +27,10 @@ static QPoint NAME_OFFSET_REVERSE_START = QPoint(125, 713);
 HKHolderCreater::HKHolderCreater() : INameCreater()
 {
 	label_bg_map["b"] = ":/NameCreater/resource/hk_holder/b.jpg";
-	label_bg_map["b2"] = ":/NameCreater/resource/hk_holder/b2.jpg";
+    label_bg_map["m"] = ":/NameCreater/resource/hk_holder/m.jpg";
 	label_bg_map["g"] = ":/NameCreater/resource/hk_holder/g.jpg";
-	label_bg_map["g2"] = ":/NameCreater/resource/hk_holder/g2.jpg";
-	label_bg_map["o"] = ":/NameCreater/resource/hk_holder/o.jpg";
+    label_bg_map["st"] = ":/NameCreater/resource/hk_holder/st.jpg";
+    label_bg_map["w"] = ":/NameCreater/resource/hk_holder/w.jpg";
 	label_bg_map["p"] = ":/NameCreater/resource/hk_holder/p.jpg";
 	label_bg_map["r"] = ":/NameCreater/resource/hk_holder/r.jpg";
 	label_bg_map["y"] = ":/NameCreater/resource/hk_holder/y.jpg";

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.2.0"
+#define VERSION "v2.2.1"
 
 
 NameCreater::NameCreater(QWidget *parent)

NameCreater/NameCreater.pro

@@ -17,6 +17,6 @@ qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864
+#QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864
 
 

NameCreater/NameCreater.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 11.0.0, 2023-07-30T20:09:12. -->
+<!-- Written by QtCreator 11.0.0, 2023-07-30T20:17:25. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -387,13 +387,12 @@
     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
     <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">NameCreater</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">WebAssembly.RunConfiguration.Emrun/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="WASM.WebBrowserSelectionAspect.Browser">chrome</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

NameCreater/NameCreater.qrc

@@ -68,13 +68,13 @@
         <file>resource/five/ng_5.jpg</file>
         <file>_exp/FontsFree-Net-Acumin-Pro-Semibold.ttf</file>
         <file>resource/hk_holder/b.jpg</file>
-        <file>resource/hk_holder/b2.jpg</file>
         <file>resource/hk_holder/g.jpg</file>
-        <file>resource/hk_holder/g2.jpg</file>
-        <file>resource/hk_holder/o.jpg</file>
         <file>resource/hk_holder/p.jpg</file>
         <file>resource/hk_holder/r.jpg</file>
         <file>resource/hk_holder/sample.jpg</file>
         <file>resource/hk_holder/y.jpg</file>
+        <file>resource/hk_holder/m.jpg</file>
+        <file>resource/hk_holder/st.jpg</file>
+        <file>resource/hk_holder/w.jpg</file>
     </qresource>
 </RCC>

NameCreater/_exp/手帕夾範例.csv

@@ -1,21 +1,21 @@
 name,bg_type
 §d¦t°a,b
-Á¤_¹ä,b2
+Á¤_¹ä,m
 Á¤_¹ä,g
-Á¤_¹ä,g2
-Á¤_¹ä,o
+Á¤_¹ä,w
+Á¤_¹ä,w
 ¸â¨°ºÓ,p
 ¸â¨°ºÓ,r
 ¸â¨°ºÓ,y
 ¸â¨°ºÓ,b
-¸â¨°ºÓ,b2
+¸â¨°ºÓ,p
 ¸â¨°ºÓ,g
-³¯§Ó,g2
-³¯¦u§Ó,o
+³¯§Ó,st
+³¯¦u§Ó,r
 ³¯¦u§Ó,p
 ³¯§Ó,r
 §d¨Î¹a,y
 §d¨Î¹a,y
 §d¹a,y
 §d¹a,p
-§d¹a,g2
+§d¹a,st