diff --git a/CMakeLists.txt b/CMakeLists.txt index 27e5d267c5..443fce853b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DMUSIC_LIBRARY) -set(TTK_VERSION "2.6.6.0") +set(TTK_VERSION "2.6.7.0") # Find includes in the build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/Doxyfile b/Doxyfile index 495771bad8..4920709214 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.6.6.0 +PROJECT_NUMBER = 2.6.7.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 diff --git a/README.md b/README.md index 6244a6829f..15ba55ac5f 100644 --- a/README.md +++ b/README.md @@ -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.6.6.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.6.7.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) diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index 036bbe0c63..5299111199 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKCore" - VALUE "FileVersion", "2.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018" VALUE "ProductName", "TTKCore" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc index 92e23f88b3..575339d1cd 100644 --- a/TTKQrc/TTKQrc.rc +++ b/TTKQrc/TTKQrc.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKUi" - VALUE "FileVersion", "2.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018" VALUE "ProductName", "TTKUi" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc index 5f315d71a9..59625e9be4 100644 --- a/TTKRun/TTKApp/TTKApp.rc +++ b/TTKRun/TTKApp/TTKApp.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_player_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "天天酷音" - VALUE "FileVersion", "2.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "InternalName", "天天酷音.exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018" VALUE "OriginalFilename", "天天酷音.exe" VALUE "ProductName", "天天酷音" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh index 9665a94f15..68efef5b67 100755 --- a/TTKScript/deploy/package.sh +++ b/TTKScript/deploy/package.sh @@ -1,6 +1,6 @@ #!/bin/sh APP="TTKMusicplayer" -APP_VER="2.6.6.0" +APP_VER="2.6.7.0" DEV_PATH="$1" PACK_PATH="ttkmusicplayer" diff --git a/TTKScript/deploy/ttkmusicplayer.appdata.xml b/TTKScript/deploy/ttkmusicplayer.appdata.xml index 17e29fd544..5ceeddd0a8 100644 --- a/TTKScript/deploy/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/ttkmusicplayer.appdata.xml @@ -18,7 +18,7 @@ Greedysky Studio - + diff --git a/TTKScript/deploy/ttkmusicplayer.desktop b/TTKScript/deploy/ttkmusicplayer.desktop index cf7ef7c836..87d2309b73 100644 --- a/TTKScript/deploy/ttkmusicplayer.desktop +++ b/TTKScript/deploy/ttkmusicplayer.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=2.6.6.0 +Version=2.6.7.0 Name=天天酷音 Comment=天天酷音 #Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png diff --git a/TTKScript/time.sh b/TTKScript/time.sh index e7045c7c34..2fa452eabb 100755 --- a/TTKScript/time.sh +++ b/TTKScript/time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -t 201803030303 {} \; +find . -exec touch -c -m -t 201804040404 {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index d15d1b1fb8..fc7d9e58ad 100644 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. #define MyAppNameZh "天天酷音" -#define MyAppVersion "2.6.6.0" +#define MyAppVersion "2.6.7.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (c) 2015 - 2018 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" @@ -58,7 +58,7 @@ Name: "{group}\卸 ; Name: "chinese"; MessagesFile: "_resourcesPath_\ChineseSimp.isl" [PostCompile] -Name: "makeCert.bat";Parameters:"D:\Qt\v2.6.6.0.exe" ;Flags: cmdprompt redirectoutput +Name: "makeCert.bat";Parameters:"D:\Qt\v2.6.7.0.exe" ;Flags: cmdprompt redirectoutput [Code] // for dll diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index 32a3874512..f19735fbb1 100644 --- a/TTKService/TTKService.rc +++ b/TTKService/TTKService.rc @@ -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,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "天天酷音" - VALUE "FileVersion", "2.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "InternalName", "天天酷音.exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018" VALUE "OriginalFilename", "天天酷音.exe" VALUE "ProductName", "天天酷音" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index 8136450f2f..96d5b6ecc9 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKExtras" - VALUE "FileVersion", "2.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018" VALUE "ProductName", "TTKExtras" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index 01e9410d22..a7e80b9344 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -16,5 +16,5 @@ # * with this program; If not, see . # ================================================= -# update time 2018.03.03 -TTKMusicPlayer = 2.6.6.0 +# update time 2018.04.04 +TTKMusicPlayer = 2.6.7.0 diff --git a/musicversion.h b/musicversion.h index 14c451ce8d..8ca279ce19 100644 --- a/musicversion.h +++ b/musicversion.h @@ -105,17 +105,17 @@ * with this program; If not, see . ================================================= */ -//update time 2018.03.03 -#define TTKMUSIC_VERSION_STR "2.6.6.0" -#define TTKMUSIC_VERSION_WSTR L"2.6.6.0" -#define TTKMUSIC_VER_TIME_STR "(2018/03/03)" +//update time 2018.04.04 +#define TTKMUSIC_VERSION_STR "2.6.7.0" +#define TTKMUSIC_VERSION_WSTR L"2.6.7.0" +#define TTKMUSIC_VER_TIME_STR "(2018/04/04)" #define TTKMUSIC_MAJOR_VERSION 2 #define TTKMUSIC_MIDLE_VERSION 6 -#define TTKMUSIC_MINOR_VERSION 6 +#define TTKMUSIC_MINOR_VERSION 7 #define TTKMUSIC_PATCH_VERSION 0 -#define TTKMUSIC_VERSION 0x02660 +#define TTKMUSIC_VERSION 0x02670 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))