Skip to content
Snippets Groups Projects
Commit 5db04d7e authored by Ming Rui Zhang's avatar Ming Rui Zhang
Browse files

misc: inconsistency adjustment for readonly lineEdit

1. Make version number in AboutPopUp selectable
2. Remove "Copy"/"Paste" options in the context menu when the
   lineEdit is readonly
3. Make texts in UserProfile selectable

Change-Id: I53b7566841d84cb8ad27298f995f99a2de6384f0
parent b80205ec
Branches
Tags
No related merge requests found
......@@ -33,6 +33,7 @@ ContextMenuAutoLoader {
property var lineEditObj
property var selectionStart
property var selectionEnd
property bool selectOnly: false
property list<GeneralMenuItem> menuItems: [
GeneralMenuItem {
......@@ -47,7 +48,7 @@ ContextMenuAutoLoader {
GeneralMenuItem {
id: cut
canTrigger: lineEditObj.selectedText.length
canTrigger: lineEditObj.selectedText.length && !selectOnly
itemName: JamiStrings.cut
onClicked: {
......@@ -57,6 +58,7 @@ ContextMenuAutoLoader {
GeneralMenuItem {
id: paste
canTrigger: !selectOnly
itemName: JamiStrings.paste
onClicked: {
lineEditObj.paste()
......@@ -65,6 +67,9 @@ ContextMenuAutoLoader {
]
function openMenuAt(mouseEvent) {
if (lineEditObj.selectedText.length === 0 && selectOnly)
return
x = mouseEvent.x
y = mouseEvent.y
......
......@@ -85,6 +85,7 @@ TextField {
id: lineEditContextMenu
lineEditObj: root
selectOnly: readOnly
}
Image {
......
......@@ -414,6 +414,7 @@ Item {
property string saveProfile: qsTr("Save profile")
property string enterRVName: qsTr("Enter the rendezvous point's name")
property string generatingRV: qsTr("Creating rendezvous point…")
property string information: qsTr("Information")
// RevokeDevicePasswordDialog
property string confirmRemovalRequest: qsTr("Enter the account password to confirm the removal of this device")
......
......@@ -69,29 +69,28 @@ ModalPopup {
smooth: true
antialiasing: true
source: JamiTheme.darkTheme? "qrc:/images/logo-jami-standard-coul-white.svg" : "qrc:/images/logo-jami-standard-coul.svg"
source: JamiTheme.darkTheme?
"qrc:/images/logo-jami-standard-coul-white.svg" :
"qrc:/images/logo-jami-standard-coul.svg"
}
Label {
MaterialLineEdit {
id: jamiVersionText
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: contentRect.width
Layout.preferredHeight: textMetricsjamiVersionText.boundingRect.height
font.pointSize: JamiTheme.textFontSize
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
padding: 0
readOnly: true
selectByMouse: true
text: textMetricsjamiVersionText.text
text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
color: JamiTheme.textColor
TextMetrics {
id: textMetricsjamiVersionText
font: jamiVersionText.font
text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
}
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
Label {
......@@ -133,7 +132,6 @@ ModalPopup {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
// TextMetrics does not work for multi-line.
text: JamiStrings.declaration
}
......
......@@ -71,21 +71,31 @@ BaseDialog {
}
// Visible when user alias is not empty or equals to id.
Text {
MaterialLineEdit {
id: contactAlias
Layout.alignment: Qt.AlignLeft
font.pointSize: JamiTheme.titleFontSize
text: textMetricsContactAliasText.elidedText
font.kerning: true
color: JamiTheme.textColor
visible: aliasText ? (aliasText === idText ? false : true) : false
padding: 0
readOnly: true
selectByMouse: true
wrapMode: Text.NoWrap
text: textMetricsContactAliasText.elidedText
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
TextMetrics {
id: textMetricsContactAliasText
font: contactAlias.font
text: aliasText
elideWidth: userProfileContentRect.width-200
elideWidth: userProfileContentRect.width - 200
elide: Qt.ElideMiddle
}
}
......@@ -98,7 +108,7 @@ BaseDialog {
Text {
Layout.alignment: Qt.AlignRight
font.pointSize: JamiTheme.menuFontSize
text: qsTr("Information")
text: JamiStrings.information
color: JamiTheme.textColor
}
......@@ -113,16 +123,26 @@ BaseDialog {
}
// Visible when user name is not empty or equals to alias.
Text {
MaterialLineEdit {
id: contactDisplayName
Layout.alignment: Qt.AlignLeft
font.pointSize: JamiTheme.textFontSize
text: textMetricsContactDisplayNameText.elidedText
font.kerning: true
color: JamiTheme.textColor
visible: registeredNameText ? (registeredNameText === idText ? false : true) : false
padding: 0
readOnly: true
selectByMouse: true
wrapMode: Text.NoWrap
text: textMetricsContactDisplayNameText.elidedText
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
TextMetrics {
id: textMetricsContactDisplayNameText
font: contactDisplayName.font
......@@ -139,22 +159,30 @@ BaseDialog {
color: JamiTheme.faddedFontColor
}
TextEdit {
MaterialLineEdit {
id: contactId
Layout.alignment: Qt.AlignLeft
selectByMouse: true
readOnly: true
font.pointSize: JamiTheme.textFontSize
text: textMetricsContactIdText.elidedText
font.kerning: true
color: JamiTheme.textColor
padding: 0
readOnly: true
selectByMouse: true
wrapMode: Text.NoWrap
text: textMetricsContactIdText.elidedText
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
TextMetrics {
id: textMetricsContactIdText
font: contactId.font
text: idText
elideWidth: userProfileContentRect.width-200
elideWidth: userProfileContentRect.width - 200
elide: Qt.ElideMiddle
}
}
......
......@@ -77,14 +77,13 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter
}
TextField {
MaterialLineEdit {
id: currentRingID
property var backgroundColor: "transparent"
property var borderColor: "transparent"
anchors.verticalCenter: parent.verticalCenter
width: parent.width - idLabel.width
- JamiTheme.preferredMarginSize
height: JamiTheme.preferredFieldHeight
font.pointSize: JamiTheme.textFontSize
......@@ -95,20 +94,13 @@ ColumnLayout {
readOnly: true
selectByMouse: true
wrapMode: Text.NoWrap
text: currentRingIDText.elidedText
color: JamiTheme.textColor
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
background: Rectangle {
anchors.fill: parent
radius: 0
border.color: currentRingID.borderColor
border.width: 0
color: currentRingID.backgroundColor
}
TextMetrics {
id: currentRingIDText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment