mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2024-11-22 19:00:07 +08:00
update
This commit is contained in:
parent
8fe4e3b047
commit
179bc8b21f
@ -1089,46 +1089,6 @@ Updated content:
|
|||||||
<source>Click to Select a Color - ></source>
|
<source>Click to Select a Color - ></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</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>
|
||||||
<context>
|
<context>
|
||||||
<name>T_ComboBox</name>
|
<name>T_ComboBox</name>
|
||||||
|
@ -1113,44 +1113,36 @@ Updated content:
|
|||||||
<translation type="unfinished">点击选中颜色 - ></translation>
|
<translation type="unfinished">点击选中颜色 - ></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="22"/>
|
|
||||||
<source>Cancel</source>
|
<source>Cancel</source>
|
||||||
<translation type="unfinished">取消</translation>
|
<translation type="obsolete">取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="23"/>
|
|
||||||
<source>OK</source>
|
<source>OK</source>
|
||||||
<translation type="unfinished">确定</translation>
|
<translation type="obsolete">确定</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="24"/>
|
|
||||||
<source>Color Picker</source>
|
<source>Color Picker</source>
|
||||||
<translation type="unfinished">颜色选择器</translation>
|
<translation type="obsolete">颜色选择器</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="25"/>
|
|
||||||
<source>Edit Color</source>
|
<source>Edit Color</source>
|
||||||
<translation type="unfinished">编辑颜色</translation>
|
<translation type="obsolete">编辑颜色</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="26"/>
|
|
||||||
<source>Red</source>
|
<source>Red</source>
|
||||||
<translation type="unfinished">红色</translation>
|
<translation type="obsolete">红色</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="27"/>
|
|
||||||
<source>Green</source>
|
<source>Green</source>
|
||||||
<translation type="unfinished">绿色</translation>
|
<translation type="obsolete">绿色</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="28"/>
|
|
||||||
<source>Blue</source>
|
<source>Blue</source>
|
||||||
<translation type="unfinished">蓝色</translation>
|
<translation type="obsolete">蓝色</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_ColorPicker.qml" line="29"/>
|
|
||||||
<source>Opacity</source>
|
<source>Opacity</source>
|
||||||
<translation type="unfinished">透明度</translation>
|
<translation type="obsolete">透明度</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -18,16 +18,7 @@ FluScrollablePage{
|
|||||||
text: qsTr("Click to Select a Color - >")
|
text: qsTr("Click to Select a Color - >")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
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{
|
CodeExpander{
|
||||||
|
@ -53,8 +53,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
height: container.height
|
|
||||||
width: container.width
|
|
||||||
modal: true
|
modal: true
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
@ -75,13 +73,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
width: 300
|
implicitWidth: 300
|
||||||
height: 360
|
implicitHeight: 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 {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
spacing: 0
|
spacing: 0
|
||||||
@ -611,22 +605,23 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
background:Rectangle{
|
||||||
background: Item{
|
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{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height - 1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
popup.y = d.window.height-(pos.y+container.height)
|
popup.y = d.window.height-(pos.y+container.height)
|
||||||
}
|
}
|
||||||
popup.x = -(popup.width-control.width)/2
|
|
||||||
popup.open()
|
popup.open()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,16 +13,15 @@ Button{
|
|||||||
property color current : Qt.rgba(1,1,1,1)
|
property color current : Qt.rgba(1,1,1,1)
|
||||||
signal accepted()
|
signal accepted()
|
||||||
property int colorHandleRadius: 8
|
property int colorHandleRadius: 8
|
||||||
property string cancelText: "取消"
|
property string cancelText: qsTr("Cancel")
|
||||||
property string okText: "确定"
|
property string okText: qsTr("OK")
|
||||||
property string titleText: "颜色选择器"
|
property string titleText: qsTr("Color Picker")
|
||||||
property string editText: "编辑颜色"
|
property string editText: qsTr("Edit Color")
|
||||||
property string redText: "红色"
|
property string redText: qsTr("Red")
|
||||||
property string greenText: "绿色"
|
property string greenText: qsTr("Green")
|
||||||
property string blueText: "蓝色"
|
property string blueText: qsTr("Blue")
|
||||||
property string opacityText: "透明度"
|
property string opacityText: qsTr("Opacity")
|
||||||
background:
|
background: Rectangle{
|
||||||
Rectangle{
|
|
||||||
id:layout_color
|
id:layout_color
|
||||||
radius: 5
|
radius: 5
|
||||||
color:"#00000000"
|
color:"#00000000"
|
||||||
|
@ -4,7 +4,6 @@ import QtQuick.Layouts 1.15
|
|||||||
import QtQuick.Window 2.15
|
import QtQuick.Window 2.15
|
||||||
import FluentUI 1.0
|
import FluentUI 1.0
|
||||||
|
|
||||||
|
|
||||||
FluButton {
|
FluButton {
|
||||||
property bool showYear: true
|
property bool showYear: true
|
||||||
property var current
|
property var current
|
||||||
@ -96,8 +95,6 @@ FluButton {
|
|||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
modal: true
|
modal: true
|
||||||
width: container.width
|
|
||||||
height: container.height
|
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
reversible: true
|
reversible: true
|
||||||
@ -116,35 +113,31 @@ FluButton {
|
|||||||
duration: FluTheme.animationEnabled ? 83 : 0
|
duration: FluTheme.animationEnabled ? 83 : 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
background:Item{
|
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)
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
radius: 4
|
implicitHeight: 340
|
||||||
width: 300
|
implicitWidth: 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{
|
MouseArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
FluShadow{
|
|
||||||
radius: 4
|
|
||||||
}
|
|
||||||
RowLayout{
|
RowLayout{
|
||||||
id:layout_content
|
id:layout_content
|
||||||
spacing: 0
|
spacing: 0
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: 300
|
height: 280
|
||||||
Component{
|
Component{
|
||||||
id:list_delegate
|
id:list_delegate
|
||||||
Item{
|
Item{
|
||||||
height:38
|
height: 38
|
||||||
width:getListView().width
|
width: getListView().width
|
||||||
function getListView(){
|
function getListView(){
|
||||||
if(type === 0)
|
if(type === 0)
|
||||||
return list_view_1
|
return list_view_1
|
||||||
@ -166,7 +159,7 @@ FluButton {
|
|||||||
if(item_mouse.containsMouse){
|
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 FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
|
||||||
}
|
}
|
||||||
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
|
return Qt.rgba(0,0,0,0)
|
||||||
}
|
}
|
||||||
radius: 3
|
radius: 3
|
||||||
MouseArea{
|
MouseArea{
|
||||||
@ -214,8 +207,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_1
|
id:list_view_1
|
||||||
width: 100
|
Layout.preferredWidth: 100
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
model: generateYearArray(1924,2048)
|
model: generateYearArray(1924,2048)
|
||||||
@ -232,14 +226,16 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
|
visible: showYear
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_2
|
id:list_view_2
|
||||||
width: showYear ? 100 : 150
|
Layout.preferredWidth: showYear ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -254,20 +250,20 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_3
|
id:list_view_3
|
||||||
width: showYear ? 100 : 150
|
Layout.preferredWidth: showYear ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
clip: true
|
clip: true
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
preferredHighlightEnd: 0
|
preferredHighlightEnd: 0
|
||||||
highlightMoveDuration: 0
|
highlightMoveDuration: 0
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
Layout.alignment: Qt.AlignVCenter
|
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
delegate: FluLoader{
|
delegate: FluLoader{
|
||||||
property var model: modelData
|
property var model: modelData
|
||||||
@ -277,17 +273,12 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
anchors.top: layout_content.bottom
|
|
||||||
color: control.dividerColor
|
|
||||||
}
|
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_actions
|
id:layout_actions
|
||||||
height: 40
|
height: 60
|
||||||
radius: 5
|
|
||||||
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
|
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)
|
||||||
|
radius: 5
|
||||||
anchors{
|
anchors{
|
||||||
bottom:parent.bottom
|
bottom:parent.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
@ -340,7 +331,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
y:35
|
y:35
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
d.changeFlag = true
|
d.changeFlag = true
|
||||||
@ -361,7 +351,7 @@ FluButton {
|
|||||||
text_day.text = day
|
text_day.text = day
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height-1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
|
@ -111,8 +111,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
width: container.width
|
|
||||||
height: container.height
|
|
||||||
modal: true
|
modal: true
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
@ -132,19 +130,18 @@ FluButton {
|
|||||||
duration: FluTheme.animationEnabled ? 83 : 0
|
duration: FluTheme.animationEnabled ? 83 : 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
background:Item{
|
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)
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
height: 340
|
implicitHeight: 340
|
||||||
width: 300
|
implicitWidth: 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{
|
MouseArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
@ -152,7 +149,7 @@ FluButton {
|
|||||||
id:layout_content
|
id:layout_content
|
||||||
spacing: 0
|
spacing: 0
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: 300
|
height: 280
|
||||||
Component{
|
Component{
|
||||||
id:list_delegate
|
id:list_delegate
|
||||||
Item{
|
Item{
|
||||||
@ -179,7 +176,7 @@ FluButton {
|
|||||||
if(item_mouse.containsMouse){
|
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 FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
|
||||||
}
|
}
|
||||||
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
|
return Qt.rgba(0,0,0,0)
|
||||||
}
|
}
|
||||||
radius: 3
|
radius: 3
|
||||||
MouseArea{
|
MouseArea{
|
||||||
@ -219,8 +216,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_1
|
id:list_view_1
|
||||||
width: isH ? 100 : 150
|
Layout.preferredWidth: isH ? 100 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height-2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -236,14 +234,15 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_2
|
id:list_view_2
|
||||||
width: isH ? 100 : 150
|
Layout.preferredWidth: isH ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height-2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
model: generateArray(0,59)
|
model: generateArray(0,59)
|
||||||
clip: true
|
clip: true
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -266,8 +265,8 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_3
|
id:list_view_3
|
||||||
width: 100
|
Layout.preferredWidth: 100
|
||||||
height: 76
|
Layout.preferredHeight: 76
|
||||||
model: [control.amText,control.pmText]
|
model: [control.amText,control.pmText]
|
||||||
clip: true
|
clip: true
|
||||||
visible: isH
|
visible: isH
|
||||||
@ -285,17 +284,12 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
anchors.top: layout_content.bottom
|
|
||||||
color: control.dividerColor
|
|
||||||
}
|
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_actions
|
id:layout_actions
|
||||||
height: 40
|
height: 60
|
||||||
radius: 5
|
|
||||||
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
|
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)
|
||||||
|
radius: 5
|
||||||
anchors{
|
anchors{
|
||||||
bottom:parent.bottom
|
bottom:parent.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
@ -353,7 +347,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
y:35
|
y:35
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
d.changeFlag = true
|
d.changeFlag = true
|
||||||
@ -387,7 +380,7 @@ FluButton {
|
|||||||
}
|
}
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height-1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
|
@ -52,8 +52,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
height: container.height
|
|
||||||
width: container.width
|
|
||||||
modal: true
|
modal: true
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
@ -74,13 +72,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
width: 300
|
implicitWidth: 300
|
||||||
height: 360
|
implicitHeight: 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 {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
spacing: 0
|
spacing: 0
|
||||||
@ -610,22 +604,23 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
background:Rectangle{
|
||||||
background: Item{
|
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{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height - 1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
popup.y = d.window.height-(pos.y+container.height)
|
popup.y = d.window.height-(pos.y+container.height)
|
||||||
}
|
}
|
||||||
popup.x = -(popup.width-control.width)/2
|
|
||||||
popup.open()
|
popup.open()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,16 +13,15 @@ Button{
|
|||||||
property color current : Qt.rgba(1,1,1,1)
|
property color current : Qt.rgba(1,1,1,1)
|
||||||
signal accepted()
|
signal accepted()
|
||||||
property int colorHandleRadius: 8
|
property int colorHandleRadius: 8
|
||||||
property string cancelText: "取消"
|
property string cancelText: qsTr("Cancel")
|
||||||
property string okText: "确定"
|
property string okText: qsTr("OK")
|
||||||
property string titleText: "颜色选择器"
|
property string titleText: qsTr("Color Picker")
|
||||||
property string editText: "编辑颜色"
|
property string editText: qsTr("Edit Color")
|
||||||
property string redText: "红色"
|
property string redText: qsTr("Red")
|
||||||
property string greenText: "绿色"
|
property string greenText: qsTr("Green")
|
||||||
property string blueText: "蓝色"
|
property string blueText: qsTr("Blue")
|
||||||
property string opacityText: "透明度"
|
property string opacityText: qsTr("Opacity")
|
||||||
background:
|
background: Rectangle{
|
||||||
Rectangle{
|
|
||||||
id:layout_color
|
id:layout_color
|
||||||
radius: 5
|
radius: 5
|
||||||
color:"#00000000"
|
color:"#00000000"
|
||||||
|
@ -41,7 +41,7 @@ FluButton {
|
|||||||
id:divider_1
|
id:divider_1
|
||||||
width: 1
|
width: 1
|
||||||
x: parent.width/3
|
x: parent.width/3
|
||||||
height: parent.height-1
|
height: parent.height - 1
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
visible: showYear
|
visible: showYear
|
||||||
}
|
}
|
||||||
@ -49,7 +49,7 @@ FluButton {
|
|||||||
id:divider_2
|
id:divider_2
|
||||||
width: 1
|
width: 1
|
||||||
x: showYear ? parent.width*2/3 : parent.width/2
|
x: showYear ? parent.width*2/3 : parent.width/2
|
||||||
height: parent.height-1
|
height: parent.height - 1
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
@ -95,8 +95,6 @@ FluButton {
|
|||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
modal: true
|
modal: true
|
||||||
width: container.width
|
|
||||||
height: container.height
|
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
reversible: true
|
reversible: true
|
||||||
@ -115,35 +113,31 @@ FluButton {
|
|||||||
duration: FluTheme.animationEnabled ? 83 : 0
|
duration: FluTheme.animationEnabled ? 83 : 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
background:Item{
|
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)
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
radius: 4
|
implicitHeight: 340
|
||||||
width: 300
|
implicitWidth: 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{
|
MouseArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
FluShadow{
|
|
||||||
radius: 4
|
|
||||||
}
|
|
||||||
RowLayout{
|
RowLayout{
|
||||||
id:layout_content
|
id:layout_content
|
||||||
spacing: 0
|
spacing: 0
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: 300
|
height: 280
|
||||||
Component{
|
Component{
|
||||||
id:list_delegate
|
id:list_delegate
|
||||||
Item{
|
Item{
|
||||||
height:38
|
height: 38
|
||||||
width:getListView().width
|
width: getListView().width
|
||||||
function getListView(){
|
function getListView(){
|
||||||
if(type === 0)
|
if(type === 0)
|
||||||
return list_view_1
|
return list_view_1
|
||||||
@ -165,7 +159,7 @@ FluButton {
|
|||||||
if(item_mouse.containsMouse){
|
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 FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
|
||||||
}
|
}
|
||||||
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
|
return Qt.rgba(0,0,0,0)
|
||||||
}
|
}
|
||||||
radius: 3
|
radius: 3
|
||||||
MouseArea{
|
MouseArea{
|
||||||
@ -213,8 +207,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_1
|
id:list_view_1
|
||||||
width: 100
|
Layout.preferredWidth: 100
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
model: generateYearArray(1924,2048)
|
model: generateYearArray(1924,2048)
|
||||||
@ -231,14 +226,16 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
|
visible: showYear
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_2
|
id:list_view_2
|
||||||
width: showYear ? 100 : 150
|
Layout.preferredWidth: showYear ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -253,20 +250,20 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_3
|
id:list_view_3
|
||||||
width: showYear ? 100 : 150
|
Layout.preferredWidth: showYear ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height - 2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
clip: true
|
clip: true
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
preferredHighlightEnd: 0
|
preferredHighlightEnd: 0
|
||||||
highlightMoveDuration: 0
|
highlightMoveDuration: 0
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
Layout.alignment: Qt.AlignVCenter
|
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
delegate: FluLoader{
|
delegate: FluLoader{
|
||||||
property var model: modelData
|
property var model: modelData
|
||||||
@ -276,17 +273,12 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
anchors.top: layout_content.bottom
|
|
||||||
color: control.dividerColor
|
|
||||||
}
|
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_actions
|
id:layout_actions
|
||||||
height: 40
|
height: 60
|
||||||
radius: 5
|
|
||||||
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
|
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)
|
||||||
|
radius: 5
|
||||||
anchors{
|
anchors{
|
||||||
bottom:parent.bottom
|
bottom:parent.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
@ -339,7 +331,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
y:35
|
y:35
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
d.changeFlag = true
|
d.changeFlag = true
|
||||||
@ -360,7 +351,7 @@ FluButton {
|
|||||||
text_day.text = day
|
text_day.text = day
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height-1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
|
@ -58,14 +58,14 @@ FluButton {
|
|||||||
id: divider_1
|
id: divider_1
|
||||||
width: 1
|
width: 1
|
||||||
x: isH ? parent.width/3 : parent.width/2
|
x: isH ? parent.width/3 : parent.width/2
|
||||||
height: parent.height-1
|
height: parent.height - 1
|
||||||
color: dividerColor
|
color: dividerColor
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id: divider_2
|
id: divider_2
|
||||||
width: 1
|
width: 1
|
||||||
x: parent.width*2/3
|
x: parent.width*2/3
|
||||||
height: parent.height-1
|
height: parent.height - 1
|
||||||
color: dividerColor
|
color: dividerColor
|
||||||
visible: isH
|
visible: isH
|
||||||
}
|
}
|
||||||
@ -111,8 +111,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
Menu{
|
Menu{
|
||||||
id:popup
|
id:popup
|
||||||
width: container.width
|
|
||||||
height: container.height
|
|
||||||
modal: true
|
modal: true
|
||||||
Overlay.modal: Item {}
|
Overlay.modal: Item {}
|
||||||
enter: Transition {
|
enter: Transition {
|
||||||
@ -132,19 +130,18 @@ FluButton {
|
|||||||
duration: FluTheme.animationEnabled ? 83 : 0
|
duration: FluTheme.animationEnabled ? 83 : 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
background:Item{
|
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)
|
||||||
FluShadow{
|
FluShadow{
|
||||||
radius: 4
|
radius: 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem: Item{
|
contentItem: Item{
|
||||||
clip: true
|
|
||||||
Rectangle{
|
|
||||||
id:container
|
id:container
|
||||||
height: 340
|
implicitHeight: 340
|
||||||
width: 300
|
implicitWidth: 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{
|
MouseArea{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
@ -152,7 +149,7 @@ FluButton {
|
|||||||
id:layout_content
|
id:layout_content
|
||||||
spacing: 0
|
spacing: 0
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: 300
|
height: 280
|
||||||
Component{
|
Component{
|
||||||
id:list_delegate
|
id:list_delegate
|
||||||
Item{
|
Item{
|
||||||
@ -179,7 +176,7 @@ FluButton {
|
|||||||
if(item_mouse.containsMouse){
|
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 FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
|
||||||
}
|
}
|
||||||
return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
|
return Qt.rgba(0,0,0,0)
|
||||||
}
|
}
|
||||||
radius: 3
|
radius: 3
|
||||||
MouseArea{
|
MouseArea{
|
||||||
@ -219,8 +216,9 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_1
|
id:list_view_1
|
||||||
width: isH ? 100 : 150
|
Layout.preferredWidth: isH ? 100 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height-2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
boundsBehavior:Flickable.StopAtBounds
|
boundsBehavior:Flickable.StopAtBounds
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -236,14 +234,15 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
Rectangle{
|
||||||
width: 1
|
Layout.preferredWidth: 1
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
color: control.dividerColor
|
color: control.dividerColor
|
||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_2
|
id:list_view_2
|
||||||
width: isH ? 100 : 150
|
Layout.preferredWidth: isH ? 99 : 150
|
||||||
height: parent.height
|
Layout.preferredHeight: parent.height-2
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
model: generateArray(0,59)
|
model: generateArray(0,59)
|
||||||
clip: true
|
clip: true
|
||||||
preferredHighlightBegin: 0
|
preferredHighlightBegin: 0
|
||||||
@ -266,8 +265,8 @@ FluButton {
|
|||||||
}
|
}
|
||||||
ListView{
|
ListView{
|
||||||
id:list_view_3
|
id:list_view_3
|
||||||
width: 100
|
Layout.preferredWidth: 100
|
||||||
height: 76
|
Layout.preferredHeight: 76
|
||||||
model: [control.amText,control.pmText]
|
model: [control.amText,control.pmText]
|
||||||
clip: true
|
clip: true
|
||||||
visible: isH
|
visible: isH
|
||||||
@ -285,17 +284,12 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle{
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
anchors.top: layout_content.bottom
|
|
||||||
color: control.dividerColor
|
|
||||||
}
|
|
||||||
Rectangle{
|
Rectangle{
|
||||||
id:layout_actions
|
id:layout_actions
|
||||||
height: 40
|
height: 60
|
||||||
radius: 5
|
|
||||||
color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
|
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)
|
||||||
|
radius: 5
|
||||||
anchors{
|
anchors{
|
||||||
bottom:parent.bottom
|
bottom:parent.bottom
|
||||||
left: parent.left
|
left: parent.left
|
||||||
@ -353,7 +347,6 @@ FluButton {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
y:35
|
y:35
|
||||||
function showPopup() {
|
function showPopup() {
|
||||||
d.changeFlag = true
|
d.changeFlag = true
|
||||||
@ -387,7 +380,7 @@ FluButton {
|
|||||||
}
|
}
|
||||||
var pos = control.mapToItem(null, 0, 0)
|
var pos = control.mapToItem(null, 0, 0)
|
||||||
if(d.window.height>pos.y+control.height+container.height){
|
if(d.window.height>pos.y+control.height+container.height){
|
||||||
popup.y = control.height
|
popup.y = control.height-1
|
||||||
} else if(pos.y>container.height){
|
} else if(pos.y>container.height){
|
||||||
popup.y = -container.height
|
popup.y = -container.height
|
||||||
} else {
|
} else {
|
||||||
|
@ -70,6 +70,57 @@
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</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>
|
<context>
|
||||||
<name>FluContentDialog</name>
|
<name>FluContentDialog</name>
|
||||||
<message>
|
<message>
|
||||||
@ -94,31 +145,31 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>FluDatePicker</name>
|
<name>FluDatePicker</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
||||||
<source>Year</source>
|
<source>Year</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
||||||
<source>Month</source>
|
<source>Month</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
||||||
<source>Day</source>
|
<source>Day</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
||||||
<source>Cancel</source>
|
<source>Cancel</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
||||||
<source>OK</source>
|
<source>OK</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
@ -212,31 +263,37 @@
|
|||||||
<name>FluTimePicker</name>
|
<name>FluTimePicker</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
||||||
<source>AM</source>
|
<source>AM</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
||||||
<source>PM</source>
|
<source>PM</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
||||||
<source>Hour</source>
|
<source>Hour</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
||||||
<source>Minute</source>
|
<source>Minute</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
||||||
<source>Cancel</source>
|
<source>Cancel</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
||||||
<source>OK</source>
|
<source>OK</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
@ -265,8 +322,8 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>FluWindow</name>
|
<name>FluWindow</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
|
||||||
<source>Loading...</source>
|
<source>Loading...</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -70,6 +70,57 @@
|
|||||||
<translation type="unfinished">选择日期</translation>
|
<translation type="unfinished">选择日期</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</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>
|
<context>
|
||||||
<name>FluContentDialog</name>
|
<name>FluContentDialog</name>
|
||||||
<message>
|
<message>
|
||||||
@ -94,31 +145,31 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>FluDatePicker</name>
|
<name>FluDatePicker</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
|
||||||
<source>Year</source>
|
<source>Year</source>
|
||||||
<translation type="unfinished">年</translation>
|
<translation type="unfinished">年</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
|
||||||
<source>Month</source>
|
<source>Month</source>
|
||||||
<translation type="unfinished">月</translation>
|
<translation type="unfinished">月</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
|
||||||
<source>Day</source>
|
<source>Day</source>
|
||||||
<translation type="unfinished">日</translation>
|
<translation type="unfinished">日</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
|
||||||
<source>Cancel</source>
|
<source>Cancel</source>
|
||||||
<translation type="unfinished">取消</translation>
|
<translation type="unfinished">取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
|
||||||
<source>OK</source>
|
<source>OK</source>
|
||||||
<translation type="unfinished">确定</translation>
|
<translation type="unfinished">确定</translation>
|
||||||
@ -212,31 +263,37 @@
|
|||||||
<name>FluTimePicker</name>
|
<name>FluTimePicker</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
|
||||||
<source>AM</source>
|
<source>AM</source>
|
||||||
<translation type="unfinished">上午</translation>
|
<translation type="unfinished">上午</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
|
||||||
<source>PM</source>
|
<source>PM</source>
|
||||||
<translation type="unfinished">下午</translation>
|
<translation type="unfinished">下午</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
|
||||||
<source>Hour</source>
|
<source>Hour</source>
|
||||||
<translation type="unfinished">时</translation>
|
<translation type="unfinished">时</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
|
||||||
<source>Minute</source>
|
<source>Minute</source>
|
||||||
<translation type="unfinished">分</translation>
|
<translation type="unfinished">分</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
|
||||||
<source>Cancel</source>
|
<source>Cancel</source>
|
||||||
<translation type="unfinished">取消</translation>
|
<translation type="unfinished">取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
||||||
|
<location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
|
||||||
<source>OK</source>
|
<source>OK</source>
|
||||||
<translation type="unfinished">确定</translation>
|
<translation type="unfinished">确定</translation>
|
||||||
</message>
|
</message>
|
||||||
@ -265,8 +322,8 @@
|
|||||||
<context>
|
<context>
|
||||||
<name>FluWindow</name>
|
<name>FluWindow</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
|
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
|
||||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
|
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
|
||||||
<source>Loading...</source>
|
<source>Loading...</source>
|
||||||
<translation type="unfinished">加载中...</translation>
|
<translation type="unfinished">加载中...</translation>
|
||||||
</message>
|
</message>
|
||||||
|
Loading…
Reference in New Issue
Block a user