Skip to content

Commit

Permalink
Release on 2.8.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Jan 11, 2019
1 parent d57fdf7 commit 33b38a5
Show file tree
Hide file tree
Showing 27 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)

add_definitions(-DMUSIC_LIBRARY)

set(TTK_VERSION "2.7.0.0")
set(TTK_VERSION "2.8.0.0")

# Find includes in the build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = TTKMusicplayer
PROJECT_NUMBER = 2.7.0.0
PROJECT_NUMBER = 2.8.0.0
PROJECT_BRIEF = "TTKMusicPlayer that imitation Kugou music, the music player use of qmmp core library based on Qt for windows and linux"
PROJECT_LOGO = TTKResource/lb_player_logo.png
OUTPUT_DIRECTORY = TTKDocs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TTKMusicPlayer
![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-2.7.0.0-blue.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-2.8.0.0-blue.svg?style=flat-square)
![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square)

![LOGO](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true)
Expand Down
2 changes: 1 addition & 1 deletion TTKLanguage/cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3577,7 +3577,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../TTKModule/TTKWidget/musicUiKits/musicWidgetKits/musicmessageaboutdialog.ui" line="106"/>
<source>Mail:[email protected] [email protected]
Copyright© 2015-2018 Greedysky All Rights Reserved
Copyright© 2015-2019 Greedysky All Rights Reserved
本软件仅供学习交流,不可用于商业用途,否则后果自负。</source>
<translation type="unfinished"></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion TTKLanguage/cn_c.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3577,7 +3577,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../TTKModule/TTKWidget/musicUiKits/musicWidgetKits/musicmessageaboutdialog.ui" line="106"/>
<source>Mail:[email protected] [email protected]
Copyright© 2015-2018 Greedysky All Rights Reserved
Copyright© 2015-2019 Greedysky All Rights Reserved
本软件仅供学习交流,不可用于商业用途,否则后果自负。</source>
<translation type="unfinished"></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion TTKLanguage/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3581,7 +3581,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../TTKModule/TTKWidget/musicUiKits/musicWidgetKits/musicmessageaboutdialog.ui" line="106"/>
<source>Mail:[email protected] [email protected]
Copyright© 2015-2018 Greedysky All Rights Reserved
Copyright© 2015-2019 Greedysky All Rights Reserved
本软件仅供学习交流,不可用于商业用途,否则后果自负。</source>
<translation type="unfinished"></translation>
</message>
Expand Down
10 changes: 5 additions & 5 deletions TTKModule/TTKCore.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,0,0
PRODUCTVERSION 2,7,0,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKCore"
VALUE "FileVersion", "2.7.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "FileVersion", "2.8.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKCore"
VALUE "ProductVersion", "2.7.0.0"
VALUE "ProductVersion", "2.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ QLabel{background:transparent;}</string>
</property>
<property name="text">
<string>Mail:[email protected] [email protected]
Copyright© 2015-2018 Greedysky All Rights Reserved
Copyright© 2015-2019 Greedysky All Rights Reserved
本软件仅供学习交流,不可用于商业用途,否则后果自负。</string>
</property>
</widget>
Expand Down
10 changes: 5 additions & 5 deletions TTKQrc/TTKQrc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,0,0
PRODUCTVERSION 2,7,0,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKUi"
VALUE "FileVersion", "2.7.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "FileVersion", "2.8.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.7.0.0"
VALUE "ProductVersion", "2.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKResource/A_extras/TTKRoutine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then
fi
LD_LIBRARY_PATH=$dirpath

export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.7.0.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.8.0.0:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH

$dirpath/$appname "$@"
10 changes: 5 additions & 5 deletions TTKRun/TTKApp/TTKApp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_player_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,0,0
PRODUCTVERSION 2,7,0,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.7.0.0"
VALUE "FileVersion", "2.8.0.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.7.0.0"
VALUE "ProductVersion", "2.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKRun/TTKConsole/TTKConsole.rc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BEGIN
VALUE "FileDescription", "����̨"
VALUE "FileVersion", "1.0.0.0"
VALUE "InternalName", "����̨.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2019"
VALUE "OriginalFilename", "����̨.exe"
VALUE "ProductName", "����̨"
VALUE "ProductVersion", "1.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion TTKRun/TTKInit/TTKInit.rc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BEGIN
VALUE "FileDescription", "��ʼ��"
VALUE "FileVersion", "1.0.0.0"
VALUE "InternalName", "��ʼ��.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "OriginalFilename", "��ʼ��.exe"
VALUE "ProductName", "��ʼ��"
VALUE "ProductVersion", "1.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/deploy/package.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
APP="TTKMusicplayer"
APP_VER="2.7.0.0"
APP_VER="2.8.0.0"

DEV_PATH="$1"
PACK_PATH="ttkmusicplayer"
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/deploy/ttkmusicplayer.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<developer_name>Greedysky Studio</developer_name>

<releases>
<release version="2.7.0.0" date="2018-07-01">
<release version="2.8.0.0" date="2019-01-11">
</release>
</releases>
</component>
2 changes: 1 addition & 1 deletion TTKScript/deploy/ttkmusicplayer.desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Version=2.7.0.0
Version=2.8.0.0
Name=ÌìÌì¿áÒô
Comment=ÌìÌì¿áÒô
#Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/resource/license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Greedysky
����������ѧϰ����������������ҵ��;���������Ը�
Mail:[email protected]

Copyright(C) 2015-2018 Greedysky All Rights Reserved
Copyright(C) 2015-2019 Greedysky All Rights Reserved
2 changes: 1 addition & 1 deletion TTKScript/time.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
find . -exec touch -c -m -t 201807010701 {} \;
find . -exec touch -c -m -t 201901110111 {} \;
4 changes: 2 additions & 2 deletions TTKScript/ttk.iss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Script generated by the Inno Setup Script Wizard.

#define MyAppNameZh "天天酷音"
#define MyAppVersion "2.7.0.0"
#define MyAppVersion "2.8.0.0"
#define MyAppPublisher "Greedysky Studio"
#define MyAppCopyright "Copyright (c) 2015 - 2019 Greedysky Studio"
#define MyAppURL "http://download.csdn.net/album/detail/3094"
Expand Down Expand Up @@ -58,7 +58,7 @@ Name: "{group}\ж
; Name: "chinese"; MessagesFile: "_resourcesPath_\ChineseSimp.isl"

[PostCompile]
Name: "makeCert.bat";Parameters:"D:\Qt\v2.7.0.0.exe" ;Flags: cmdprompt redirectoutput
Name: "makeCert.bat";Parameters:"D:\Qt\v2.8.0.0.exe" ;Flags: cmdprompt redirectoutput

[Code]
// for dll
Expand Down
10 changes: 5 additions & 5 deletions TTKService/TTKService.rc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_player_logo
IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,0,0
PRODUCTVERSION 2,7,0,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -28,12 +28,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.7.0.0"
VALUE "FileVersion", "2.8.0.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.7.0.0"
VALUE "ProductVersion", "2.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKThirdParty/TTKDumper/TTKDumper.rc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKDumper"
VALUE "FileVersion", "1.0.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKDumper"
VALUE "ProductVersion", "1.0.0.0"
END
Expand Down
10 changes: 5 additions & 5 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,0,0
PRODUCTVERSION 2,7,0,0
FILEVERSION 2,8,0,0
PRODUCTVERSION 2,8,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKExtras"
VALUE "FileVersion", "2.7.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "FileVersion", "2.8.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.7.0.0"
VALUE "ProductVersion", "2.8.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKThirdParty/TTKWatcher/TTKWatcher.rc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKWatcher"
VALUE "FileVersion", "2.1.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKWatcher"
VALUE "ProductVersion", "2.1.0.0"
END
Expand Down
2 changes: 1 addition & 1 deletion TTKThirdParty/Zlib/ttkzip/ttkzip.rc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKZip"
VALUE "FileVersion", "1.0.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "TTKZip"
VALUE "ProductVersion", "1.0.0.0"
END
Expand Down
2 changes: 1 addition & 1 deletion TTKThirdParty/Zlib/zlib/zlib.rc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "zlib"
VALUE "FileVersion", "1.2.11.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019"
VALUE "ProductName", "zlib"
VALUE "ProductVersion", "1.2.11.0"
END
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# * with this program; If not, see <http://www.gnu.org/licenses/>.
# =================================================

# update time 2018.07.01
TTKMusicPlayer = 2.7.0.0
# update time 2019.01.11
TTKMusicPlayer = 2.8.0.0
12 changes: 6 additions & 6 deletions musicversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
================================================= */

//update time 2018.07.01
#define TTKMUSIC_VERSION_STR "2.7.0.0"
#define TTKMUSIC_VERSION_WSTR L"2.7.0.0"
#define TTKMUSIC_VER_TIME_STR "(2018/07/01)"
//update time 2019.01.11
#define TTKMUSIC_VERSION_STR "2.8.0.0"
#define TTKMUSIC_VERSION_WSTR L"2.8.0.0"
#define TTKMUSIC_VER_TIME_STR "(2019/01/11)"

#define TTKMUSIC_MAJOR_VERSION 2
#define TTKMUSIC_MIDLE_VERSION 7
#define TTKMUSIC_MIDLE_VERSION 8
#define TTKMUSIC_MINOR_VERSION 0
#define TTKMUSIC_PATCH_VERSION 0

#define TTKMUSIC_VERSION 0x02700
#define TTKMUSIC_VERSION 0x02800

#define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))

Expand Down

0 comments on commit 33b38a5

Please sign in to comment.