This commit is contained in:
朱子楚\zhuzi 2023-08-26 17:20:30 +08:00
parent 2818b84860
commit aedb89b34b
65 changed files with 589 additions and 382 deletions

View File

@ -35,7 +35,8 @@ Window {
"/hotload":"qrc:/example/qml/window/HotloadWindow.qml", "/hotload":"qrc:/example/qml/window/HotloadWindow.qml",
"/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml", "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
"/standardWindow":"qrc:/example/qml/window/StandardWindow.qml", "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
"/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml" "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml",
"/pageWindow":"qrc:/example/qml/window/PageWindow.qml"
} }
FluApp.initialRoute = "/" FluApp.initialRoute = "/"
FluApp.httpInterceptor = interceptor FluApp.httpInterceptor = interceptor

View File

@ -14,7 +14,8 @@ FluObject{
FluPaneItem{ FluPaneItem{
title:lang.about title:lang.about
icon:FluentIcons.Contact icon:FluentIcons.Contact
tapFunc:function(){ onDropped: { FluApp.navigate("/about") }
onTapListener:function(){
FluApp.navigate("/about") FluApp.navigate("/about")
} }
} }
@ -22,8 +23,10 @@ FluObject{
FluPaneItem{ FluPaneItem{
title:lang.settings title:lang.settings
icon:FluentIcons.Settings icon:FluentIcons.Settings
url:"qrc:/example/qml/page/T_Settings.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
navigationView.push("qrc:/example/qml/page/T_Settings.qml") navigationView.push(url)
} }
} }

View File

@ -21,11 +21,13 @@ FluObject{
count: item_home.count count: item_home.count
} }
icon:FluentIcons.Home icon:FluentIcons.Home
url:"qrc:/example/qml/page/T_Home.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
if(navigationView.getCurrentUrl()){ if(navigationView.getCurrentUrl()){
item_home.count = 0 item_home.count = 0
} }
navigationView.push("qrc:/example/qml/page/T_Home.qml") navigationView.push(url)
} }
editDelegate: FluTextBox{ editDelegate: FluTextBox{
text:item_home.title text:item_home.title
@ -69,9 +71,11 @@ FluObject{
image:"qrc:/example/res/image/control/Button.png" image:"qrc:/example/res/image/control/Button.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that responds to user input and raisesa Click event." desc:"A control that responds to user input and raisesa Click event."
url:"qrc:/example/qml/page/T_Buttons.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_buttons.count = 0 item_buttons.count = 0
navigationView.push("qrc:/example/qml/page/T_Buttons.qml") navigationView.push(url)
} }
} }
FluPaneItem{ FluPaneItem{
@ -82,46 +86,45 @@ FluObject{
count: item_text.count count: item_text.count
color: Qt.rgba(82/255,196/255,26/255,1) color: Qt.rgba(82/255,196/255,26/255,1)
} }
onTap:{ url:"qrc:/example/qml/page/T_Text.qml"
item_text.count = 0 onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
navigationView.push("qrc:/example/qml/page/T_Text.qml") onTap:{ navigationView.push(url) }
}
} }
FluPaneItem{ FluPaneItem{
title:"Image" title:"Image"
onTap:{ url:"qrc:/example/qml/page/T_Image.qml"
navigationView.push("qrc:/example/qml/page/T_Image.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Slider" title:"Slider"
image:"qrc:/example/res/image/control/Slider.png" image:"qrc:/example/res/image/control/Slider.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack." desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
onTap:{ url:"qrc:/example/qml/page/T_Slider.qml"
navigationView.push("qrc:/example/qml/page/T_Slider.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"CheckBox" title:"CheckBox"
image:"qrc:/example/res/image/control/Checkbox.png" image:"qrc:/example/res/image/control/Checkbox.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that a user can select or clear." desc:"A control that a user can select or clear."
onTap:{ url:"qrc:/example/qml/page/T_CheckBox.qml"
navigationView.push("qrc:/example/qml/page/T_CheckBox.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"RadioButton" title:"RadioButton"
onTap:{ url:"qrc:/example/qml/page/T_RadioButton.qml"
navigationView.push("qrc:/example/qml/page/T_RadioButton.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"ToggleSwitch" title:"ToggleSwitch"
onTap:{ url:"qrc:/example/qml/page/T_ToggleSwitch.qml"
navigationView.push("qrc:/example/qml/page/T_ToggleSwitch.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -130,33 +133,33 @@ FluObject{
icon:FluentIcons.GridView icon:FluentIcons.GridView
FluPaneItem{ FluPaneItem{
title:"TextBox" title:"TextBox"
onTap:{ url:"qrc:/example/qml/page/T_TextBox.qml"
navigationView.push("qrc:/example/qml/page/T_TextBox.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TimePicker" title:"TimePicker"
onTap:{ url:"qrc:/example/qml/page/T_TimePicker.qml"
navigationView.push("qrc:/example/qml/page/T_TimePicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"DatePicker" title:"DatePicker"
onTap:{ url:"qrc:/example/qml/page/T_DatePicker.qml"
navigationView.push("qrc:/example/qml/page/T_DatePicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"CalendarPicker" title:"CalendarPicker"
onTap:{ url:"qrc:/example/qml/page/T_CalendarPicker.qml"
navigationView.push("qrc:/example/qml/page/T_CalendarPicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"ColorPicker" title:"ColorPicker"
onTap:{ url:"qrc:/example/qml/page/T_ColorPicker.qml"
navigationView.push("qrc:/example/qml/page/T_ColorPicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -168,57 +171,57 @@ FluObject{
image:"qrc:/example/res/image/control/InfoBar.png" image:"qrc:/example/res/image/control/InfoBar.png"
recentlyUpdated:true recentlyUpdated:true
desc:"An inline message to display app-wide statuschange information." desc:"An inline message to display app-wide statuschange information."
onTap:{ url:"qrc:/example/qml/page/T_InfoBar.qml"
navigationView.push("qrc:/example/qml/page/T_InfoBar.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Progress" title:"Progress"
onTap:{ url:"qrc:/example/qml/page/T_Progress.qml"
navigationView.push("qrc:/example/qml/page/T_Progress.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"RatingControl" title:"RatingControl"
onTap:{ url:"qrc:/example/qml/page/T_RatingControl.qml"
navigationView.push("qrc:/example/qml/page/T_RatingControl.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Badge" title:"Badge"
onTap:{ url:"qrc:/example/qml/page/T_Badge.qml"
navigationView.push("qrc:/example/qml/page/T_Badge.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Rectangle" title:"Rectangle"
onTap:{ url:"qrc:/example/qml/page/T_Rectangle.qml"
navigationView.push("qrc:/example/qml/page/T_Rectangle.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"StatusView" title:"StatusView"
onTap:{ url:"qrc:/example/qml/page/T_StatusView.qml"
navigationView.push("qrc:/example/qml/page/T_StatusView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Carousel" title:"Carousel"
onTap:{ url:"qrc:/example/qml/page/T_Carousel.qml"
navigationView.push("qrc:/example/qml/page/T_Carousel.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Expander" title:"Expander"
onTap:{ url:"qrc:/example/qml/page/T_Expander.qml"
navigationView.push("qrc:/example/qml/page/T_Expander.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Watermark" title:"Watermark"
onTap:{ url:"qrc:/example/qml/page/T_Watermark.qml"
navigationView.push("qrc:/example/qml/page/T_Watermark.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -227,9 +230,9 @@ FluObject{
icon:FluentIcons.ButtonMenu icon:FluentIcons.ButtonMenu
FluPaneItem{ FluPaneItem{
title:"Dialog" title:"Dialog"
onTap:{ url:"qrc:/example/qml/page/T_Dialog.qml"
navigationView.push("qrc:/example/qml/page/T_Dialog.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
id:item_combobox id:item_combobox
@ -239,6 +242,8 @@ FluObject{
count: item_combobox.count count: item_combobox.count
color: Qt.rgba(250/255,173/255,20/255,1) color: Qt.rgba(250/255,173/255,20/255,1)
} }
url:"qrc:/example/qml/page/T_ComboBox.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_combobox.count = 0 item_combobox.count = 0
navigationView.push("qrc:/example/qml/page/T_ComboBox.qml") navigationView.push("qrc:/example/qml/page/T_ComboBox.qml")
@ -246,15 +251,15 @@ FluObject{
} }
FluPaneItem{ FluPaneItem{
title:"Tooltip" title:"Tooltip"
onTap:{ url:"qrc:/example/qml/page/T_Tooltip.qml"
navigationView.push("qrc:/example/qml/page/T_Tooltip.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Menu" title:"Menu"
onTap:{ url:"qrc:/example/qml/page/T_Menu.qml"
navigationView.push("qrc:/example/qml/page/T_Menu.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -267,15 +272,15 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:3 order:3
desc:"Presents information from different sources in atabbed view." desc:"Presents information from different sources in atabbed view."
onTap:{ url:"qrc:/example/qml/page/T_Pivot.qml"
navigationView.push("qrc:/example/qml/page/T_Pivot.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"BreadcrumbBar" title:"BreadcrumbBar"
onTap:{ url:"qrc:/example/qml/page/T_BreadcrumbBar.qml"
navigationView.push("qrc:/example/qml/page/T_BreadcrumbBar.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TabView" title:"TabView"
@ -283,15 +288,15 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:1 order:1
desc:"A control that displays a collection of tabs thatcan be used to display several documents." desc:"A control that displays a collection of tabs thatcan be used to display several documents."
onTap:{ url:"qrc:/example/qml/page/T_TabView.qml"
navigationView.push("qrc:/example/qml/page/T_TabView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TreeView" title:"TreeView"
onTap:{ url:"qrc:/example/qml/page/T_TreeView.qml"
navigationView.push("qrc:/example/qml/page/T_TreeView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TableView" title:"TableView"
@ -299,21 +304,21 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:4 order:4
desc:"The TableView control provides a flexible way to display a collection of data in rows and columns" desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
onTap:{ url:"qrc:/example/qml/page/T_TableView.qml"
navigationView.push("qrc:/example/qml/page/T_TableView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Pagination" title:"Pagination"
onTap:{ url:"qrc:/example/qml/page/T_Pagination.qml"
navigationView.push("qrc:/example/qml/page/T_Pagination.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"MultiWindow" title:"MultiWindow"
onTap:{ url:"qrc:/example/qml/page/T_MultiWindow.qml"
navigationView.push("qrc:/example/qml/page/T_MultiWindow.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"FlipView" title:"FlipView"
@ -321,9 +326,9 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:2 order:2
desc:"Presents a collection of items that the user canflip through, one item at a time." desc:"Presents a collection of items that the user canflip through, one item at a time."
onTap:{ url:"qrc:/example/qml/page/T_FlipView.qml"
navigationView.push("qrc:/example/qml/page/T_FlipView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -332,27 +337,27 @@ FluObject{
icon:FluentIcons.Brightness icon:FluentIcons.Brightness
FluPaneItem{ FluPaneItem{
title:"Acrylic" title:"Acrylic"
onTap:{ url:"qrc:/example/qml/page/T_Acrylic.qml"
navigationView.push("qrc:/example/qml/page/T_Acrylic.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Theme" title:"Theme"
onTap:{ url:"qrc:/example/qml/page/T_Theme.qml"
navigationView.push("qrc:/example/qml/page/T_Theme.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Typography" title:"Typography"
onTap:{ url:"qrc:/example/qml/page/T_Typography.qml"
navigationView.push("qrc:/example/qml/page/T_Typography.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Awesome" title:"Awesome"
onTap:{ url:"qrc:/example/qml/page/T_Awesome.qml"
navigationView.push("qrc:/example/qml/page/T_Awesome.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -366,45 +371,45 @@ FluObject{
icon:FluentIcons.Shop icon:FluentIcons.Shop
FluPaneItem{ FluPaneItem{
title:"QRCode" title:"QRCode"
onTap:{ url:"qrc:/example/qml/page/T_QRCode.qml"
navigationView.push("qrc:/example/qml/page/T_QRCode.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Tour" title:"Tour"
onTap:{ url:"qrc:/example/qml/page/T_Tour.qml"
navigationView.push("qrc:/example/qml/page/T_Tour.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Timeline" title:"Timeline"
onTap:{ url:"qrc:/example/qml/page/T_Timeline.qml"
navigationView.push("qrc:/example/qml/page/T_Timeline.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Screenshot" title:"Screenshot"
onTap:{ url:"qrc:/example/qml/page/T_Screenshot.qml"
navigationView.push("qrc:/example/qml/page/T_Screenshot.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Captcha" title:"Captcha"
onTap:{ url:"qrc:/example/qml/page/T_Captcha.qml"
navigationView.push("qrc:/example/qml/page/T_Captcha.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Chart" title:"Chart"
onTap:{ url:"qrc:/example/qml/page/T_Chart.qml"
navigationView.push("qrc:/example/qml/page/T_Chart.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Http" title:"Http"
onTap:{ url:"qrc:/example/qml/page/T_Http.qml"
navigationView.push("qrc:/example/qml/page/T_Http.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
id:item_other id:item_other
@ -414,6 +419,8 @@ FluObject{
count: item_other.count count: item_other.count
color: Qt.rgba(82/255,196/255,26/255,1) color: Qt.rgba(82/255,196/255,26/255,1)
} }
url:"qrc:/example/qml/page/T_RemoteLoader.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_other.count = 0 item_other.count = 0
navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml") navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml")
@ -421,9 +428,10 @@ FluObject{
} }
FluPaneItem{ FluPaneItem{
title:"HotLoader" title:"HotLoader"
tapFunc:function(){ onTapListener:function(){
FluApp.navigate("/hotload") FluApp.navigate("/hotload")
} }
onDropped:{ FluApp.navigate("/hotload") }
} }
} }

View File

@ -0,0 +1,25 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import example
import "qrc:///example/qml/component"
CustomWindow {
id:window
width: 800
height: 600
minimumWidth: 520
minimumHeight: 200
launchMode: FluWindowType.SingleInstance
onInitArgument:
(arg)=>{
window.title = arg.title
loader.setSource( arg.url,{animDisabled:true})
}
Loader{
id: loader
anchors.fill: parent
}
}

View File

@ -35,7 +35,8 @@ Window {
"/hotload":"qrc:/example/qml/window/HotloadWindow.qml", "/hotload":"qrc:/example/qml/window/HotloadWindow.qml",
"/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml", "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
"/standardWindow":"qrc:/example/qml/window/StandardWindow.qml", "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
"/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml" "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml",
"/pageWindow":"qrc:/example/qml/window/PageWindow.qml"
} }
FluApp.initialRoute = "/" FluApp.initialRoute = "/"
FluApp.httpInterceptor = interceptor FluApp.httpInterceptor = interceptor

View File

@ -14,7 +14,8 @@ FluObject{
FluPaneItem{ FluPaneItem{
title:lang.about title:lang.about
icon:FluentIcons.Contact icon:FluentIcons.Contact
tapFunc:function(){ onDropped: { FluApp.navigate("/about") }
onTapListener:function(){
FluApp.navigate("/about") FluApp.navigate("/about")
} }
} }
@ -22,8 +23,10 @@ FluObject{
FluPaneItem{ FluPaneItem{
title:lang.settings title:lang.settings
icon:FluentIcons.Settings icon:FluentIcons.Settings
url:"qrc:/example/qml/page/T_Settings.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
navigationView.push("qrc:/example/qml/page/T_Settings.qml") navigationView.push(url)
} }
} }

View File

@ -21,11 +21,13 @@ FluObject{
count: item_home.count count: item_home.count
} }
icon:FluentIcons.Home icon:FluentIcons.Home
url:"qrc:/example/qml/page/T_Home.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
if(navigationView.getCurrentUrl()){ if(navigationView.getCurrentUrl()){
item_home.count = 0 item_home.count = 0
} }
navigationView.push("qrc:/example/qml/page/T_Home.qml") navigationView.push(url)
} }
editDelegate: FluTextBox{ editDelegate: FluTextBox{
text:item_home.title text:item_home.title
@ -69,9 +71,11 @@ FluObject{
image:"qrc:/example/res/image/control/Button.png" image:"qrc:/example/res/image/control/Button.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that responds to user input and raisesa Click event." desc:"A control that responds to user input and raisesa Click event."
url:"qrc:/example/qml/page/T_Buttons.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_buttons.count = 0 item_buttons.count = 0
navigationView.push("qrc:/example/qml/page/T_Buttons.qml") navigationView.push(url)
} }
} }
FluPaneItem{ FluPaneItem{
@ -82,46 +86,45 @@ FluObject{
count: item_text.count count: item_text.count
color: Qt.rgba(82/255,196/255,26/255,1) color: Qt.rgba(82/255,196/255,26/255,1)
} }
onTap:{ url:"qrc:/example/qml/page/T_Text.qml"
item_text.count = 0 onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
navigationView.push("qrc:/example/qml/page/T_Text.qml") onTap:{ navigationView.push(url) }
}
} }
FluPaneItem{ FluPaneItem{
title:"Image" title:"Image"
onTap:{ url:"qrc:/example/qml/page/T_Image.qml"
navigationView.push("qrc:/example/qml/page/T_Image.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Slider" title:"Slider"
image:"qrc:/example/res/image/control/Slider.png" image:"qrc:/example/res/image/control/Slider.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack." desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
onTap:{ url:"qrc:/example/qml/page/T_Slider.qml"
navigationView.push("qrc:/example/qml/page/T_Slider.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"CheckBox" title:"CheckBox"
image:"qrc:/example/res/image/control/Checkbox.png" image:"qrc:/example/res/image/control/Checkbox.png"
recentlyUpdated:true recentlyUpdated:true
desc:"A control that a user can select or clear." desc:"A control that a user can select or clear."
onTap:{ url:"qrc:/example/qml/page/T_CheckBox.qml"
navigationView.push("qrc:/example/qml/page/T_CheckBox.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"RadioButton" title:"RadioButton"
onTap:{ url:"qrc:/example/qml/page/T_RadioButton.qml"
navigationView.push("qrc:/example/qml/page/T_RadioButton.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"ToggleSwitch" title:"ToggleSwitch"
onTap:{ url:"qrc:/example/qml/page/T_ToggleSwitch.qml"
navigationView.push("qrc:/example/qml/page/T_ToggleSwitch.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -130,33 +133,33 @@ FluObject{
icon:FluentIcons.GridView icon:FluentIcons.GridView
FluPaneItem{ FluPaneItem{
title:"TextBox" title:"TextBox"
onTap:{ url:"qrc:/example/qml/page/T_TextBox.qml"
navigationView.push("qrc:/example/qml/page/T_TextBox.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TimePicker" title:"TimePicker"
onTap:{ url:"qrc:/example/qml/page/T_TimePicker.qml"
navigationView.push("qrc:/example/qml/page/T_TimePicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"DatePicker" title:"DatePicker"
onTap:{ url:"qrc:/example/qml/page/T_DatePicker.qml"
navigationView.push("qrc:/example/qml/page/T_DatePicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"CalendarPicker" title:"CalendarPicker"
onTap:{ url:"qrc:/example/qml/page/T_CalendarPicker.qml"
navigationView.push("qrc:/example/qml/page/T_CalendarPicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"ColorPicker" title:"ColorPicker"
onTap:{ url:"qrc:/example/qml/page/T_ColorPicker.qml"
navigationView.push("qrc:/example/qml/page/T_ColorPicker.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -168,57 +171,57 @@ FluObject{
image:"qrc:/example/res/image/control/InfoBar.png" image:"qrc:/example/res/image/control/InfoBar.png"
recentlyUpdated:true recentlyUpdated:true
desc:"An inline message to display app-wide statuschange information." desc:"An inline message to display app-wide statuschange information."
onTap:{ url:"qrc:/example/qml/page/T_InfoBar.qml"
navigationView.push("qrc:/example/qml/page/T_InfoBar.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Progress" title:"Progress"
onTap:{ url:"qrc:/example/qml/page/T_Progress.qml"
navigationView.push("qrc:/example/qml/page/T_Progress.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"RatingControl" title:"RatingControl"
onTap:{ url:"qrc:/example/qml/page/T_RatingControl.qml"
navigationView.push("qrc:/example/qml/page/T_RatingControl.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Badge" title:"Badge"
onTap:{ url:"qrc:/example/qml/page/T_Badge.qml"
navigationView.push("qrc:/example/qml/page/T_Badge.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Rectangle" title:"Rectangle"
onTap:{ url:"qrc:/example/qml/page/T_Rectangle.qml"
navigationView.push("qrc:/example/qml/page/T_Rectangle.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"StatusView" title:"StatusView"
onTap:{ url:"qrc:/example/qml/page/T_StatusView.qml"
navigationView.push("qrc:/example/qml/page/T_StatusView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Carousel" title:"Carousel"
onTap:{ url:"qrc:/example/qml/page/T_Carousel.qml"
navigationView.push("qrc:/example/qml/page/T_Carousel.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Expander" title:"Expander"
onTap:{ url:"qrc:/example/qml/page/T_Expander.qml"
navigationView.push("qrc:/example/qml/page/T_Expander.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Watermark" title:"Watermark"
onTap:{ url:"qrc:/example/qml/page/T_Watermark.qml"
navigationView.push("qrc:/example/qml/page/T_Watermark.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -227,9 +230,9 @@ FluObject{
icon:FluentIcons.ButtonMenu icon:FluentIcons.ButtonMenu
FluPaneItem{ FluPaneItem{
title:"Dialog" title:"Dialog"
onTap:{ url:"qrc:/example/qml/page/T_Dialog.qml"
navigationView.push("qrc:/example/qml/page/T_Dialog.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
id:item_combobox id:item_combobox
@ -239,6 +242,8 @@ FluObject{
count: item_combobox.count count: item_combobox.count
color: Qt.rgba(250/255,173/255,20/255,1) color: Qt.rgba(250/255,173/255,20/255,1)
} }
url:"qrc:/example/qml/page/T_ComboBox.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_combobox.count = 0 item_combobox.count = 0
navigationView.push("qrc:/example/qml/page/T_ComboBox.qml") navigationView.push("qrc:/example/qml/page/T_ComboBox.qml")
@ -246,15 +251,15 @@ FluObject{
} }
FluPaneItem{ FluPaneItem{
title:"Tooltip" title:"Tooltip"
onTap:{ url:"qrc:/example/qml/page/T_Tooltip.qml"
navigationView.push("qrc:/example/qml/page/T_Tooltip.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Menu" title:"Menu"
onTap:{ url:"qrc:/example/qml/page/T_Menu.qml"
navigationView.push("qrc:/example/qml/page/T_Menu.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -267,15 +272,15 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:3 order:3
desc:"Presents information from different sources in atabbed view." desc:"Presents information from different sources in atabbed view."
onTap:{ url:"qrc:/example/qml/page/T_Pivot.qml"
navigationView.push("qrc:/example/qml/page/T_Pivot.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"BreadcrumbBar" title:"BreadcrumbBar"
onTap:{ url:"qrc:/example/qml/page/T_BreadcrumbBar.qml"
navigationView.push("qrc:/example/qml/page/T_BreadcrumbBar.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TabView" title:"TabView"
@ -283,15 +288,15 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:1 order:1
desc:"A control that displays a collection of tabs thatcan be used to display several documents." desc:"A control that displays a collection of tabs thatcan be used to display several documents."
onTap:{ url:"qrc:/example/qml/page/T_TabView.qml"
navigationView.push("qrc:/example/qml/page/T_TabView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TreeView" title:"TreeView"
onTap:{ url:"qrc:/example/qml/page/T_TreeView.qml"
navigationView.push("qrc:/example/qml/page/T_TreeView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"TableView" title:"TableView"
@ -299,21 +304,21 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:4 order:4
desc:"The TableView control provides a flexible way to display a collection of data in rows and columns" desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
onTap:{ url:"qrc:/example/qml/page/T_TableView.qml"
navigationView.push("qrc:/example/qml/page/T_TableView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Pagination" title:"Pagination"
onTap:{ url:"qrc:/example/qml/page/T_Pagination.qml"
navigationView.push("qrc:/example/qml/page/T_Pagination.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"MultiWindow" title:"MultiWindow"
onTap:{ url:"qrc:/example/qml/page/T_MultiWindow.qml"
navigationView.push("qrc:/example/qml/page/T_MultiWindow.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"FlipView" title:"FlipView"
@ -321,9 +326,9 @@ FluObject{
recentlyAdded:true recentlyAdded:true
order:2 order:2
desc:"Presents a collection of items that the user canflip through, one item at a time." desc:"Presents a collection of items that the user canflip through, one item at a time."
onTap:{ url:"qrc:/example/qml/page/T_FlipView.qml"
navigationView.push("qrc:/example/qml/page/T_FlipView.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -332,27 +337,27 @@ FluObject{
icon:FluentIcons.Brightness icon:FluentIcons.Brightness
FluPaneItem{ FluPaneItem{
title:"Acrylic" title:"Acrylic"
onTap:{ url:"qrc:/example/qml/page/T_Acrylic.qml"
navigationView.push("qrc:/example/qml/page/T_Acrylic.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Theme" title:"Theme"
onTap:{ url:"qrc:/example/qml/page/T_Theme.qml"
navigationView.push("qrc:/example/qml/page/T_Theme.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Typography" title:"Typography"
onTap:{ url:"qrc:/example/qml/page/T_Typography.qml"
navigationView.push("qrc:/example/qml/page/T_Typography.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Awesome" title:"Awesome"
onTap:{ url:"qrc:/example/qml/page/T_Awesome.qml"
navigationView.push("qrc:/example/qml/page/T_Awesome.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
} }
@ -366,45 +371,45 @@ FluObject{
icon:FluentIcons.Shop icon:FluentIcons.Shop
FluPaneItem{ FluPaneItem{
title:"QRCode" title:"QRCode"
onTap:{ url:"qrc:/example/qml/page/T_QRCode.qml"
navigationView.push("qrc:/example/qml/page/T_QRCode.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Tour" title:"Tour"
onTap:{ url:"qrc:/example/qml/page/T_Tour.qml"
navigationView.push("qrc:/example/qml/page/T_Tour.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Timeline" title:"Timeline"
onTap:{ url:"qrc:/example/qml/page/T_Timeline.qml"
navigationView.push("qrc:/example/qml/page/T_Timeline.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Screenshot" title:"Screenshot"
onTap:{ url:"qrc:/example/qml/page/T_Screenshot.qml"
navigationView.push("qrc:/example/qml/page/T_Screenshot.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Captcha" title:"Captcha"
onTap:{ url:"qrc:/example/qml/page/T_Captcha.qml"
navigationView.push("qrc:/example/qml/page/T_Captcha.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Chart" title:"Chart"
onTap:{ url:"qrc:/example/qml/page/T_Chart.qml"
navigationView.push("qrc:/example/qml/page/T_Chart.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
title:"Http" title:"Http"
onTap:{ url:"qrc:/example/qml/page/T_Http.qml"
navigationView.push("qrc:/example/qml/page/T_Http.qml") onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
} onTap:{ navigationView.push(url) }
} }
FluPaneItem{ FluPaneItem{
id:item_other id:item_other
@ -414,6 +419,8 @@ FluObject{
count: item_other.count count: item_other.count
color: Qt.rgba(82/255,196/255,26/255,1) color: Qt.rgba(82/255,196/255,26/255,1)
} }
url:"qrc:/example/qml/page/T_RemoteLoader.qml"
onDropped:{ FluApp.navigate("/pageWindow",{title:title,url:url}) }
onTap:{ onTap:{
item_other.count = 0 item_other.count = 0
navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml") navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml")
@ -421,9 +428,10 @@ FluObject{
} }
FluPaneItem{ FluPaneItem{
title:"HotLoader" title:"HotLoader"
tapFunc:function(){ onTapListener:function(){
FluApp.navigate("/hotload") FluApp.navigate("/hotload")
} }
onDropped:{ FluApp.navigate("/hotload") }
} }
} }

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -6,6 +6,7 @@ import QtQuick.Controls 2.15
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluContentPage{ FluContentPage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -3,6 +3,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -5,6 +5,7 @@ import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import QtGraphicalEffects 1.15 import QtGraphicalEffects 1.15
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage { FluScrollablePage {

View File

@ -4,6 +4,7 @@ import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluPage{ FluPage{
launchMode: FluPageType.SingleTop launchMode: FluPageType.SingleTop

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -5,6 +5,7 @@ import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/global" import "qrc:///example/qml/global"
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -3,6 +3,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluContentPage{ FluContentPage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage{ FluScrollablePage{

View File

@ -4,6 +4,7 @@ import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluScrollablePage { FluScrollablePage {

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
FluContentPage{ FluContentPage{

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import FluentUI 1.0 import FluentUI 1.0
import example 1.0 import example 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -3,6 +3,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -6,6 +6,7 @@ import Qt.labs.platform 1.1
import FluentUI 1.0 import FluentUI 1.0
import example 1.0 import example 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
import "qrc:///example/qml/global" import "qrc:///example/qml/global"
CustomWindow { CustomWindow {

View File

@ -0,0 +1,26 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import example 1.0
import "qrc:///example/qml/component"
import "../component"
CustomWindow {
id:window
width: 800
height: 600
minimumWidth: 520
minimumHeight: 200
launchMode: FluWindowType.SingleInstance
onInitArgument:
(arg)=>{
window.title = arg.title
loader.setSource( arg.url,{animDisabled:true})
}
Loader{
id: loader
anchors.fill: parent
}
}

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import FluentUI 1.0 import FluentUI 1.0
import "qrc:///example/qml/component" import "qrc:///example/qml/component"
import "../component"
CustomWindow { CustomWindow {

View File

@ -184,5 +184,6 @@
<file>qml/window/StandardWindow.qml</file> <file>qml/window/StandardWindow.qml</file>
<file>res/image/bg_scenic.png</file> <file>res/image/bg_scenic.png</file>
<file>res/image/image_1.jpg</file> <file>res/image/image_1.jpg</file>
<file>qml/window/PageWindow.qml</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow); FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
#ifdef Q_OS_WIN // 此设置仅在Windows下生效 #ifdef Q_OS_WIN // 此设置仅在Windows下生效
FramelessConfig::instance()->set(Global::Option::ForceHideWindowFrameBorder); FramelessConfig::instance()->set(Global::Option::ForceHideWindowFrameBorder);
FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,false); FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow,true);
#endif #endif
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false); FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false);

View File

@ -170,7 +170,8 @@ Item {
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
onClicked: function(mouse){ onClicked:
(mouse) =>{
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
if(model.menuDelegate){ if(model.menuDelegate){
loader_item_menu.sourceComponent = model.menuDelegate loader_item_menu.sourceComponent = model.menuDelegate
@ -180,7 +181,6 @@ Item {
} }
z:-100 z:-100
} }
onClicked: { onClicked: {
if(d.isCompactAndNotPanel){ if(d.isCompactAndNotPanel){
control_popup.showPopup(Qt.point(50,mapToItem(control,0,0).y),model.children) control_popup.showPopup(Qt.point(50,mapToItem(control,0,0).y),model.children)
@ -393,34 +393,59 @@ Item {
} }
width: layout_list.width width: layout_list.width
FluControl{ FluControl{
property var modelData: model
id:item_control id:item_control
anchors{ width: layout_list.width - 12
top: parent.top height: 34
bottom: parent.bottom x:6
left: parent.left y:2
right: parent.right Drag.active: item_mouse.drag.active
topMargin: 2 Drag.hotSpot.x: item_control.width / 2
bottomMargin: 2 Drag.hotSpot.y: item_control.height / 2
leftMargin: 6 Drag.dragType: Drag.Automatic
rightMargin: 6 states: [
State {
when: item_mouse.drag.active
ParentChange {
target: item_control
parent: control
} }
AnchorChanges {
target: item_control
anchors {
horizontalCenter: undefined
verticalCenter: undefined
}
}
}
]
MouseArea{ MouseArea{
id:item_mouse
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton | Qt.LeftButton
onClicked: function(mouse){ drag.target: item_control
onPositionChanged: {
parent.grabToImage(function(result) {
parent.Drag.imageSource = result.url;
})
}
drag.onActiveChanged:
if (active) {
parent.grabToImage(function(result) {
parent.Drag.imageSource = result.url;
})
}
onClicked:
(mouse)=>{
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
if(model.menuDelegate){ if(model.menuDelegate){
loader_item_menu.sourceComponent = model.menuDelegate loader_item_menu.sourceComponent = model.menuDelegate
loader_item_menu.item.popup(); loader_item_menu.item.popup();
} }
} }else{
}
z:-100
}
onClicked: {
if(type === 0){ if(type === 0){
if(model.tapFunc){ if(model.onTapListener){
model.tapFunc() model.onTapListener()
}else{ }else{
nav_list.currentIndex = _idx nav_list.currentIndex = _idx
layout_footer.currentIndex = -1 layout_footer.currentIndex = -1
@ -430,8 +455,8 @@ Item {
} }
} }
}else{ }else{
if(model.tapFunc){ if(model.onTapListener){
model.tapFunc() model.onTapListener()
}else{ }else{
nav_list.currentIndex = nav_list.count-layout_footer.count+_idx nav_list.currentIndex = nav_list.count-layout_footer.count+_idx
layout_footer.currentIndex = _idx layout_footer.currentIndex = _idx
@ -442,6 +467,8 @@ Item {
} }
} }
} }
}
}
Rectangle{ Rectangle{
radius: 4 radius: 4
anchors.fill: parent anchors.fill: parent
@ -518,7 +545,7 @@ Item {
} }
elide: Text.ElideRight elide: Text.ElideRight
color:{ color:{
if(item_control.pressed){ if(item_mouse.pressed){
return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120 return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
} }
return FluTheme.dark ? FluColors.White : FluColors.Grey220 return FluTheme.dark ? FluColors.White : FluColors.Grey220
@ -745,7 +772,13 @@ Item {
} }
} }
} }
DropArea{
anchors.fill: loader_content
onDropped:
(drag)=>{
drag.source.modelData.dropped(drag)
}
}
Loader{ Loader{
id:loader_content id:loader_content
anchors{ anchors{
@ -880,6 +913,12 @@ Item {
ListView{ ListView{
id:nav_list id:nav_list
clip: true clip: true
displaced: Transition {
NumberAnimation {
properties: "x,y"
easing.type: Easing.OutQuad
}
}
anchors.fill: parent anchors.fill: parent
model:d.handleItems() model:d.handleItems()
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
@ -899,7 +938,6 @@ Item {
} }
} }
currentIndex: -1 currentIndex: -1
delegate: Loader{ delegate: Loader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
@ -1051,8 +1089,8 @@ Item {
} }
} }
onClicked: { onClicked: {
if(modelData.tapFunc){ if(modelData.onTapListener){
modelData.tapFunc() modelData.onTapListener()
}else{ }else{
modelData.tap() modelData.tap()
nav_list.currentIndex = _idx nav_list.currentIndex = _idx

View File

@ -9,6 +9,7 @@ QtObject {
property string title property string title
property int order : 0 property int order : 0
property int icon property int icon
property var url
property Component cusIcon property Component cusIcon
property Component infoBadge property Component infoBadge
property bool recentlyAdded: false property bool recentlyAdded: false
@ -18,8 +19,9 @@ QtObject {
property var parent property var parent
property int count: 0 property int count: 0
signal tap signal tap
property var tapFunc property var onTapListener
property Component menuDelegate property Component menuDelegate
property Component editDelegate property Component editDelegate
property bool showEdit property bool showEdit
signal dropped(var drag)
} }

View File

@ -171,7 +171,8 @@ Item {
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
onClicked: function(mouse){ onClicked:
(mouse) =>{
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
if(model.menuDelegate){ if(model.menuDelegate){
loader_item_menu.sourceComponent = model.menuDelegate loader_item_menu.sourceComponent = model.menuDelegate
@ -181,7 +182,6 @@ Item {
} }
z:-100 z:-100
} }
onClicked: { onClicked: {
if(d.isCompactAndNotPanel){ if(d.isCompactAndNotPanel){
control_popup.showPopup(Qt.point(50,mapToItem(control,0,0).y),model.children) control_popup.showPopup(Qt.point(50,mapToItem(control,0,0).y),model.children)
@ -394,34 +394,59 @@ Item {
} }
width: layout_list.width width: layout_list.width
FluControl{ FluControl{
property var modelData: model
id:item_control id:item_control
anchors{ width: layout_list.width - 12
top: parent.top height: 34
bottom: parent.bottom x:6
left: parent.left y:2
right: parent.right Drag.active: item_mouse.drag.active
topMargin: 2 Drag.hotSpot.x: item_control.width / 2
bottomMargin: 2 Drag.hotSpot.y: item_control.height / 2
leftMargin: 6 Drag.dragType: Drag.Automatic
rightMargin: 6 states: [
State {
when: item_mouse.drag.active
ParentChange {
target: item_control
parent: control
} }
AnchorChanges {
target: item_control
anchors {
horizontalCenter: undefined
verticalCenter: undefined
}
}
}
]
MouseArea{ MouseArea{
id:item_mouse
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton | Qt.LeftButton
onClicked: function(mouse){ drag.target: item_control
onPositionChanged: {
parent.grabToImage(function(result) {
parent.Drag.imageSource = result.url;
})
}
drag.onActiveChanged:
if (active) {
parent.grabToImage(function(result) {
parent.Drag.imageSource = result.url;
})
}
onClicked:
(mouse)=>{
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
if(model.menuDelegate){ if(model.menuDelegate){
loader_item_menu.sourceComponent = model.menuDelegate loader_item_menu.sourceComponent = model.menuDelegate
loader_item_menu.item.popup(); loader_item_menu.item.popup();
} }
} }else{
}
z:-100
}
onClicked: {
if(type === 0){ if(type === 0){
if(model.tapFunc){ if(model.onTapListener){
model.tapFunc() model.onTapListener()
}else{ }else{
nav_list.currentIndex = _idx nav_list.currentIndex = _idx
layout_footer.currentIndex = -1 layout_footer.currentIndex = -1
@ -431,8 +456,8 @@ Item {
} }
} }
}else{ }else{
if(model.tapFunc){ if(model.onTapListener){
model.tapFunc() model.onTapListener()
}else{ }else{
nav_list.currentIndex = nav_list.count-layout_footer.count+_idx nav_list.currentIndex = nav_list.count-layout_footer.count+_idx
layout_footer.currentIndex = _idx layout_footer.currentIndex = _idx
@ -443,6 +468,8 @@ Item {
} }
} }
} }
}
}
Rectangle{ Rectangle{
radius: 4 radius: 4
anchors.fill: parent anchors.fill: parent
@ -519,7 +546,7 @@ Item {
} }
elide: Text.ElideRight elide: Text.ElideRight
color:{ color:{
if(item_control.pressed){ if(item_mouse.pressed){
return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120 return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
} }
return FluTheme.dark ? FluColors.White : FluColors.Grey220 return FluTheme.dark ? FluColors.White : FluColors.Grey220
@ -736,7 +763,7 @@ Item {
id:nav_stack2 id:nav_stack2
anchors.fill: nav_stack anchors.fill: nav_stack
clip: true clip: true
visible: nav_stack.currentItem?.launchMode === FluPageType.SingleInstance visible: FluPageType.SingleInstance === nav_stack.currentItem.launchMode
} }
function navStack(){ function navStack(){
return nav_stack return nav_stack
@ -746,7 +773,13 @@ Item {
} }
} }
} }
DropArea{
anchors.fill: loader_content
onDropped:
(drag)=>{
drag.source.modelData.dropped(drag)
}
}
Loader{ Loader{
id:loader_content id:loader_content
anchors{ anchors{
@ -881,6 +914,12 @@ Item {
ListView{ ListView{
id:nav_list id:nav_list
clip: true clip: true
displaced: Transition {
NumberAnimation {
properties: "x,y"
easing.type: Easing.OutQuad
}
}
anchors.fill: parent anchors.fill: parent
model:d.handleItems() model:d.handleItems()
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
@ -900,7 +939,6 @@ Item {
} }
} }
currentIndex: -1 currentIndex: -1
delegate: Loader{ delegate: Loader{
property var model: modelData property var model: modelData
property var _idx: index property var _idx: index
@ -1052,8 +1090,8 @@ Item {
} }
} }
onClicked: { onClicked: {
if(modelData.tapFunc){ if(modelData.onTapListener){
modelData.tapFunc() modelData.onTapListener()
}else{ }else{
modelData.tap() modelData.tap()
nav_list.currentIndex = _idx nav_list.currentIndex = _idx

View File

@ -9,6 +9,7 @@ QtObject {
property string title property string title
property int order : 0 property int order : 0
property int icon property int icon
property var url
property Component cusIcon property Component cusIcon
property Component infoBadge property Component infoBadge
property bool recentlyAdded: false property bool recentlyAdded: false
@ -18,8 +19,9 @@ QtObject {
property var parent property var parent
property int count: 0 property int count: 0
signal tap signal tap
property var tapFunc property var onTapListener
property Component menuDelegate property Component menuDelegate
property Component editDelegate property Component editDelegate
property bool showEdit property bool showEdit
signal dropped(var drag)
} }