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 45b0220..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) diff --git a/NameCreater/NameCreater.pro b/NameCreater/NameCreater.pro index ac9f334..d4daa1e 100644 --- a/NameCreater/NameCreater.pro +++ b/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 diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 3f4e85c..9a101ad 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {f917f426-b975-46c9-8edb-fd77a95b6be2} + {4a5c8cc9-7483-402d-a0a2-3701e5257fd0} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -91,16 +91,16 @@ 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 + Desktop Qt 5.15.2 MinGW 64-bit + Desktop Qt 5.15.2 MinGW 64-bit + qt.qt5.5152.win64_mingw81_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 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Debug true @@ -138,8 +138,8 @@ 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 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Release + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Release true @@ -179,8 +179,8 @@ 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 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Profile + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Profile true @@ -237,17 +237,34 @@ true true true + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/_0E/_Private/_Software/namecreater/NameCreater/NameCreater.pro - D:/_0E/_Private/_Software/namecreater/NameCreater/NameCreater.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro false true true false true - D:/_0E/_Private/_Software/namecreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MinGW_64_bit-Debug 1 @@ -259,13 +276,13 @@ Qt 5.15.2 WebAssembly Qt 5.15.2 WebAssembly qt.qt5.5152.wasm_32_kit - 1 + 0 -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 + 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 @@ -303,8 +320,8 @@ 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 + 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 @@ -344,8 +361,8 @@ 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 + 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 @@ -390,15 +407,32 @@ true true true + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + - Launch with emrun - WebAssembly.RunConfiguration.Emrun - + NameCreater + WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro false true false true - firefox + chrome 1 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