amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-03-15 00:19:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: amass:bc4510077f04c1df8f1df64f1b3a2d2595312f3b
Branches Tags
amass:main
amass:1.7.7
amass:1.7.6
amass:1.7.5
amass:1.7.4
amass:1.7.3
amass:1.7.2
amass:1.7.1
amass:1.7.0
amass:1.6.9
amass:1.6.8
amass:1.6.7
amass:1.6.6
amass:1.6.5
amass:1.6.4
amass:1.6.3
amass:1.6.2
amass:1.6.1
amass:1.6.0
amass:1.5.9
amass:1.5.8
amass:1.5.7
amass:1.5.6
amass:1.5.5
amass:1.5.4
amass:1.5.3
amass:1.5.2
amass:1.5.1
amass:1.5.0
amass:1.4.0
amass:1.3.7.4
amass:1.3.7.3
amass:1.3.7.2
amass:1.3.7.1
amass:1.3.7.0
amass:1.3.6.2
amass:1.3.6.1
amass:1.3.6
amass:1.3.5.1
amass:1.3.5
amass:1.3.4
amass:1.3.3
amass:1.3.2.1
amass:1.3.2
amass:1.3.1
amass:1.3.0
amass:1.2.9
amass:1.2.8
amass:1.2.7
amass:1.2.6
amass:1.2.5
amass:1.2.4
amass:1.2.3
amass:1.2.2
amass:1.2.1
amass:1.2.0
amass:1.1.9
amass:1.1.8
amass:1.1.7
amass:1.1.6
amass:1.1.5
amass:1.1.4
amass:1.1.3
amass:1.1.2
amass:1.1.1
amass:1.1.0
amass:1.0.9
amass:1.0.8
amass:1.0.7
amass:1.0.6
amass:1.0.5
amass:1.0.4
amass:1.0.3
amass:1.0.2
amass:1.0.1
amass:1.0.0
..
compare: amass:8fe4e3b0476605a0e3f2f5c8d977300cc021f237
Branches Tags
amass:main
amass:1.7.7
amass:1.7.6
amass:1.7.5
amass:1.7.4
amass:1.7.3
amass:1.7.2
amass:1.7.1
amass:1.7.0
amass:1.6.9
amass:1.6.8
amass:1.6.7
amass:1.6.6
amass:1.6.5
amass:1.6.4
amass:1.6.3
amass:1.6.2
amass:1.6.1
amass:1.6.0
amass:1.5.9
amass:1.5.8
amass:1.5.7
amass:1.5.6
amass:1.5.5
amass:1.5.4
amass:1.5.3
amass:1.5.2
amass:1.5.1
amass:1.5.0
amass:1.4.0
amass:1.3.7.4
amass:1.3.7.3
amass:1.3.7.2
amass:1.3.7.1
amass:1.3.7.0
amass:1.3.6.2
amass:1.3.6.1
amass:1.3.6
amass:1.3.5.1
amass:1.3.5
amass:1.3.4
amass:1.3.3
amass:1.3.2.1
amass:1.3.2
amass:1.3.1
amass:1.3.0
amass:1.2.9
amass:1.2.8
amass:1.2.7
amass:1.2.6
amass:1.2.5
amass:1.2.4
amass:1.2.3
amass:1.2.2
amass:1.2.1
amass:1.2.0
amass:1.1.9
amass:1.1.8
amass:1.1.7
amass:1.1.6
amass:1.1.5
amass:1.1.4
amass:1.1.3
amass:1.1.2
amass:1.1.1
amass:1.1.0
amass:1.0.9
amass:1.0.8
amass:1.0.7
amass:1.0.6
amass:1.0.5
amass:1.0.4
amass:1.0.3
amass:1.0.2
amass:1.0.1
amass:1.0.0

No commits in common. "bc4510077f04c1df8f1df64f1b3a2d2595312f3b" and "8fe4e3b0476605a0e3f2f5c8d977300cc021f237" have entirely different histories.
bc4510077f ... 8fe4e3b047

17 changed files with 1897 additions and 1907 deletions
Show Stats Expand all files Collapse all files

40
example/example_en_US.ts
View File

@ -1089,6 +1089,46 @@ Updated content:
<source>Click to Select a Color - &gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="22"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="23"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="24"/>
<source>Color Picker</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="25"/>
<source>Edit Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="26"/>
<source>Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="27"/>
<source>Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="28"/>
<source>Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="29"/>
<source>Opacity</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>T_ComboBox</name>

24
example/example_zh_CN.ts
View File

@ -1113,36 +1113,44 @@ Updated content:
<translation type="unfinished">点击选中颜色 - &gt;</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="22"/>
<source>Cancel</source>
<translation type="obsolete">取消</translation>
<translation type="unfinished">取消</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="23"/>
<source>OK</source>
<translation type="obsolete">确定</translation>
<translation type="unfinished">确定</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="24"/>
<source>Color Picker</source>
<translation type="obsolete">颜色选择器</translation>
<translation type="unfinished">颜色选择器</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="25"/>
<source>Edit Color</source>
<translation type="obsolete">编辑颜色</translation>
<translation type="unfinished">编辑颜色</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="26"/>
<source>Red</source>
<translation type="obsolete">红色</translation>
<translation type="unfinished">红色</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="27"/>
<source>Green</source>
<translation type="obsolete">绿色</translation>
<translation type="unfinished">绿色</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="28"/>
<source>Blue</source>
<translation type="obsolete">蓝色</translation>
<translation type="unfinished">蓝色</translation>
</message>
<message>
<location filename="qml/page/T_ColorPicker.qml" line="29"/>
<source>Opacity</source>
<translation type="obsolete">透明度</translation>
<translation type="unfinished">透明度</translation>
</message>
</context>
<context>

11
example/qml/page/T_ColorPicker.qml
View File

@ -18,7 +18,16 @@ FluScrollablePage{
text: qsTr("Click to Select a Color - >")
Layout.alignment: Qt.AlignVCenter
}
FluColorPicker{}
FluColorPicker{
cancelText: qsTr("Cancel")
okText: qsTr("OK")
titleText: qsTr("Color Picker")
editText: qsTr("Edit Color")
redText: qsTr("Red")
greenText: qsTr("Green")
blueText: qsTr("Blue")
opacityText: qsTr("Opacity")
}
}
}
CodeExpander{

21
src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
View File

@ -53,6 +53,8 @@ FluButton {
}
Menu{
id:popup
height: container.height
width: container.width
modal: true
Overlay.modal: Item {}
enter: Transition {
@ -73,9 +75,13 @@ FluButton {
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitWidth: 300
implicitHeight: 360
width: 300
height: 360
radius: 4
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
ColumnLayout {
anchors.fill: parent
spacing: 0
@ -605,23 +611,22 @@ FluButton {
}
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
}
background: Item{
FluShadow{
radius: 5
radius: 4
}
}
function showPopup() {
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height - 1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {
popup.y = d.window.height-(pos.y+container.height)
}
popup.x = -(popup.width-control.width)/2
popup.open()
}
}

19
src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml
View File

@ -13,15 +13,16 @@ Button{
property color current : Qt.rgba(1,1,1,1)
signal accepted()
property int colorHandleRadius: 8
property string cancelText: qsTr("Cancel")
property string okText: qsTr("OK")
property string titleText: qsTr("Color Picker")
property string editText: qsTr("Edit Color")
property string redText: qsTr("Red")
property string greenText: qsTr("Green")
property string blueText: qsTr("Blue")
property string opacityText: qsTr("Opacity")
background: Rectangle{
property string cancelText: "取消"
property string okText: "确定"
property string titleText: "颜色选择器"
property string editText: "编辑颜色"
property string redText: "红色"
property string greenText: "绿色"
property string blueText: "蓝色"
property string opacityText: "透明度"
background:
Rectangle{
id:layout_color
radius: 5
color:"#00000000"

5
src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -134,9 +134,10 @@ T.ComboBox {
}
}
background:Rectangle{
color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1)
border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
border.width: 1
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
FluShadow{
radius: 5
}

64
src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import FluentUI 1.0
FluButton {
property bool showYear: true
property var current
@ -95,6 +96,8 @@ FluButton {
Menu{
id:popup
modal: true
width: container.width
height: container.height
Overlay.modal: Item {}
enter: Transition {
reversible: true
@ -113,26 +116,30 @@ FluButton {
duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
background:Item{
FluShadow{
radius: 5
radius: 4
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitHeight: 340
implicitWidth: 300
radius: 4
width: 300
height: 340
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
MouseArea{
anchors.fill: parent
}
FluShadow{
radius: 4
}
RowLayout{
id:layout_content
spacing: 0
width: parent.width
height: 280
height: 300
Component{
id:list_delegate
Item{
@ -159,7 +166,7 @@ FluButton {
if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
}
return Qt.rgba(0,0,0,0)
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
}
radius: 3
MouseArea{
@ -207,9 +214,8 @@ FluButton {
}
ListView{
id:list_view_1
Layout.preferredWidth: 100
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: 100
height: parent.height
boundsBehavior:Flickable.StopAtBounds
ScrollBar.vertical: FluScrollBar {}
model: generateYearArray(1924,2048)
@ -226,16 +232,14 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
visible: showYear
}
ListView{
id:list_view_2
Layout.preferredWidth: showYear ? 99 : 150
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: showYear ? 100 : 150
height: parent.height
clip: true
ScrollBar.vertical: FluScrollBar {}
preferredHighlightBegin: 0
@ -250,20 +254,20 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
}
ListView{
id:list_view_3
Layout.preferredWidth: showYear ? 99 : 150
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: showYear ? 100 : 150
height: parent.height
clip: true
preferredHighlightBegin: 0
preferredHighlightEnd: 0
highlightMoveDuration: 0
ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds
delegate: FluLoader{
property var model: modelData
@ -273,12 +277,17 @@ FluButton {
}
}
}
Rectangle{
width: parent.width
height: 1
anchors.top: layout_content.bottom
color: control.dividerColor
}
Rectangle{
id:layout_actions
height: 60
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
height: 40
radius: 5
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
anchors{
bottom:parent.bottom
left: parent.left
@ -331,6 +340,7 @@ FluButton {
}
}
}
}
y:35
function showPopup() {
d.changeFlag = true
@ -351,7 +361,7 @@ FluButton {
text_day.text = day
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height-1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {

6
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -778,9 +778,9 @@ Rectangle {
timer_vertical_force_layout.restart()
}
Connections{
target: table_view
function onRowsChanged(){
header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1}))
target: table_model
function onRowCountChanged(){
header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1}))
}
}
Timer{

53
src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
View File

@ -111,6 +111,8 @@ FluButton {
}
Menu{
id:popup
width: container.width
height: container.height
modal: true
Overlay.modal: Item {}
enter: Transition {
@ -130,18 +132,19 @@ FluButton {
duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
background:Item{
FluShadow{
radius: 5
radius: 4
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitHeight: 340
implicitWidth: 300
height: 340
width: 300
radius: 4
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
MouseArea{
anchors.fill: parent
}
@ -149,7 +152,7 @@ FluButton {
id:layout_content
spacing: 0
width: parent.width
height: 280
height: 300
Component{
id:list_delegate
Item{
@ -176,7 +179,7 @@ FluButton {
if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
}
return Qt.rgba(0,0,0,0)
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
}
radius: 3
MouseArea{
@ -216,9 +219,8 @@ FluButton {
}
ListView{
id:list_view_1
Layout.preferredWidth: isH ? 100 : 150
Layout.preferredHeight: parent.height-2
Layout.alignment: Qt.AlignVCenter
width: isH ? 100 : 150
height: parent.height
boundsBehavior:Flickable.StopAtBounds
ScrollBar.vertical: FluScrollBar {}
preferredHighlightBegin: 0
@ -234,15 +236,14 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
}
ListView{
id:list_view_2
Layout.preferredWidth: isH ? 99 : 150
Layout.preferredHeight: parent.height-2
Layout.alignment: Qt.AlignVCenter
width: isH ? 100 : 150
height: parent.height
model: generateArray(0,59)
clip: true
preferredHighlightBegin: 0
@ -265,8 +266,8 @@ FluButton {
}
ListView{
id:list_view_3
Layout.preferredWidth: 100
Layout.preferredHeight: 76
width: 100
height: 76
model: [control.amText,control.pmText]
clip: true
visible: isH
@ -284,12 +285,17 @@ FluButton {
}
}
}
Rectangle{
width: parent.width
height: 1
anchors.top: layout_content.bottom
color: control.dividerColor
}
Rectangle{
id:layout_actions
height: 60
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
height: 40
radius: 5
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
anchors{
bottom:parent.bottom
left: parent.left
@ -347,6 +353,7 @@ FluButton {
}
}
}
}
y:35
function showPopup() {
d.changeFlag = true
@ -380,7 +387,7 @@ FluButton {
}
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height-1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {

21
src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
View File

@ -52,6 +52,8 @@ FluButton {
}
Menu{
id:popup
height: container.height
width: container.width
modal: true
Overlay.modal: Item {}
enter: Transition {
@ -72,9 +74,13 @@ FluButton {
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitWidth: 300
implicitHeight: 360
width: 300
height: 360
radius: 4
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
ColumnLayout {
anchors.fill: parent
spacing: 0
@ -604,23 +610,22 @@ FluButton {
}
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
}
background: Item{
FluShadow{
radius: 5
radius: 4
}
}
function showPopup() {
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height - 1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {
popup.y = d.window.height-(pos.y+container.height)
}
popup.x = -(popup.width-control.width)/2
popup.open()
}
}

19
src/Qt6/imports/FluentUI/Controls/FluColorPicker.qml
View File

@ -13,15 +13,16 @@ Button{
property color current : Qt.rgba(1,1,1,1)
signal accepted()
property int colorHandleRadius: 8
property string cancelText: qsTr("Cancel")
property string okText: qsTr("OK")
property string titleText: qsTr("Color Picker")
property string editText: qsTr("Edit Color")
property string redText: qsTr("Red")
property string greenText: qsTr("Green")
property string blueText: qsTr("Blue")
property string opacityText: qsTr("Opacity")
background: Rectangle{
property string cancelText: "取消"
property string okText: "确定"
property string titleText: "颜色选择器"
property string editText: "编辑颜色"
property string redText: "红色"
property string greenText: "绿色"
property string blueText: "蓝色"
property string opacityText: "透明度"
background:
Rectangle{
id:layout_color
radius: 5
color:"#00000000"

5
src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -134,9 +134,10 @@ T.ComboBox {
}
}
background:Rectangle{
color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1)
border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
border.width: 1
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
FluShadow{
radius: 5
}

63
src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
View File

@ -95,6 +95,8 @@ FluButton {
Menu{
id:popup
modal: true
width: container.width
height: container.height
Overlay.modal: Item {}
enter: Transition {
reversible: true
@ -113,26 +115,30 @@ FluButton {
duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
background:Item{
FluShadow{
radius: 5
radius: 4
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitHeight: 340
implicitWidth: 300
radius: 4
width: 300
height: 340
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
MouseArea{
anchors.fill: parent
}
FluShadow{
radius: 4
}
RowLayout{
id:layout_content
spacing: 0
width: parent.width
height: 280
height: 300
Component{
id:list_delegate
Item{
@ -159,7 +165,7 @@ FluButton {
if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
}
return Qt.rgba(0,0,0,0)
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
}
radius: 3
MouseArea{
@ -207,9 +213,8 @@ FluButton {
}
ListView{
id:list_view_1
Layout.preferredWidth: 100
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: 100
height: parent.height
boundsBehavior:Flickable.StopAtBounds
ScrollBar.vertical: FluScrollBar {}
model: generateYearArray(1924,2048)
@ -226,16 +231,14 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
visible: showYear
}
ListView{
id:list_view_2
Layout.preferredWidth: showYear ? 99 : 150
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: showYear ? 100 : 150
height: parent.height
clip: true
ScrollBar.vertical: FluScrollBar {}
preferredHighlightBegin: 0
@ -250,20 +253,20 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
}
ListView{
id:list_view_3
Layout.preferredWidth: showYear ? 99 : 150
Layout.preferredHeight: parent.height - 2
Layout.alignment: Qt.AlignVCenter
width: showYear ? 100 : 150
height: parent.height
clip: true
preferredHighlightBegin: 0
preferredHighlightEnd: 0
highlightMoveDuration: 0
ScrollBar.vertical: FluScrollBar {}
Layout.alignment: Qt.AlignVCenter
boundsBehavior:Flickable.StopAtBounds
delegate: FluLoader{
property var model: modelData
@ -273,12 +276,17 @@ FluButton {
}
}
}
Rectangle{
width: parent.width
height: 1
anchors.top: layout_content.bottom
color: control.dividerColor
}
Rectangle{
id:layout_actions
height: 60
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
height: 40
radius: 5
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
anchors{
bottom:parent.bottom
left: parent.left
@ -331,6 +339,7 @@ FluButton {
}
}
}
}
y:35
function showPopup() {
d.changeFlag = true
@ -351,7 +360,7 @@ FluButton {
text_day.text = day
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height-1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {

6
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -778,9 +778,9 @@ Rectangle {
timer_vertical_force_layout.restart()
}
Connections{
target: table_view
function onRowsChanged(){
header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1}))
target: table_model
function onRowCountChanged(){
header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1}))
}
}
Timer{

53
src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
View File

@ -111,6 +111,8 @@ FluButton {
}
Menu{
id:popup
width: container.width
height: container.height
modal: true
Overlay.modal: Item {}
enter: Transition {
@ -130,18 +132,19 @@ FluButton {
duration: FluTheme.animationEnabled ? 83 : 0
}
}
background:Rectangle{
radius: 5
color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
background:Item{
FluShadow{
radius: 5
radius: 4
}
}
contentItem: Item{
clip: true
Rectangle{
id:container
implicitHeight: 340
implicitWidth: 300
height: 340
width: 300
radius: 4
color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
MouseArea{
anchors.fill: parent
}
@ -149,7 +152,7 @@ FluButton {
id:layout_content
spacing: 0
width: parent.width
height: 280
height: 300
Component{
id:list_delegate
Item{
@ -176,7 +179,7 @@ FluButton {
if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
}
return Qt.rgba(0,0,0,0)
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
}
radius: 3
MouseArea{
@ -216,9 +219,8 @@ FluButton {
}
ListView{
id:list_view_1
Layout.preferredWidth: isH ? 100 : 150
Layout.preferredHeight: parent.height-2
Layout.alignment: Qt.AlignVCenter
width: isH ? 100 : 150
height: parent.height
boundsBehavior:Flickable.StopAtBounds
ScrollBar.vertical: FluScrollBar {}
preferredHighlightBegin: 0
@ -234,15 +236,14 @@ FluButton {
}
}
Rectangle{
Layout.preferredWidth: 1
Layout.preferredHeight: parent.height
width: 1
height: parent.height
color: control.dividerColor
}
ListView{
id:list_view_2
Layout.preferredWidth: isH ? 99 : 150
Layout.preferredHeight: parent.height-2
Layout.alignment: Qt.AlignVCenter
width: isH ? 100 : 150
height: parent.height
model: generateArray(0,59)
clip: true
preferredHighlightBegin: 0
@ -265,8 +266,8 @@ FluButton {
}
ListView{
id:list_view_3
Layout.preferredWidth: 100
Layout.preferredHeight: 76
width: 100
height: 76
model: [control.amText,control.pmText]
clip: true
visible: isH
@ -284,12 +285,17 @@ FluButton {
}
}
}
Rectangle{
width: parent.width
height: 1
anchors.top: layout_content.bottom
color: control.dividerColor
}
Rectangle{
id:layout_actions
height: 60
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
height: 40
radius: 5
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
anchors{
bottom:parent.bottom
left: parent.left
@ -347,6 +353,7 @@ FluButton {
}
}
}
}
y:35
function showPopup() {
d.changeFlag = true
@ -380,7 +387,7 @@ FluButton {
}
var pos = control.mapToItem(null, 0, 0)
if(d.window.height>pos.y+control.height+container.height){
popup.y = control.height-1
popup.y = control.height
} else if(pos.y>container.height){
popup.y = -container.height
} else {

71
src/fluentui_en_US.ts
View File

@ -70,57 +70,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FluColorPicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
<source>Color Picker</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
<source>Edit Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
<source>Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
<source>Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
<source>Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
<source>Opacity</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FluContentDialog</name>
<message>
@ -145,31 +94,31 @@
<context>
<name>FluDatePicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
<source>Year</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<source>Month</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<source>Day</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<source>OK</source>
<translation type="unfinished"></translation>
@ -263,37 +212,31 @@
<name>FluTimePicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
<source>AM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
<source>PM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
<source>Hour</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
<source>Minute</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
@ -322,8 +265,8 @@
<context>
<name>FluWindow</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
<source>Loading...</source>
<translation type="unfinished"></translation>
</message>

71
src/fluentui_zh_CN.ts
View File

@ -70,57 +70,6 @@
<translation type="unfinished">选择日期</translation>
</message>
</context>
<context>
<name>FluColorPicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
<source>Cancel</source>
<translation type="unfinished">取消</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
<source>OK</source>
<translation type="unfinished">确定</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
<source>Color Picker</source>
<translation type="unfinished">颜色选择器</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
<source>Edit Color</source>
<translation type="unfinished">编辑颜色</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
<source>Red</source>
<translation type="unfinished">红色</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
<source>Green</source>
<translation type="unfinished">绿色</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
<source>Blue</source>
<translation type="unfinished">蓝色</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
<location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
<source>Opacity</source>
<translation type="unfinished">透明度</translation>
</message>
</context>
<context>
<name>FluContentDialog</name>
<message>
@ -145,31 +94,31 @@
<context>
<name>FluDatePicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
<source>Year</source>
<translation type="unfinished">年</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
<source>Month</source>
<translation type="unfinished">月</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
<source>Day</source>
<translation type="unfinished">日</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
<source>Cancel</source>
<translation type="unfinished">取消</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
<source>OK</source>
<translation type="unfinished">确定</translation>
@ -263,37 +212,31 @@
<name>FluTimePicker</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
<source>AM</source>
<translation type="unfinished">上午</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
<source>PM</source>
<translation type="unfinished">下午</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
<source>Hour</source>
<translation type="unfinished">时</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
<source>Minute</source>
<translation type="unfinished">分</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
<source>Cancel</source>
<translation type="unfinished">取消</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
<source>OK</source>
<translation type="unfinished">确定</translation>
</message>
@ -322,8 +265,8 @@
<context>
<name>FluWindow</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
<source>Loading...</source>
<translation type="unfinished">加载中...</translation>
</message>