diff --git a/CMakeLists.txt b/CMakeLists.txt index 392109513..f21ac8676 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.3.0") +set(TTK_MAJOR_VERSION "3.4.0") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/ChangeLog b/ChangeLog index 8d79f6343..e57eba39b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v3.4.0.0 Final 2023.XX.XX +v3.4.0.0 Final 2023.06.30 新增科技风主题 修复全局热键初始化 修复网络歌曲大小显示 diff --git a/Doxyfile b/Doxyfile index 30cae48c0..3e3d66c66 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 3.3.0.0 +PROJECT_NUMBER = 3.4.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 1e469f315..c7d84d876 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.3.0.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-3.4.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 e11a95118..298be113a 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.3.0.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.4.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 fdd8ad26b..99966fe51 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.3.0.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-3.4.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 806e633a4..a54abfffd 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -158,19 +158,19 @@ * with this program; If not, see . ***************************************************************************/ -//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)" +//update time 2023.06.30 +#define TTK_VERSION 0x03400 +#define TTK_VERSION_STR "3.4.0.0" +#define TTK_VERSION_TIME_STR "(2023/06/30)" #define TTK_MAJOR_VERSION 3 -#define TTK_MIDLE_VERSION 3 +#define TTK_MIDLE_VERSION 4 #define TTK_MINOR_VERSION 0 #define TTK_PATCH_VERSION 0 -#define TTK_CONFIG_VERSION_STR "1.0.1" +#define TTK_CONFIG_VERSION_STR "1.0.1" -#define TTK_RC_FILEVERSION 3,3,0,0 +#define TTK_RC_FILEVERSION 3,4,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 d34c37c9b..6e4774f19 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.3.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.4.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 b8d62f731..337b61821 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.3.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.4.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 c7001afda..91f4e14d0 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.3.0.0 +Version=3.4.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 6331d872d..e96624ab9 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 5ddcf09aa..601dc792f 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2023-04-22 12:00" {} \; +find . -exec touch -c -m -d "2023-06-30 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index 3d4f67a00..e1e4c440d 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "3.3.0.0" +#define MyAppVersion "3.4.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 ea560de87..43e7aa096 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.04.22 -TTK_VERSION = 3.3.0.0 +# update time 2023.06.30 +TTK_VERSION = 3.4.0.0