amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-02 08:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2023-03-24 20:44:38 +08:00
parent 6d809efd4b
commit d2d2e97d28
81 changed files with 215 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/controls/FluAppBar.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
import FluentUI
Rectangle{
@ -15,11 +15,10 @@ Rectangle{
}
visible: FluTheme.isFrameless
height: visible ? 34 : 0
width: {
if(parent==null)
return 200
return parent.width
if(root.parent)
return root.parent.width
return 200
}
z: 65535
clip: true

4
src/controls/FluArea.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Rectangle {
radius: 4

6
src/controls/FluAutoSuggestBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
TextField{

2
src/controls/FluBadge.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
Rectangle{

6
src/controls/FluButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
Button {

10
src/controls/FluCalendarPicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Window
import FluentUI
Rectangle {

6
src/controls/FluCalendarView.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
Item {

6
src/controls/FluCarousel.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
Item {

8
src/controls/FluCheckBox.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
Button {

10
src/controls/FluColorPicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Window
import FluentUI
Button{

2
src/controls/FluColorView.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import "../colorpicker"
Item {

4
src/controls/FluComboBox.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Item {

8
src/controls/FluContentDialog.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick.Window 2.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Window
Popup {
id: popup

10
src/controls/FluContentPage.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Layouts
import QtQuick.Window
import QtQuick.Controls
import FluentUI
Item {

10
src/controls/FluDatePicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Window
import FluentUI
Rectangle {

4
src/controls/FluDivider.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Rectangle {

8
src/controls/FluDropDownButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Window 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Window
import FluentUI
Button {

4
src/controls/FluExpander.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Item {

6
src/controls/FluFilledButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
Button {
id: control

6
src/controls/FluFocusRectangle.qml
View File

@ -1,12 +1,12 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Item {
id:root
anchors.fill: parent
anchors.margins: -3
property var radius: 4
property int radius: 4
Rectangle{
width: root.width

2
src/controls/FluIcon.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
Text {

6
src/controls/FluIconButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
Button {

5
src/controls/FluInfoBar.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
FluObject {
id:infoBar

30
src/controls/FluMediaPlayer.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtMultimedia 5.15
import QtGraphicalEffects 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtMultimedia
import Qt5Compat.GraphicalEffects
import FluentUI
Item {
id:control
@ -20,30 +20,30 @@ Item {
MediaPlayer {
id: mediaplayer
property bool autoSeek:true
autoPlay: true
source: control.source
onError: {
console.debug(error)
videoOutput: video_output
onErrorOccurred: {
}
onPositionChanged: {
if(autoSeek){
slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration)
}
}
onStatusChanged: {
if(status===6){
onMediaStatusChanged: {
if(mediaStatus===6){
slider.maxValue = mediaplayer.duration
}
}
}
onSourceChanged: {
slider.seek(0)
slider.seek(0)
mediaplayer.play()
}
VideoOutput {
id:video_output
anchors.fill: parent
source: mediaplayer
}
Item{
@ -78,7 +78,7 @@ Item {
mediaplayer.autoSeek = false
}
onReleased: {
mediaplayer.seek(value*mediaplayer.duration/slider.maxValue)
mediaplayer.position = value*mediaplayer.duration/slider.maxValue
mediaplayer.autoSeek = true
}
}
@ -106,14 +106,14 @@ Item {
FluIconButton{
iconSize: 15
iconSource: mediaplayer.playbackState === Audio.PlayingState ? FluentIcons.Pause : FluentIcons.Play
iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ? FluentIcons.Pause : FluentIcons.Play
anchors{
horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
bottomMargin: 10
}
onClicked: {
if(mediaplayer.playbackState === Audio.PlayingState){
if(mediaplayer.playbackState === MediaPlayer.PlayingState){
mediaplayer.pause()
}else{
mediaplayer.play()

8
src/controls/FluMenu.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
Menu {
id: popup

4
src/controls/FluMenuItem.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
Item {

6
src/controls/FluMultiLineTextBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
TextArea{

11
src/controls/FluNavigationView.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Window
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
Item {

4
src/controls/FluObject.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Controls
QtObject {
id:flu_object;
default property list<QtObject> children;
}

3
src/controls/FluPaneItem.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Controls
QtObject {
property string title

3
src/controls/FluPaneItemHeader.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Controls
QtObject {
property string title

3
src/controls/FluPaneItemSeparator.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Controls
QtObject {

8
src/controls/FluProgressBar.qml
View File

@ -1,12 +1,12 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
FluRectangle {
id: control
width: 150
height: 5
radius: [3,3,3,3]
radius: [2.5,2.5,2.5,2.5]
clip: true
color: FluTheme.isDark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1)
property real progress: 0.5
@ -24,7 +24,7 @@ FluRectangle {
Rectangle{
id:bar
radius: 3
radius: 2.5
width: control.width*progress
height: control.height
color:FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

5
src/controls/FluProgressRing.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Controls
Rectangle {
id: control

8
src/controls/FluRadioButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
Button {

6
src/controls/FluRectangle.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
Item{
id:root

6
src/controls/FluScrollBar.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
ScrollBar {

10
src/controls/FluScrollablePage.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Layouts
import QtQuick.Window
import QtQuick.Controls
import FluentUI
Item {

2
src/controls/FluShadow.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
Item {
id:root

22
src/controls/FluSlider.qml
View File

@ -1,12 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Controls
Item{
id:root
property int lineSize: 4
property int size: 180
property int dotSize: 24
@ -38,19 +36,18 @@ Item{
seek(0)
}
FluRectangle {
Rectangle {
id: control
width: isHorizontal ? size : root.lineSize
height: isHorizontal ? root.lineSize : size
radius: [3,3,3,3]
clip: true
width: isHorizontal ? size : 4
height: isHorizontal ? 4 : size
radius: 2
anchors.verticalCenter: parent.verticalCenter
color:FluTheme.isDark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
Rectangle{
id:rect
radius: 3
width: isHorizontal ? control.width*(value/maxValue) : control.width
height: isHorizontal ? control.height : control.height*(value/maxValue)
radius: 2.5
width: isHorizontal ? control.width*(value/maxValue) : 5
height: isHorizontal ? 5 : control.height*(value/maxValue)
color:FluTheme.isDark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
}
}
@ -112,7 +109,6 @@ Item{
}
function seek(position){
console.debug(position)
if(isHorizontal){
dot.x =position/maxValue*control.width - dotSize/2
root.value = Qt.binding(function(){

4
src/controls/FluText.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import FluentUI
Text {

6
src/controls/FluTextBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
TextField{

4
src/controls/FluTextBoxBackground.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import QtGraphicalEffects 1.15
import QtQuick
import Qt5Compat.GraphicalEffects
Rectangle{
id:content

10
src/controls/FluTimePicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Window
import FluentUI
Rectangle {

8
src/controls/FluToggleSwitch.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 2.0
import FluentUI 1.0
import QtQuick.Layouts 1.15
import QtQuick
import QtQuick.Controls
import FluentUI
import QtQuick.Layouts
Button {

7
src/controls/FluTooltip.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
ToolTip {
id:tool_tip

11
src/controls/FluTreeView.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import FluentUI 1.0
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
import QtQuick.Controls
import FluentUI
Item {
id:root

18
src/controls/FluWindow.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
import QtGraphicalEffects 1.15
import QtQuick
import QtQuick.Controls
import QtQuick.Window
import QtQuick.Layouts
import FluentUI
Item {
@ -127,19 +127,19 @@ Item {
root: root
}
function showSuccess(text,duration,moremsg){
function showSuccess(text,duration=1000,moremsg){
infoBar.showSuccess(text,duration,moremsg);
}
function showInfo(text,duration,moremsg){
function showInfo(text,duration=1000,moremsg){
infoBar.showInfo(text,duration,moremsg);
}
function showWarning(text,duration,moremsg){
function showWarning(text,duration=1000,moremsg){
infoBar.showWarning(text,duration,moremsg);
}
function showError(text,duration,moremsg){
function showError(text,duration=1000,moremsg){
infoBar.showError(text,duration,moremsg);
}

4
src/controls/FluWindowResize.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick
import QtQuick.Window
MouseArea {

7
src/controls/TFpsMonitor.qml
View File

@ -1,8 +1,7 @@
import QtQuick 2.15
import FluentUI 1.0
import QtQuick
import QtQuick.Controls
import FluentUI
/*! TODO */
Item {
id: toou2d_fps
width: contentItemLoader.width + 5;