Release on 2.7.0.0 Final

Greedysky · Jul 1, 2018 · 8ba21d3 · 8ba21d3
1 parent 0ad0e19
commit 8ba21d3
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 39 deletions.
diff --git 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.8.0")
+set(TTK_VERSION "2.7.0.0")
 
 # Find includes in the build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/Doxyfile b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = TTKMusicplayer
-PROJECT_NUMBER         = 2.6.8.0
+PROJECT_NUMBER         = 2.7.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_player_logo.png
 OUTPUT_DIRECTORY       = TTKDocs

diff --git 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.8.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/Version-2.7.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/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,6,8,0
-    PRODUCTVERSION 2,6,8,0
+    FILEVERSION 2,7,0,0
+    PRODUCTVERSION 2,7,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKCore"
-                VALUE "FileVersion", "2.6.8.0"
+                VALUE "FileVersion", "2.7.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
                 VALUE "ProductName", "TTKCore"
-                VALUE "ProductVersion", "2.6.8.0"
+                VALUE "ProductVersion", "2.7.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKModule/TTKWidget/musicToolsKits/CMakeLists.txt b/TTKModule/TTKWidget/musicToolsKits/CMakeLists.txt
@@ -22,6 +22,7 @@ set_property(GLOBAL PROPERTY MUSIC_WIDGET_TOOLS_KITS_HEADERS
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musicdownloadrecordwidget.h
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudfileinformationwidget.h
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudtoolboxwidget.h
+    ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudtablewidget.h
   )
 
 set_property(GLOBAL PROPERTY MUSIC_WIDGET_TOOLS_KITS_SOURCES
@@ -46,5 +47,6 @@ set_property(GLOBAL PROPERTY MUSIC_WIDGET_TOOLS_KITS_SOURCES
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musicdownloadrecordwidget.cpp
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudfileinformationwidget.cpp
     ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudtoolboxwidget.cpp
+    ${MUSIC_WIDGET_TOOLSWIDGET_DIR}/musiccloudtablewidget.cpp
   )
-
+
diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,6,8,0
-    PRODUCTVERSION 2,6,8,0
+    FILEVERSION 2,7,0,0
+    PRODUCTVERSION 2,7,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKUi"
-                VALUE "FileVersion", "2.6.8.0"
+                VALUE "FileVersion", "2.7.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
                 VALUE "ProductName", "TTKUi"
-                VALUE "ProductVersion", "2.6.8.0"
+                VALUE "ProductVersion", "2.7.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git 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,8,0
-    PRODUCTVERSION 2,6,8,0
+    FILEVERSION 2,7,0,0
+    PRODUCTVERSION 2,7,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -27,12 +27,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.6.8.0"
+                VALUE "FileVersion", "2.7.0.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.6.8.0"
+                VALUE "ProductVersion", "2.7.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 APP="TTKMusicplayer"
-APP_VER="2.6.8.0"
+APP_VER="2.7.0.0"
 
 DEV_PATH="$1"
 PACK_PATH="ttkmusicplayer"

diff --git a/TTKScript/deploy/ttkmusicplayer.appdata.xml b/TTKScript/deploy/ttkmusicplayer.appdata.xml
@@ -18,7 +18,7 @@
   <developer_name>Greedysky Studio</developer_name>
 
   <releases>
-    <release version="2.6.8.0" date="2018-05-05">
+    <release version="2.7.0.0" date="2018-07-01">
     </release>
   </releases>
 </component>
diff --git a/TTKScript/deploy/ttkmusicplayer.desktop b/TTKScript/deploy/ttkmusicplayer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=2.6.8.0
+Version=2.7.0.0
 Name=ÌìÌì¿áÒô
 Comment=ÌìÌì¿áÒô
 #Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png

diff --git a/TTKScript/time.sh b/TTKScript/time.sh
@@ -1,2 +1,2 @@
 #!/bin/sh  
-find . -exec touch -c -m -t 201805050505 {} \;
+find . -exec touch -c -m -t 201807010701 {} \;
diff --git 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.8.0"
+#define MyAppVersion "2.7.0.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.8.0.exe" ;Flags: cmdprompt redirectoutput
+Name: "makeCert.bat";Parameters:"D:\Qt\v2.7.0.0.exe" ;Flags: cmdprompt redirectoutput
 
 [Code]
 // for dll

diff --git 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,8,0
-    PRODUCTVERSION 2,6,8,0
+    FILEVERSION 2,7,0,0
+    PRODUCTVERSION 2,7,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -28,12 +28,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.6.8.0"
+                VALUE "FileVersion", "2.7.0.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.6.8.0"
+                VALUE "ProductVersion", "2.7.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,6,8,0
-    PRODUCTVERSION 2,6,8,0
+    FILEVERSION 2,7,0,0
+    PRODUCTVERSION 2,7,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky Studio, Ltd."
                 VALUE "FileDescription", "TTKExtras"
-                VALUE "FileVersion", "2.6.8.0"
+                VALUE "FileVersion", "2.7.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2018"
                 VALUE "ProductName", "TTKExtras"
-                VALUE "ProductVersion", "2.6.8.0"
+                VALUE "ProductVersion", "2.7.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKVersion.pri b/TTKVersion.pri
@@ -16,5 +16,5 @@
 # * with this program; If not, see <http://www.gnu.org/licenses/>.
 # =================================================
 
-# update time 2018.05.05
-TTKMusicPlayer = 2.6.8.0
+# update time 2018.07.01
+TTKMusicPlayer = 2.7.0.0
diff --git a/musicversion.h b/musicversion.h
@@ -105,17 +105,17 @@
  * with this program; If not, see <http://www.gnu.org/licenses/>.
  ================================================= */
 
-//update time 2018.05.05
-#define TTKMUSIC_VERSION_STR    "2.6.8.0"
-#define TTKMUSIC_VERSION_WSTR   L"2.6.8.0"
-#define TTKMUSIC_VER_TIME_STR   "(2018/05/05)"
+//update time 2018.07.01
+#define TTKMUSIC_VERSION_STR    "2.7.0.0"
+#define TTKMUSIC_VERSION_WSTR   L"2.7.0.0"
+#define TTKMUSIC_VER_TIME_STR   "(2018/07/01)"
 
 #define TTKMUSIC_MAJOR_VERSION 2
-#define TTKMUSIC_MIDLE_VERSION 6
-#define TTKMUSIC_MINOR_VERSION 8
+#define TTKMUSIC_MIDLE_VERSION 7
+#define TTKMUSIC_MINOR_VERSION 0
 #define TTKMUSIC_PATCH_VERSION 0
 
-#define TTKMUSIC_VERSION 0x02680
+#define TTKMUSIC_VERSION 0x02700
 
 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))