Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refer to custom components to access their enums

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

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

2
src/gui/Base/HCheckBox.qml
View File

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

4
src/gui/Base/HLabeledItem.qml
View File

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

2
src/gui/Base/HNoticePage.qml
View File

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

6
src/gui/Base/HTextArea.qml
View File

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

6
src/gui/Base/HTextField.qml
View File

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

2
src/gui/Base/HToolTip.qml
View File

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

4
src/gui/DebugConsole.qml
View File

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

4
src/gui/Pages/AccountSettings/Account.qml
View File

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

2
src/gui/Pages/AccountSettings/Encryption.qml
View File

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

2
src/gui/Pages/AddAccount/Register.qml
View File

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

2
src/gui/Pages/AddAccount/Reset.qml
View File

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

2
src/gui/Pages/AddAccount/SignIn.qml
View File

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

2
src/gui/Pages/AddChat/CreateRoom.qml
View File

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

2
src/gui/Pages/AddChat/DirectChat.qml
View File

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

2
src/gui/Pages/AddChat/JoinRoom.qml
View File

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

2
src/gui/Pages/Chat/Banners/Banner.qml
View File

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

2
src/gui/Pages/Chat/FileTransfer/Transfer.qml
View File

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

2
src/gui/Popups/DetailsLabel.qml
View File

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

2
src/gui/Popups/InviteToRoomPopup.qml
View File

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

4
src/gui/Popups/PasswordPopup.qml
View File

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

2
src/gui/Popups/SummaryLabel.qml
View File

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