diff --git a/NameCreater/HKHolderCreater.cpp b/NameCreater/HKHolderCreater.cpp
index fe70da8..21d26db 100644
--- a/NameCreater/HKHolderCreater.cpp
+++ b/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";
diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp
index 5f14d8a..c908e7b 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.2.0"
+#define VERSION "v2.2.1"
NameCreater::NameCreater(QWidget *parent)
@@ -131,9 +131,9 @@ void NameCreater::OnClickedReadBtn() {
b.generaImageFromCSV(Name_Type_e::Name_eng, fileName,fileContent,this->font, this->font_color);
}
if (sender == ui.handkerchief_btn) {
- font_color = QColor(0, 0, 0);
- font.setPixelSize(55);
- HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
+ QFont newFont(font);
+ newFont.setPixelSize(55);
+ HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, this->font_color);
}
diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user
index 3f4e85c..9dbaca1 100644
--- a/NameCreater/NameCreater.pro.user
+++ b/NameCreater/NameCreater.pro.user
@@ -1,418 +1,412 @@
-
-
-
-
-
- EnvironmentId
- {f917f426-b975-46c9-8edb-fd77a95b6be2}
-
-
- ProjectExplorer.Project.ActiveTarget
- 0
-
-
- ProjectExplorer.Project.EditorSettings
-
- true
- false
- true
-
- Cpp
-
- CppGlobal
-
-
-
- QmlJS
-
- QmlJSGlobal
-
-
- 2
- UTF-8
- false
- 4
- false
- 80
- true
- true
- 1
- false
- true
- false
- 0
- true
- true
- 0
- 8
- true
- false
- 1
- true
- true
- true
- *.md, *.MD, Makefile
- false
- true
-
-
-
- ProjectExplorer.Project.PluginSettings
-
-
- true
- false
- true
- true
- true
- true
-
-
- 0
- true
-
- -fno-delayed-template-parsing
-
- true
- Builtin.BuildSystem
-
- true
- true
- Builtin.DefaultTidyAndClazy
- 4
-
-
-
- true
-
-
-
-
- ProjectExplorer.Project.Target.0
-
- Desktop
- Desktop Qt 5.15.2 MSVC2019 64bit
- Desktop Qt 5.15.2 MSVC2019 64bit
- qt.qt5.5152.win64_msvc2019_64_kit
- 0
- 0
- 0
-
- 0
- D:\_0E\_Private\_Software\namecreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug
- D:/_0E/_Private/_Software/namecreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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:\_0E\_Private\_Software\namecreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Release
- D:/_0E/_Private/_Software/namecreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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:\_0E\_Private\_Software\namecreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile
- D:/_0E/_Private/_Software/namecreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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
- Deploy
- Deploy
- ProjectExplorer.BuildSteps.Deploy
-
- 1
-
- false
- ProjectExplorer.DefaultDeployConfiguration
-
- 1
-
- true
- true
- true
-
- 2
-
- Qt4ProjectManager.Qt4RunConfiguration:D:/_0E/_Private/_Software/namecreater/NameCreater/NameCreater.pro
- D:/_0E/_Private/_Software/namecreater/NameCreater/NameCreater.pro
- false
- true
- true
- false
- true
- D:/_0E/_Private/_Software/namecreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug
-
- 1
-
-
-
- ProjectExplorer.Project.Target.1
-
- WebAssemblyDeviceType
- Qt 5.15.2 WebAssembly
- Qt 5.15.2 WebAssembly
- qt.qt5.5152.wasm_32_kit
- 1
- -1
- 0
-
- 0
- D:\_0E\_Private\_Software\namecreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug
- D:/_0E/_Private/_Software/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:\_0E\_Private\_Software\namecreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release
- D:/_0E/_Private/_Software/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:\_0E\_Private\_Software\namecreater\build-NameCreater-Qt_5_15_2_WebAssembly-Profile
- D:/_0E/_Private/_Software/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
-
- Launch with emrun
- WebAssembly.RunConfiguration.Emrun
-
- false
- true
- false
- true
- firefox
-
- 1
-
-
-
- ProjectExplorer.Project.TargetCount
- 2
-
-
- ProjectExplorer.Project.Updater.FileVersion
- 22
-
-
- Version
- 22
-
-
+
+
+
+
+
+ EnvironmentId
+ {fcddcb90-0e4f-4f41-99d2-8ce9f168d92c}
+
+
+ ProjectExplorer.Project.ActiveTarget
+ 0
+
+
+ ProjectExplorer.Project.EditorSettings
+
+ true
+ false
+ true
+
+ Cpp
+
+ CppGlobal
+
+
+
+ QmlJS
+
+ QmlJSGlobal
+
+
+ 2
+ UTF-8
+ false
+ 4
+ false
+ 80
+ true
+ true
+ 1
+ false
+ true
+ false
+ 0
+ true
+ true
+ 0
+ 8
+ true
+ false
+ 1
+ true
+ true
+ true
+ *.md, *.MD, Makefile
+ false
+ true
+ true
+
+
+
+ ProjectExplorer.Project.PluginSettings
+
+
+ true
+ false
+ true
+ true
+ true
+ true
+
+
+ 0
+ true
+
+ true
+ true
+ Builtin.DefaultTidyAndClazy
+ 4
+ true
+
+
+
+ true
+
+
+
+
+ ProjectExplorer.Project.Target.0
+
+ Desktop
+ Desktop Qt 5.15.2 clang 64bit
+ Desktop Qt 5.15.2 clang 64bit
+ qt.qt5.5152.clang_64_kit
+ 0
+ 0
+ 0
+
+ 0
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-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
+
+
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Release
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-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
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Profile
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-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
+ Deploy
+ Deploy
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+
+ false
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+ true
+ true
+ true
+
+ 2
+
+ false
+ Qt4ProjectManager.Qt4RunConfiguration:/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro
+ /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro
+ true
+ true
+ true
+ /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug/NameCreater.app/Contents/MacOS
+
+ 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
+ /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug
+ /Users/shouchih/dev/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
+
+
+ /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release
+ /Users/shouchih/dev/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
+ /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile
+ /Users/shouchih/dev/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.Emrun/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro
+ /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro
+ true
+ true
+ chrome
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 2
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 22
+
+
+ Version
+ 22
+
+
diff --git a/NameCreater/NameCreater.qrc b/NameCreater/NameCreater.qrc
index 5458861..2ad4266 100644
--- a/NameCreater/NameCreater.qrc
+++ b/NameCreater/NameCreater.qrc
@@ -68,13 +68,13 @@
resource/five/ng_5.jpg
_exp/FontsFree-Net-Acumin-Pro-Semibold.ttf
resource/hk_holder/b.jpg
- resource/hk_holder/b2.jpg
resource/hk_holder/g.jpg
- resource/hk_holder/g2.jpg
- resource/hk_holder/o.jpg
resource/hk_holder/p.jpg
resource/hk_holder/r.jpg
resource/hk_holder/sample.jpg
resource/hk_holder/y.jpg
+ resource/hk_holder/m.jpg
+ resource/hk_holder/st.jpg
+ resource/hk_holder/w.jpg
diff --git a/NameCreater/_exp/手帕夾範例.csv b/NameCreater/_exp/手帕夾範例.csv
index e401c42..ba3839e 100644
--- a/NameCreater/_exp/手帕夾範例.csv
+++ b/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
diff --git a/NameCreater/resource/hk_holder/g.jpg b/NameCreater/resource/hk_holder/g.jpg
index 0db9473..459998c 100644
Binary files a/NameCreater/resource/hk_holder/g.jpg and b/NameCreater/resource/hk_holder/g.jpg differ
diff --git a/NameCreater/resource/hk_holder/g2.jpg b/NameCreater/resource/hk_holder/g2.jpg
deleted file mode 100644
index 459998c..0000000
Binary files a/NameCreater/resource/hk_holder/g2.jpg and /dev/null differ
diff --git a/NameCreater/resource/hk_holder/b2.jpg b/NameCreater/resource/hk_holder/m.jpg
similarity index 100%
rename from NameCreater/resource/hk_holder/b2.jpg
rename to NameCreater/resource/hk_holder/m.jpg
diff --git a/NameCreater/resource/hk_holder/st.jpg b/NameCreater/resource/hk_holder/st.jpg
new file mode 100644
index 0000000..0db9473
Binary files /dev/null and b/NameCreater/resource/hk_holder/st.jpg differ
diff --git a/NameCreater/resource/hk_holder/o.jpg b/NameCreater/resource/hk_holder/w.jpg
similarity index 100%
rename from NameCreater/resource/hk_holder/o.jpg
rename to NameCreater/resource/hk_holder/w.jpg