diff --git a/CMakeLists.txt b/CMakeLists.txt index f62cc92294..d39cf9e98f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ cmake_minimum_required(VERSION 3.0.0) project(TTKMusicPlayer) -set(TTK_MAJOR_VERSION 3) -set(TTK_MINOR_VERSION 7) +set(TTK_MAJOR_VERSION 4) +set(TTK_MINOR_VERSION 0) set(TTK_PATCH_VERSION 0) set(TTK_VERSION "${TTK_MAJOR_VERSION}.${TTK_MINOR_VERSION}.${TTK_PATCH_VERSION}.0") diff --git a/ChangeLog b/ChangeLog index 173c8fbe2c..d405706026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v4.0.0.0 Final 2024.06.XX +v4.0.0.0 Final 2024.06.18 支持私人雷达 支持日志追踪 支持每日一文 diff --git a/Doxyfile b/Doxyfile index 5dfe8c606b..5e6b8a1844 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicPlayer -PROJECT_NUMBER = 3.7.0.0 +PROJECT_NUMBER = 4.0.0.0 PROJECT_BRIEF = "TTKMusicPlayer imitates Kugou UI, the music player uses of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKResource/lb_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 9fef98b70f..07892cc333 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -162,16 +162,16 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2024.04.25 -#define TTK_MAJOR_VERSION 3 -#define TTK_MINOR_VERSION 7 +//update time 2024.06.18 +#define TTK_MAJOR_VERSION 4 +#define TTK_MINOR_VERSION 0 #define TTK_PATCH_VERSION 0 #define TTK_CONFIG_VERSION_STR "1.0.2" #define TTK_VERSION TTK_VERSION_CHECK(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) #define TTK_VERSION_STR TTK_VERSION_CHECK_STR(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0) -#define TTK_VERSION_TIME_STR "(2024/04/25)" +#define TTK_VERSION_TIME_STR "(2024/06/18)" #define TTK_RC_FILEVERSION TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR diff --git a/TTKLanguage/cn.ts b/TTKLanguage/cn.ts index 212036d3d0..760e4fc546 100644 --- a/TTKLanguage/cn.ts +++ b/TTKLanguage/cn.ts @@ -72,7 +72,7 @@ 下载 - + SongItems 歌曲列表 @@ -1694,41 +1694,41 @@ MusicItemQueryTableWidget - - + + Please select one item first 请选择某一条记录 - + Play 播放 - + Add to list 添加音乐 - + Download More... 下载更多音质... - - - + + + Search '%1' 搜索 '%1' - + Search '%1 - %2' 搜索 '%1 - %2' - - + + No resource found 没有找到相关资源 @@ -2926,7 +2926,7 @@ 确定 - + Close 关闭 @@ -7215,107 +7215,107 @@ Copyright© 2015 - 2024 Greedysky All Rights Reserved MusicWebFMRadioWidget - + FMRadio 私人漫游 - + TKRadio 私人电台 - + DJRadio 主播电台 - + MVRadio 视频电台 - + PVRadio 私人雷达 - + TRRadio 宝藏雷达 - + TMRadio 时光雷达 - + VPRadio 会员雷达 - + NWRadio 新歌雷达 - + FNRadio 乐迷雷达 - + MYRadio 神秘雷达 - + FVRadio 曾经爱听 - + WWRadio 周新发现 - + HCRadio 热评趋势 - + RHRadio 红心趋势 - + HSRadio 热点雷达 - + EARadio 欧美雷达 - + CNRadio 华语雷达 - + JPRadio 日系雷达 - + KRRadio 韩系雷达 - + CTRadio 粤语雷达 diff --git a/TTKLanguage/en.ts b/TTKLanguage/en.ts index da0f250965..7f62745a79 100644 --- a/TTKLanguage/en.ts +++ b/TTKLanguage/en.ts @@ -72,7 +72,7 @@ Download - + SongItems SongItems @@ -1694,41 +1694,41 @@ MusicItemQueryTableWidget - - + + Please select one item first - + Play - + Add to list - + Download More... - - - + + + Search '%1' - + Search '%1 - %2' - - + + No resource found @@ -2926,7 +2926,7 @@ - + Close @@ -7215,107 +7215,107 @@ Copyright© 2015 - 2024 Greedysky All Rights Reserved MusicWebFMRadioWidget - + FMRadio - + TKRadio - + DJRadio - + MVRadio - + PVRadio - + TRRadio - + TMRadio - + VPRadio - + NWRadio - + FNRadio - + MYRadio - + FVRadio - + WWRadio - + HCRadio - + RHRadio - + HSRadio - + EARadio - + CNRadio - + JPRadio - + KRRadio - + CTRadio diff --git a/TTKLanguage/tc.ts b/TTKLanguage/tc.ts index 3cc6254f1c..ee53c39e66 100644 --- a/TTKLanguage/tc.ts +++ b/TTKLanguage/tc.ts @@ -72,7 +72,7 @@ 下載 - + SongItems 歌曲列表 @@ -1694,41 +1694,41 @@ MusicItemQueryTableWidget - - + + Please select one item first 請選擇某壹條記錄 - + Play 播放 - + Add to list 添加音樂 - + Download More... 下載更多音質... - - - + + + Search '%1' 搜索 '%1' - + Search '%1 - %2' 搜索 '%1 - %2' - - + + No resource found 沒有找到相關資源 @@ -2926,7 +2926,7 @@ 確定 - + Close 關閉 @@ -7215,107 +7215,107 @@ Copyright© 2015 - 2024 Greedysky All Rights Reserved MusicWebFMRadioWidget - + FMRadio 私人漫遊 - + TKRadio 私人電台 - + DJRadio 主播電台 - + MVRadio 視頻電台 - + PVRadio 私人雷達 - + TRRadio 寶藏雷達 - + TMRadio 時光雷達 - + VPRadio 會員雷達 - + NWRadio 新歌雷達 - + FNRadio 樂迷雷達 - + MYRadio 神秘雷達 - + FVRadio 曾經愛聽 - + WWRadio 周新發現 - + HCRadio 熱評趨勢 - + RHRadio 紅心趨勢 - + HSRadio 熱點雷達 - + EARadio 歐美雷達 - + CNRadio 華語雷達 - + JPRadio 日系雷達 - + KRRadio 韓系雷達 - + CTRadio 粵語雷達 diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 12bb10ed53..d779d5794d 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.7.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/4.0.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 a66c339e24..aaee048157 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.7.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:"4.0.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 e42ba2a9d8..d1da0bcc50 100644 --- a/TTKUtils/deploy/make_desktop.sh +++ b/TTKUtils/deploy/make_desktop.sh @@ -13,7 +13,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=3.7.0.0 +Version=4.0.0.0 Name=TTKMusicPlayer Name[zh_CN]=天天酷音 Name[zh_TW]=天天酷音 diff --git a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml index d63c5d288e..8ec4df3e50 100644 --- a/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKUtils/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -29,6 +29,7 @@ https://github.com/Greedysky/TTKMusicPlayer Greedysky Studio + diff --git a/TTKUtils/linux_time.sh b/TTKUtils/linux_time.sh index fe5720ee41..3629085171 100755 --- a/TTKUtils/linux_time.sh +++ b/TTKUtils/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2024-04-25 12:00" {} \; +find . -exec touch -c -m -d "2024-06-18 12:00" {} \; diff --git a/TTKUtils/ttk.iss b/TTKUtils/ttk.iss index 320cfa46df..e78138a955 100644 --- a/TTKUtils/ttk.iss +++ b/TTKUtils/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "3.7.0.0" +#define MyAppVersion "4.0.0.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2024 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index 7734ae3b1a..65edc4f355 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 2024.04.25 -TTK_VERSION = 3.7.0.0 +# update time 2024.06.18 +TTK_VERSION = 4.0.0.0