amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-30 15:06:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #533 from jeffrey0326/main

Browse Source 
删除密码框无用的FluTextBoxMenu,修改TextBox中的右键菜单为FluLoader加载
This commit is contained in:
zhuzichu 2024-06-28 09:33:20 +08:00 committed by GitHub
commit 7c4cfceb8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 93 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml
View File

@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent
cursorShape: Qt.IBeamCursor
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
inputItem: control
FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
}
}

20
src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

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

4
src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
View File

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

20
src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
View File

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

20
src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
View File

@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent
cursorShape: Qt.IBeamCursor
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
inputItem: control
FluTextBoxMenu{
inputItem: control
onClosed: {
menu_loader.sourceComponent = undefined
}
}
}
}

4
src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
View File

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

20
src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
View File

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

7
src/fluentui_en_US.ts
View File

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

7
src/fluentui_zh_CN.ts
View File

@ -232,7 +232,8 @@
<translation type="unfinished">重置</translation>
</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>
<translation type="unfinished">冲突</translation>
</message>
@ -354,8 +355,8 @@
<context>
<name>FluWindow</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/>
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
<source>Loading...</source>
<translation type="unfinished">加载中...</translation>
</message>