Refer to custom components to access their enums

This commit is contained in:
miruka
2020-07-17 01:45:02 -04:00
parent d6e904ca4c
commit 716ac2a0af
22 changed files with 30 additions and 30 deletions

View File

@@ -8,7 +8,6 @@
- fix local unread counters order
- fix power level control button layout when apply button is loading
- @room?
- publish room or alias control
- open context menus centered on touch screens
@@ -66,6 +65,7 @@
## Interface
- Colorize "@room" in messages
- Show scrollbars for a few seconds if there's content to scroll on when
opening a page or popup
- Device IP geolocation

View File

@@ -71,7 +71,7 @@ CheckBox {
// Set a width on CheckBox for wrapping to work,
// e.g. by using Layout.fillWidth
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
leftPadding: box.indicator.width + box.spacing
verticalAlignment: Text.AlignVCenter

View File

@@ -22,7 +22,7 @@ HColumnLayout {
HLabel {
id: label
opacity: item.opacity
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
Layout.fillWidth: true
}
@@ -77,7 +77,7 @@ HColumnLayout {
id: errorLabel
opacity: item.opacity
visible: Layout.maximumHeight > 0
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
color: theme.colors.errorText
Layout.maximumHeight: text ? implicitHeight : 0

View File

@@ -15,7 +15,7 @@ HRowLayout {
HLabel {
id: noticeLabel
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
padding: theme.spacing / 2
leftPadding: theme.spacing
rightPadding: leftPadding

View File

@@ -153,9 +153,9 @@ TextArea {
bottomPadding: parent.bottomPadding
wrapMode:
parent.wrapMode === TextEdit.Wrap ? Text.Wrap :
parent.wrapMode === TextEdit.WordWrap ? Text.WordWrap :
parent.wrapMode === TextEdit.WrapAnywhere ? Text.WrapAnywhere :
parent.wrapMode === TextEdit.Wrap ? HLabel.Wrap :
parent.wrapMode === TextEdit.WordWrap ? HLabel.WordWrap :
parent.wrapMode === TextEdit.WrapAnywhere ? HLabel.WrapAnywhere :
Text.NoWrap
font.family: parent.font.family

View File

@@ -135,9 +135,9 @@ TextField {
bottomPadding: parent.bottomPadding
wrapMode:
parent.wrapMode === TextField.Wrap ? Text.Wrap :
parent.wrapMode === TextField.WordWrap ? Text.WordWrap :
parent.wrapMode === TextField.WrapAnywhere ? Text.WrapAnywhere :
parent.wrapMode === TextField.Wrap ? HLabel.Wrap :
parent.wrapMode === TextField.WordWrap ? HLabel.WordWrap :
parent.wrapMode === TextField.WrapAnywhere ? HLabel.WrapAnywhere :
Text.NoWrap
font.family: parent.font.family

View File

@@ -38,7 +38,7 @@ ToolTip {
id: label
color: theme.controls.toolTip.text
text: toolTip.text
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
leftPadding: theme.spacing / 1.5
rightPadding: leftPadding

View File

@@ -162,7 +162,7 @@ HDrawer {
HLabel {
text: "> " + model.input
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
color: theme.chat.message.quote
font.family: theme.fontFamily.mono
visible: Boolean(model.input)
@@ -172,7 +172,7 @@ HDrawer {
HLabel {
text: "" + model.output
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
color: model.error ?
theme.colors.errorText : theme.colors.text
font.family: theme.fontFamily.mono

View File

@@ -183,7 +183,7 @@ HFlickableColumnPage {
theme.fontSize.big * avatar.width / 300,
theme.fontSize.small,
)
wrapMode: Text.WordWrap
wrapMode: HLabel.WordWrap
horizontalAlignment: Qt.AlignHCenter
Layout.fillWidth: true
@@ -204,7 +204,7 @@ HFlickableColumnPage {
text: qsTr("User ID: %1")
.arg(utils.coloredNameHtml(userId, userId, userId))
textFormat: Text.StyledText
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
lineHeight: 1.1
Layout.fillWidth: true

View File

@@ -44,7 +44,7 @@ HFlickableColumnPage {
}
HLabel {
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
text: qsTr(
"The decryption keys for messages received in encrypted rooms " +
"<b>until present time</b> can be saved " +

View File

@@ -21,7 +21,7 @@ HFlickableColumnPage {
}
HLabel {
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Qt.AlignHCenter
text: qsTr(
"Not implemented yet\n\n" +

View File

@@ -22,7 +22,7 @@ HFlickableColumnPage {
}
HLabel {
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Qt.AlignHCenter
text: qsTr(
"Not implemented yet\n\n" +

View File

@@ -211,7 +211,7 @@ HFlickableColumnPage {
HLabel {
id: errorMessage
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Text.AlignHCenter
color: theme.colors.errorText

View File

@@ -140,7 +140,7 @@ HFlickableColumnPage {
HLabel {
id: errorMessage
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Text.AlignHCenter
color: theme.colors.errorText

View File

@@ -110,7 +110,7 @@ HFlickableColumnPage {
HLabel {
id: errorMessage
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Text.AlignHCenter
color: theme.colors.errorText

View File

@@ -93,7 +93,7 @@ HFlickableColumnPage {
HLabel {
id: errorMessage
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
horizontalAlignment: Text.AlignHCenter
color: theme.colors.errorText

View File

@@ -55,7 +55,7 @@ Rectangle {
HLabel {
id: bannerLabel
textFormat: Text.StyledText
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
Layout.fillWidth: true
Layout.leftMargin: bannerIcon.Layout.leftMargin

View File

@@ -59,7 +59,7 @@ HColumnLayout {
model.filepath.replace(/^file:\/\//, "")
elide: expand ? Text.ElideNone : Text.ElideRight
wrapMode: expand ? Text.Wrap : Text.NoWrap
wrapMode: expand ? HLabel.Wrap : Text.NoWrap
text:
cancelPending ?

View File

@@ -5,7 +5,7 @@ import QtQuick.Layouts 1.12
import "../Base"
HLabel {
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
visible: Boolean(text)
Layout.fillWidth: true

View File

@@ -130,7 +130,7 @@ HColumnPopup {
}
visible: Layout.maximumHeight > 0
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
color: theme.colors.errorText
text:
invitingAllowed ?

View File

@@ -84,7 +84,7 @@ HFlickableColumnPopup {
HTextField {
id: passwordField
echoMode: TextInput.Password
echoMode: HTextField.Password
focus: true
error: passwordValid === false
@@ -113,7 +113,7 @@ HFlickableColumnPopup {
HLabel {
id: errorMessage
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
color: theme.colors.errorText
visible: Layout.maximumHeight > 0

View File

@@ -5,7 +5,7 @@ import QtQuick.Layouts 1.12
import "../Base"
HLabel {
wrapMode: Text.Wrap
wrapMode: HLabel.Wrap
font.bold: true
visible: Boolean(text)