7 changed files with 25 additions and 139 deletions
--- a/.cmake/Version.h.in
+++ b/.cmake/Version.h.in
@ -5,9 +5,8 @@

 #include <QtGlobal>

-#define APPLICATION_FULL_VERSION "${GIT_SEMVER}.${GIT_COMMIT_COUNT}"
+#define APPLICATION_VERSION "${GIT_SEMVER}.${GIT_COMMIT_COUNT}"
 #define VERSION_COUNTER ${GIT_COMMIT_COUNT}
 #define COMMIT_HASH "${GIT_DESCRIBE}"
-#define APPLICATION_VERSION "${GIT_SEMVER}"

 #endif  // VERSION_H
--- a/example/qml-Qt6/window/MainWindow.qml
+++ b/example/qml-Qt6/window/MainWindow.qml
@ -28,7 +28,6 @@ CustomWindow {
    Component.onCompleted: {
        FluTools.setQuitOnLastWindowClosed(false)
        tour.open()
-        checkUpdate()
    }

    SystemTrayIcon {
@ -278,46 +277,4 @@ CustomWindow {
        ]
    }

-    FluHttp{
-        id:http
-    }
-
-    FluContentDialog{
-        property string newVerson
-        property string body
-        id:dialog_update
-        title:"升级提示"
-        message:"FluentUI目前最新版本 "+ newVerson +" -- 当前应用版本 "+appInfo.version+" \n现在是否去下载新版本？\n\n更新内容：\n"+body
-        buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
-        negativeText: "取消"
-        positiveText:"确定"
-        onPositiveClicked:{
-            Qt.openUrlExternally("https://github.com/zhuzichu520/FluentUI/releases/latest")
-        }
-    }
-
-    function checkUpdate(){
-        var callable = {}
-        callable.onStart = function(){
-            console.debug("satrt check update...")
-        }
-        callable.onFinish = function(){
-            console.debug("check update finish")
-        }
-        callable.onSuccess = function(result){
-            var data = JSON.parse(result)
-            console.debug("current version "+appInfo.version)
-            console.debug("new version "+data.tag_name)
-            if(data.tag_name !== appInfo.version){
-                dialog_update.newVerson =  data.tag_name
-                dialog_update.body = data.body
-                dialog_update.open()
-            }
-        }
-        callable.onError = function(status,errorString){
-            console.debug(status+";"+errorString)
-        }
-        http.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest",callable)
-    }
-
 }
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@ -29,7 +29,6 @@ CustomWindow {
    Component.onCompleted: {
        FluTools.setQuitOnLastWindowClosed(false)
        tour.open()
-        checkUpdate()
    }

    SystemTrayIcon {
@ -279,46 +278,4 @@ CustomWindow {
        ]
    }

-    FluHttp{
-        id:http
-    }
-
-    FluContentDialog{
-        property string newVerson
-        property string body
-        id:dialog_update
-        title:"升级提示"
-        message:"FluentUI目前最新版本 "+ newVerson +" -- 当前应用版本 "+appInfo.version+" \n现在是否去下载新版本？\n\n更新内容：\n"+body
-        buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
-        negativeText: "取消"
-        positiveText:"确定"
-        onPositiveClicked:{
-            Qt.openUrlExternally("https://github.com/zhuzichu520/FluentUI/releases/latest")
-        }
-    }
-
-    function checkUpdate(){
-        var callable = {}
-        callable.onStart = function(){
-            console.debug("satrt check update...")
-        }
-        callable.onFinish = function(){
-            console.debug("check update finish")
-        }
-        callable.onSuccess = function(result){
-            var data = JSON.parse(result)
-            console.debug("current version "+appInfo.version)
-            console.debug("new version "+data.tag_name)
-            if(data.tag_name !== appInfo.version){
-                dialog_update.newVerson =  data.tag_name
-                dialog_update.body = data.body
-                dialog_update.open()
-            }
-        }
-        callable.onError = function(status,errorString){
-            console.debug(status+";"+errorString)
-        }
-        http.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest",callable)
-    }
-
 }
--- a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
@ -18,7 +18,7 @@ FluPopup {
    property int buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
    focus: true
    implicitWidth: 400
-    implicitHeight: text_title.height + sroll_message.height + layout_actions.height
+    implicitHeight: text_title.height + text_message.height + layout_actions.height
    Rectangle {
        id:layout_content
        anchors.fill: parent
@ -38,41 +38,28 @@ FluPopup {
                right: parent.right
            }
        }
-
-        Flickable{
-            id:sroll_message
-            contentWidth: width
-            anchors{
-                top:text_title.bottom
-                left: parent.left
-                right: parent.right
-            }
-            contentHeight: text_message.height
-            clip: true
-            height: Math.min(text_message.height,300)
-            ScrollBar.vertical: FluScrollBar {}
-
        FluText{
            id:text_message
            font: FluTextStyle.Body
            wrapMode: Text.WrapAnywhere
            text:message
-                width: parent.width
            topPadding: 14
            leftPadding: 20
            rightPadding: 20
            bottomPadding: 14
+            anchors{
+                top:text_title.bottom
+                left: parent.left
+                right: parent.right
            }
-
        }
-
        Rectangle{
            id:layout_actions
            height: 68
            radius: 5
            color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
            anchors{
-                top:sroll_message.bottom
+                top:text_message.bottom
                left: parent.left
                right: parent.right
            }
@ -140,4 +127,3 @@ FluPopup {
        }
    }
 }
-
--- a/src/Qt5/imports/FluentUI/Controls/FluSlider.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluSlider.qml
@ -67,7 +67,7 @@ T.Slider {
    }
    FluTooltip{
        parent: control.handle
-        visible: control.tooltipEnabled && (control.pressed || control.hovered)
+        visible: control.tooltipEnabled && control.pressed
        text:String(control.value)
    }
 }
--- a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
@ -18,7 +18,7 @@ FluPopup {
    property int buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
    focus: true
    implicitWidth: 400
-    implicitHeight: text_title.height + sroll_message.height + layout_actions.height
+    implicitHeight: text_title.height + text_message.height + layout_actions.height
    Rectangle {
        id:layout_content
        anchors.fill: parent
@ -38,41 +38,28 @@ FluPopup {
                right: parent.right
            }
        }
-
-        Flickable{
-            id:sroll_message
-            contentWidth: width
-            anchors{
-                top:text_title.bottom
-                left: parent.left
-                right: parent.right
-            }
-            contentHeight: text_message.height
-            clip: true
-            height: Math.min(text_message.height,300)
-            ScrollBar.vertical: FluScrollBar {}
-
        FluText{
            id:text_message
            font: FluTextStyle.Body
            wrapMode: Text.WrapAnywhere
            text:message
-                width: parent.width
            topPadding: 14
            leftPadding: 20
            rightPadding: 20
            bottomPadding: 14
+            anchors{
+                top:text_title.bottom
+                left: parent.left
+                right: parent.right
            }
-
        }
-
        Rectangle{
            id:layout_actions
            height: 68
            radius: 5
            color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
            anchors{
-                top:sroll_message.bottom
+                top:text_message.bottom
                left: parent.left
                right: parent.right
            }
--- a/src/Qt6/imports/FluentUI/Controls/FluSlider.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluSlider.qml
@ -68,7 +68,7 @@ T.Slider {
    }
    FluTooltip{
        parent: control.handle
-        visible: control.tooltipEnabled && (control.pressed || control.hovered)
+        visible: control.tooltipEnabled && control.pressed
        text:String(control.value)
    }
 }