diff --git a/CMakeLists.txt b/CMakeLists.txt index 7704d0ffa..d378c8c9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DTTK_LIBRARY) add_definitions(-DQMMP_LIBRARY) -set(TTK_MAJOR_VERSION "2.13.4") +set(TTK_MAJOR_VERSION "2.14.0") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/ChangeLog b/ChangeLog index c188e90a8..143dd1714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -283,7 +283,7 @@ v2.13.4.0 Final 2021.01.09 优化核心模块。 Bug修复。 -v2.14.0.0 Final 2021.XX.XX +v2.14.0.0 Final 2021.02.27 支持删除缓存。 优化网络模块。 移除部分组件。 diff --git a/Doxyfile b/Doxyfile index 49f315c09..7e219b6b0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.13.4.0 +PROJECT_NUMBER = 2.14.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_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/README.md b/README.md index 190bd0935..673c48147 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![Version](https://img.shields.io/badge/Version-2.13.4.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.14.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) diff --git a/README_cn.md b/README_cn.md index 1cb032fd8..b4fc26c1a 100644 --- a/README_cn.md +++ b/README_cn.md @@ -2,7 +2,7 @@ [英文 English](./README.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.13.4.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.14.0.0-blue.svg?style=flat-square) ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽标](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_tc.md b/README_tc.md index ef544203d..0c9601698 100644 --- a/README_tc.md +++ b/README_tc.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [英文 English](./README.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.13.4.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.14.0.0-blue.svg?style=flat-square) ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽標](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/TTKConfig/TTKConfig.rc b/TTKConfig/TTKConfig.rc index b07d5ca60..a299d887b 100644 --- a/TTKConfig/TTKConfig.rc +++ b/TTKConfig/TTKConfig.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,10 +27,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKConfig" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKConfig" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index b0702b802..1a0143f8a 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKCore" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKCore" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKResource/A_extras/TTKRoutine.sh b/TTKResource/A_extras/TTKRoutine.sh index 7b2af6e05..0e2f43913 100755 --- a/TTKResource/A_extras/TTKRoutine.sh +++ b/TTKResource/A_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.13.4.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.14.0.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc index c2c8eba58..7efbfacb7 100644 --- a/TTKRun/TTKApp/TTKApp.rc +++ b/TTKRun/TTKApp/TTKApp.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "InternalName", ".exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "OriginalFilename", ".exe" VALUE "ProductName", "" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh index 54cd27270..68da3baf3 100755 --- a/TTKScript/deploy/package.sh +++ b/TTKScript/deploy/package.sh @@ -8,7 +8,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=2.13.4.0 +Version=2.14.0.0 Name=天天酷音 Comment=天天酷音 Icon=$iconpath diff --git a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml index 522127536..d710a9788 100644 --- a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -18,7 +18,7 @@ Greedysky Studio - + diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh index 735764c4d..faa209535 100755 --- a/TTKScript/linux_time.sh +++ b/TTKScript/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2021-01-09 12:00" {} \; +find . -exec touch -c -m -d "2021-02-27 12:00" {} \; diff --git a/TTKScript/make_auc.bat b/TTKScript/make_auc.bat index 75a3b5551..36baf89b4 100644 --- a/TTKScript/make_auc.bat +++ b/TTKScript/make_auc.bat @@ -1,4 +1,4 @@ "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKMusicPlayer.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TKConsole.exe" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.13.4.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.14.0.0/TTKService.exe" \ No newline at end of file diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index 86c092fbd..a569ba344 100755 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "2.13.4.0" +#define MyAppVersion "2.14.0.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (c) 2015 - 2021 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index 190900d37..0ff114094 100644 --- a/TTKService/TTKService.rc +++ b/TTKService/TTKService.rc @@ -8,8 +8,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ic IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "InternalName", ".exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "OriginalFilename", ".exe" VALUE "ProductName", "" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index 0dd5a51dd..491fbcf25 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKExtras" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKExtras" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKUi/TTKUi.rc b/TTKUi/TTKUi.rc index 84ef22434..6dba2b788 100644 --- a/TTKUi/TTKUi.rc +++ b/TTKUi/TTKUi.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,4,0 - PRODUCTVERSION 2,13,4,0 + FILEVERSION 2,14,0,0 + PRODUCTVERSION 2,14,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKUi" - VALUE "FileVersion", "2.13.4.0" + VALUE "FileVersion", "2.14.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKUi" - VALUE "ProductVersion", "2.13.4.0" + VALUE "ProductVersion", "2.14.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index 67b75da7f..90e375285 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2021.01.09 -TTKMusicPlayer = 2.13.4.0 +# update time 2021.02.27 +TTKMusicPlayer = 2.14.0.0 diff --git a/ttkversion.h b/ttkversion.h index 59f50eb20..ec5dbe0b4 100644 --- a/ttkversion.h +++ b/ttkversion.h @@ -132,17 +132,17 @@ * with this program; If not, see . ================================================= */ -//update time 2021.01.09 -#define TTKMUSIC_VERSION_STR "2.13.4.0" -#define TTKMUSIC_VERSION_WSTR L"2.13.4.0" -#define TTKMUSIC_VER_TIME_STR "(2021/01/09)" +//update time 2021.02.27 +#define TTKMUSIC_VERSION_STR "2.14.0.0" +#define TTKMUSIC_VERSION_WSTR L"2.14.0.0" +#define TTKMUSIC_VER_TIME_STR "(2021/02/27)" #define TTKMUSIC_MAJOR_VERSION 2 -#define TTKMUSIC_MIDLE_VERSION 13 -#define TTKMUSIC_MINOR_VERSION 4 +#define TTKMUSIC_MIDLE_VERSION 14 +#define TTKMUSIC_MINOR_VERSION 0 #define TTKMUSIC_PATCH_VERSION 0 -#define TTKMUSIC_VERSION 0x02D40 +#define TTKMUSIC_VERSION 0x02E00 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))