删除密码框无用的FluTextBoxMenu,修改TextBox中的右键菜单为FluLoader加载

This commit is contained in:
jeffrey0326 2024-06-27 13:17:03 +08:00
parent fdaaa85541
commit 41a1775cee
9 changed files with 93 additions and 29 deletions

View File

@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.IBeamCursor cursorShape: Qt.IBeamCursor
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
onClicked: control.echoMode !== TextInput.Password && menu.popup() onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
} }
FluTextBoxMenu{ FluLoader{
id: menu_loader
function popup(){
sourceComponent = menu
}
onLoaded: {
item.open()
}
}
Component{
id:menu id:menu
inputItem: control FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
} }
} }

View File

@ -71,11 +71,25 @@ TextArea{
if(control.readOnly && control.text === ""){ if(control.readOnly && control.text === ""){
return return
} }
menu.popup() menu_loader.popup()
} }
} }
FluTextBoxMenu{ FluLoader{
id: menu_loader
function popup(){
sourceComponent = menu
}
onLoaded: {
item.open()
}
}
Component{
id:menu id:menu
inputItem: control FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
} }
} }

View File

@ -65,8 +65,4 @@ TextField{
rightMargin: 5 rightMargin: 5
} }
} }
FluTextBoxMenu{
id:menu
inputItem: control
}
} }

View File

@ -69,7 +69,7 @@ TextField{
if(control.readOnly && control.text === ""){ if(control.readOnly && control.text === ""){
return return
} }
menu.popup() menu_loader.popup()
} }
} }
RowLayout{ RowLayout{
@ -111,8 +111,22 @@ TextField{
visible: control.iconSource != 0 visible: control.iconSource != 0
} }
} }
FluTextBoxMenu{ FluLoader{
id: menu_loader
function popup(){
sourceComponent = menu
}
onLoaded: {
item.open()
}
}
Component{
id:menu id:menu
inputItem: control FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
} }
} }

View File

@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.IBeamCursor cursorShape: Qt.IBeamCursor
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
onClicked: control.echoMode !== TextInput.Password && menu.popup() onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
} }
FluTextBoxMenu{ FluLoader{
id: menu_loader
function popup(){
sourceComponent = menu
}
onLoaded: {
item.open()
}
}
Component{
id:menu id:menu
inputItem: control FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
} }
} }

View File

@ -66,8 +66,4 @@ TextField{
rightMargin: 5 rightMargin: 5
} }
} }
FluTextBoxMenu{
id:menu
inputItem: control
}
} }

View File

@ -70,7 +70,7 @@ TextField{
if(control.readOnly && control.text === ""){ if(control.readOnly && control.text === ""){
return return
} }
menu.popup() menu_loader.popup()
} }
} }
RowLayout{ RowLayout{
@ -112,8 +112,22 @@ TextField{
visible: control.iconSource != 0 visible: control.iconSource != 0
} }
} }
FluTextBoxMenu{ FluLoader{
id: menu_loader
function popup(){
sourceComponent = menu
}
onLoaded: {
item.open()
}
}
Component{
id:menu id:menu
inputItem: control FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
} }
} }

View File

@ -232,7 +232,8 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/> <location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
<source>Conflict</source> <source>Conflict</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -354,8 +355,8 @@
<context> <context>
<name>FluWindow</name> <name>FluWindow</name>
<message> <message>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/> <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/> <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<source>Loading...</source> <source>Loading...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -232,7 +232,8 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/> <location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
<source>Conflict</source> <source>Conflict</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -354,8 +355,8 @@
<context> <context>
<name>FluWindow</name> <name>FluWindow</name>
<message> <message>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/> <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/> <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<source>Loading...</source> <source>Loading...</source>
<translation type="unfinished">...</translation> <translation type="unfinished">...</translation>
</message> </message>