From 8a80d520cd51a52c78ceaaa9b34c3bc5ae84229a Mon Sep 17 00:00:00 2001
From: xiaoming <2014500726@smail.xtu.edu.cn>
Date: Tue, 10 Oct 2023 09:55:07 +0800
Subject: [PATCH] src:fixed configuration retention error caused by
localization multi-language issues
Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
---
build_deb.sh | 2 +-
build_dmg.sh | 2 +-
build_setup.bat | 2 +-
lang/ttfviewer_en_US.ts | 16 +++-------------
lang/ttfviewer_ja_JP.ts | 14 ++++----------
lang/ttfviewer_zh_CN.ts | 14 ++++----------
partform_unix.pri | 2 +-
partform_win32.pri | 2 +-
src/UI_TTFviewer.ui | 4 ++--
9 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/build_deb.sh b/build_deb.sh
index 029e0d3..9e8028a 100755
--- a/build_deb.sh
+++ b/build_deb.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
# 定义版本号
TTFVIEWER_MAJARVERSION="0"
TTFVIEWER_SUBVERSION="2"
-TTFVIEWER_REVISION="5"
+TTFVIEWER_REVISION="6"
###############################################################################
diff --git a/build_dmg.sh b/build_dmg.sh
index 439a876..71ba542 100755
--- a/build_dmg.sh
+++ b/build_dmg.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
# 定义版本号
TTFVIEWER_MAJARVERSION="0"
TTFVIEWER_SUBVERSION="2"
-TTFVIEWER_REVISION="5"
+TTFVIEWER_REVISION="6"
###############################################################################
diff --git a/build_setup.bat b/build_setup.bat
index f879693..2977824 100644
--- a/build_setup.bat
+++ b/build_setup.bat
@@ -7,7 +7,7 @@ set "QT_TOOLS_DIR=C:/Qt/Qt6.2.0/Tools/mingw810_32/bin"
:: 定义Inno Setup目录
set "INNO_SETUP_DIR=C:/Program Files (x86)/Inno Setup 6"
:: 定义版本号
-set "TTFVIEWER_VERSION=0.2.5"
+set "TTFVIEWER_VERSION=0.2.6"
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/lang/ttfviewer_en_US.ts b/lang/ttfviewer_en_US.ts
index e8e3334..bcfbd8a 100644
--- a/lang/ttfviewer_en_US.ts
+++ b/lang/ttfviewer_en_US.ts
@@ -26,16 +26,6 @@
TTF Format
-
-
- ttf
-
-
-
-
- ttf_verbose
-
-
<html><head/><body><p align="center">Width</p></body></html>
@@ -73,7 +63,7 @@
-
+
About
@@ -83,7 +73,7 @@
-
+
1.Select parameters on the main interface.
2.Click Open File or Folder to parse the image data and display the image.
3.Used in the image display interface
@@ -95,7 +85,7 @@
-
+
<p>Version</p><p> %1</p><p>Commit</p><p> %2</p><p>Author</p><p> qiaoqm@aliyun.com</p><p>Website</p><p> <a href='https://github.com/QQxiaoming/TTFviewer'>https://github.com/QQxiaoming</p><p> <a href='https://gitee.com/QQxiaoming/TTFviewer'>https://gitee.com/QQxiaoming</a></p>
diff --git a/lang/ttfviewer_ja_JP.ts b/lang/ttfviewer_ja_JP.ts
index 0f0e21e..fd9e550 100644
--- a/lang/ttfviewer_ja_JP.ts
+++ b/lang/ttfviewer_ja_JP.ts
@@ -27,14 +27,8 @@
TTF形式
-
- ttf
-
-
-
-
ttf_verbose
- ttf アノテーション情報を含む
+ ttf アノテーション情報を含む
@@ -73,7 +67,7 @@
-
+
About
について
@@ -83,7 +77,7 @@
Qtについて
-
+
1.Select parameters on the main interface.
2.Click Open File or Folder to parse the image data and display the image.
3.Used in the image display interface
@@ -102,7 +96,7 @@
- 中クリックすると、画像の元のサイズが表示されます。
-
+
<p>Version</p><p> %1</p><p>Commit</p><p> %2</p><p>Author</p><p> qiaoqm@aliyun.com</p><p>Website</p><p> <a href='https://github.com/QQxiaoming/TTFviewer'>https://github.com/QQxiaoming</p><p> <a href='https://gitee.com/QQxiaoming/TTFviewer'>https://gitee.com/QQxiaoming</a></p>
<p>バージョン</p><p> %1</p><p>コミット</p><p> %2</p><p>開発者</p><p> qiaoqm@aliyun.com</p><p>ウェブサイト</p><p> <a href='https://github.com/QQxiaoming/TTFviewer'>https://github.com/QQxiaoming</p><p> <a href='https://gitee.com/QQxiaoming/TTFviewer'>https://gitee.com/QQxiaoming</a></p>
diff --git a/lang/ttfviewer_zh_CN.ts b/lang/ttfviewer_zh_CN.ts
index 00610e4..58d35af 100644
--- a/lang/ttfviewer_zh_CN.ts
+++ b/lang/ttfviewer_zh_CN.ts
@@ -27,14 +27,8 @@
TTF格式
-
- ttf
-
-
-
-
ttf_verbose
- ttf 带标注信息
+ ttf 带标注信息
@@ -73,7 +67,7 @@
-
+
About
关于
@@ -83,7 +77,7 @@
关于Qt
-
+
1.Select parameters on the main interface.
2.Click Open File or Folder to parse the image data and display the image.
3.Used in the image display interface
@@ -102,7 +96,7 @@
- 单击鼠标中键可显示图像的原始尺寸。
-
+
<p>Version</p><p> %1</p><p>Commit</p><p> %2</p><p>Author</p><p> qiaoqm@aliyun.com</p><p>Website</p><p> <a href='https://github.com/QQxiaoming/TTFviewer'>https://github.com/QQxiaoming</p><p> <a href='https://gitee.com/QQxiaoming/TTFviewer'>https://gitee.com/QQxiaoming</a></p>
<p>版本</p><p> %1</p><p>提交</p><p> %2</p><p>作者</p><p> qiaoqm@aliyun.com</p><p>主页</p><p> <a href='https://github.com/QQxiaoming/TTFviewer'>https://github.com/QQxiaoming</p><p> <a href='https://gitee.com/QQxiaoming/TTFviewer'>https://gitee.com/QQxiaoming</a></p>
diff --git a/partform_unix.pri b/partform_unix.pri
index aaf0a1b..97202dd 100644
--- a/partform_unix.pri
+++ b/partform_unix.pri
@@ -2,5 +2,5 @@
# 定义freetype2 lib路径
FREETPE2_DIR=/home/qqm/Desktop/ttfviewer/depend/freetype
# 定义版本号路径
-TTFVIEWER_VERSION=0.2.5
+TTFVIEWER_VERSION=0.2.6
###############################################################################
diff --git a/partform_win32.pri b/partform_win32.pri
index f7c8ef1..7b3ae5d 100644
--- a/partform_win32.pri
+++ b/partform_win32.pri
@@ -2,5 +2,5 @@
# 定义freetype2 lib路径
FREETPE2_DIR=D:\ttfviewer\depend\freetype
# 定义版本号路径
-TTFVIEWER_VERSION=0.2.5
+TTFVIEWER_VERSION=0.2.6
###############################################################################
diff --git a/src/UI_TTFviewer.ui b/src/UI_TTFviewer.ui
index d7ac598..19e6ee2 100644
--- a/src/UI_TTFviewer.ui
+++ b/src/UI_TTFviewer.ui
@@ -82,12 +82,12 @@
-
- ttf
+ ttf
-
- ttf_verbose
+ ttf_verbose