Skip to content

Commit

Permalink
release: update V0.2.7
Browse files Browse the repository at this point in the history
Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
  • Loading branch information
QQxiaoming committed Nov 7, 2023
1 parent a36bb8c commit 3c2c5ae
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 17 deletions.
3 changes: 3 additions & 0 deletions TTFviewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ unix:{
include(partform_unix.pri)
}

# 定义版本号路径
TTFVIEWER_VERSION="$$cat(./version.txt)"

###############################################################################
# 定义需要的Qt组件
QT += core gui
Expand Down
9 changes: 4 additions & 5 deletions build_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
###############################################################################
# 定义Qt目录
QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64

# 定义版本号
TTFVIEWER_MAJARVERSION="0"
TTFVIEWER_SUBVERSION="2"
TTFVIEWER_REVISION="6"
###############################################################################


###############################################################################
# 定义版本号
TTFVIEWER_MAJARVERSION=$(< ./version.txt cut -d '.' -f 1)
TTFVIEWER_SUBVERSION=$(< ./version.txt cut -d '.' -f 2)
TTFVIEWER_REVISION=$(< ./version.txt cut -d '.' -f 3)
export PATH=$QT_DIR/bin:$PATH
export LD_LIBRARY_PATH=$QT_DIR/lib:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$QT_DIR/plugins
Expand Down
9 changes: 4 additions & 5 deletions build_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
###############################################################################
# 定义Qt目录
QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64

# 定义版本号
TTFVIEWER_MAJARVERSION="0"
TTFVIEWER_SUBVERSION="2"
TTFVIEWER_REVISION="6"
###############################################################################


###############################################################################
# 定义版本号
TTFVIEWER_MAJARVERSION=$(< ./version.txt cut -d '.' -f 1)
TTFVIEWER_SUBVERSION=$(< ./version.txt cut -d '.' -f 2)
TTFVIEWER_REVISION=$(< ./version.txt cut -d '.' -f 3)
export PATH=$QT_DIR/bin:$PATH
export LD_LIBRARY_PATH=$QT_DIR/lib:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$QT_DIR/plugins
Expand Down
4 changes: 2 additions & 2 deletions build_setup.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ set "QT_DIR=C:/Qt/Qt6.2.0/6.2.0/mingw81_32/bin"
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.6"
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: 定义版本号
set /p TTFVIEWER_VERSION=<version.txt
:: 设置环境变量
set "PATH=%QT_DIR%;%QT_TOOLS_DIR%;%INNO_SETUP_DIR%;%PATH%"
:: 编译
Expand Down
8 changes: 8 additions & 0 deletions lang/ttfviewer_en_US.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>ImgViewer</name>
<message>
<location filename="../src/ImgViewer.cpp" line="248"/>
<source>Save File</source>
<translation></translation>
</message>
</context>
<context>
<name>ImgViewerWindow</name>
<message>
Expand Down
8 changes: 8 additions & 0 deletions lang/ttfviewer_ja_JP.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ja_JP">
<context>
<name>ImgViewer</name>
<message>
<location filename="../src/ImgViewer.cpp" line="248"/>
<source>Save File</source>
<translation>ファイルを保存する</translation>
</message>
</context>
<context>
<name>ImgViewerWindow</name>
<message>
Expand Down
8 changes: 8 additions & 0 deletions lang/ttfviewer_zh_CN.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
<name>ImgViewer</name>
<message>
<location filename="../src/ImgViewer.cpp" line="248"/>
<source>Save File</source>
<translation>保存文件</translation>
</message>
</context>
<context>
<name>ImgViewerWindow</name>
<message>
Expand Down
2 changes: 0 additions & 2 deletions partform_unix.pri
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
###############################################################################
# 定义freetype2 lib路径
FREETPE2_DIR=/home/qqm/Desktop/ttfviewer/depend/freetype
# 定义版本号路径
TTFVIEWER_VERSION=0.2.6
###############################################################################
2 changes: 0 additions & 2 deletions partform_win32.pri
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
###############################################################################
# 定义freetype2 lib路径
FREETPE2_DIR=D:\ttfviewer\depend\freetype
# 定义版本号路径
TTFVIEWER_VERSION=0.2.6
###############################################################################
2 changes: 1 addition & 1 deletion src/ImgViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ void ImgViewer::mouseDoubleClickEvent(QMouseEvent *event) {
int list_index = this->img_list.indexOf(this->currentImg_RGB_list);
QList<ImageDecoder::SvgInfo> img_RGB_list = this->img_list[list_index];
int img_index = img_RGB_list.indexOf(this->currentImg);
QString savefile_name = FileDialog::getSaveFileName( this, "保存文件",
QString savefile_name = FileDialog::getSaveFileName( this, tr("Save File"),
this->filelist[list_index].replace(".ttf","-") +
"0x" + QString::number(this->currentImg.codepoint, 16) +
"-" + QString::number(img_index) + ".svg",
Expand Down
1 change: 1 addition & 0 deletions version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.2.7

0 comments on commit 3c2c5ae

Please sign in to comment.