diff --git a/CMakeLists.txt b/CMakeLists.txt index 23ccd41c2e..392109513e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11) project(TTKMusicPlayer) -set(TTK_MAJOR_VERSION "3.2.0") +set(TTK_MAJOR_VERSION "3.3.0") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/ChangeLog b/ChangeLog index 294fe3d79b..feab506152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v3.3.0.0 Final 2023.04.XX +v3.3.0.0 Final 2023.04.22 新增写真管理 新增频谱信息分析 新增频谱截屏导出 diff --git a/Doxyfile b/Doxyfile index 6b4e615154..30cae48c0e 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 3.2.0.0 +PROJECT_NUMBER = 3.3.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 0258bf6d0b..1e469f3155 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-3.2.0.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-3.3.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/TTKMusicPlayer/blob/master/TTKResource/logo_banner.png?raw=true) diff --git a/README_cn.md b/README_cn.md index 162259ef6c..e11a951188 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-3.2.0.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.3.0.0-blue.svg?style=flat-square) ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽标](https://github.com/Greedysky/TTKMusicPlayer/blob/master/TTKResource/logo_banner.png?raw=true) diff --git a/README_tc.md b/README_tc.md index 8cde2d0a3a..fdd8ad26b2 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-3.2.0.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.3.0.0-blue.svg?style=flat-square) ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽標](https://github.com/Greedysky/TTKMusicPlayer/blob/master/TTKResource/logo_banner.png?raw=true) diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 33a6b61275..806e633a46 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -158,19 +158,19 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2023.01.31 -#define TTK_VERSION 0x03200 -#define TTK_VERSION_STR "3.2.0.0" -#define TTK_VERSION_TIME_STR "(2023/01/31)" +//update time 2023.04.22 +#define TTK_VERSION 0x03300 +#define TTK_VERSION_STR "3.3.0.0" +#define TTK_VERSION_TIME_STR "(2023/04/22)" #define TTK_MAJOR_VERSION 3 -#define TTK_MIDLE_VERSION 2 +#define TTK_MIDLE_VERSION 3 #define TTK_MINOR_VERSION 0 #define TTK_PATCH_VERSION 0 #define TTK_CONFIG_VERSION_STR "1.0.1" -#define TTK_RC_FILEVERSION 3,2,0,0 +#define TTK_RC_FILEVERSION 3,3,0,0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR #define TTK_RC_COMPANY "Greedysky Studio, Ltd." #define TTK_RC_COPYRIGHT "Copyright (C) 2023 Greedysky Studio" diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 8b58ea2e4b..d34c37c9bf 100644 --- a/TTKResource/_extras/TTKRoutine.sh +++ b/TTKResource/_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.2.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.3.0.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKUtils/auc/make_auc.bat b/TTKUtils/auc/make_auc.bat index 517edc9ea0..b8d62f7315 100644 --- a/TTKUtils/auc/make_auc.bat +++ b/TTKUtils/auc/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:"3.2.0.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"3.3.0.0/TTKService.exe" \ No newline at end of file diff --git a/TTKUtils/deploy/make_desktop.sh b/TTKUtils/deploy/make_desktop.sh index 36c8ce7885..c7001afdac 100644 --- a/TTKUtils/deploy/make_desktop.sh +++ b/TTKUtils/deploy/make_desktop.sh @@ -11,7 +11,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=3.2.0.0 +Version=3.3.0.0 Name=TTKMusicPlayer Comment=天天酷音 Icon=$iconpath diff --git a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml index 0b58e0b016..6331d872d0 100644 --- a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -24,6 +24,7 @@ https://github.com/Greedysky/TTKMusicPlayer Greedysky Studio + diff --git a/TTKUtils/linux_time.sh b/TTKUtils/linux_time.sh index aff99319cb..5ddcf09aab 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2023-01-31 12:00" {} \; +find . -exec touch -c -m -d "2023-04-22 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index d9bcee1284..3d4f67a009 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "3.2.0.0" +#define MyAppVersion "3.3.0.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2023 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index 63c2c65251..ea560de87c 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 2023.01.31 -TTK_VERSION = 3.2.0.0 +# update time 2023.04.22 +TTK_VERSION = 3.3.0.0