medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Use TruncationMode.Fade

Browse source
This commit is contained in:
John Gibbon 2020-11-22 00:39:49 +01:00
parent 07b8d35fb3
commit 352493f100
10 changed files with 59 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qml/components/InReplyToRow.qml
View file

@ -58,33 +58,24 @@ Row {
spacing: Theme.paddingSmall spacing: Theme.paddingSmall
width: parent.width - ( inReplyToRow.editable ? ( Theme.paddingSmall + removeInReplyToIconButton.width ) : 0 ) width: parent.width - ( inReplyToRow.editable ? ( Theme.paddingSmall + removeInReplyToIconButton.width ) : 0 )
Text { Label {
id: inReplyToUserText id: inReplyToUserText
width: parent.width width: parent.width
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
font.weight: Font.ExtraBold font.weight: Font.ExtraBold
color: Theme.primaryColor
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
} }
Text { Label {
id: inReplyToMessageText id: inReplyToMessageText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width width: parent.width
elide: Text.ElideRight
textFormat: Text.StyledText textFormat: Text.StyledText
onTruncatedChanged: { truncationMode: TruncationMode.Fade
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
} }

27
qml/components/MessageListViewItem.qml
View file

@ -254,7 +254,7 @@ ListItem {
anchors.centerIn: messageBackground anchors.centerIn: messageBackground
Text { Label {
id: userText id: userText
width: parent.width width: parent.width
@ -263,7 +263,7 @@ ListItem {
font.weight: Font.ExtraBold font.weight: Font.ExtraBold
color: messageListItem.textColor color: messageListItem.textColor
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
horizontalAlignment: messageListItem.textAlign horizontalAlignment: messageListItem.textAlign
visible: precalculatedValues.showUserInfo visible: precalculatedValues.showUserInfo
@ -341,38 +341,23 @@ ListItem {
Column { Column {
spacing: Theme.paddingSmall spacing: Theme.paddingSmall
width: parent.width - forwardedThumbnail.width - Theme.paddingSmall width: parent.width - forwardedThumbnail.width - Theme.paddingSmall
Text { Label {
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width width: parent.width
font.italic: true font.italic: true
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
text: qsTr("Forwarded Message") text: qsTr("Forwarded Message")
onTruncatedChanged: {
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
Text { Label {
id: forwardedChannelText id: forwardedChannelText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor color: Theme.primaryColor
width: parent.width width: parent.width
font.bold: true font.bold: true
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
text: Emoji.emojify(forwardedMessageInformationRow.otherChatInformation.title, font.pixelSize) text: Emoji.emojify(forwardedMessageInformationRow.otherChatInformation.title, font.pixelSize)
onTruncatedChanged: {
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
} }
} }

5
qml/components/MessageOverlayFlickable.qml
View file

@ -109,7 +109,7 @@ Flickable {
width: Theme.itemSizeLarge width: Theme.itemSizeLarge
height: Theme.itemSizeLarge height: Theme.itemSizeLarge
} }
Text { Label {
id: overlayMessageUserText id: overlayMessageUserText
width: parent.width - overlayMessagePictureThumbnail.width width: parent.width - overlayMessagePictureThumbnail.width
@ -117,9 +117,8 @@ Flickable {
text: messageOverlayFlickable.isOwnMessage ? qsTr("You") : Emoji.emojify(Functions.getUserName(messageOverlayFlickable.userInformation), font.pixelSize) text: messageOverlayFlickable.isOwnMessage ? qsTr("You") : Emoji.emojify(Functions.getUserName(messageOverlayFlickable.userInformation), font.pixelSize)
font.pixelSize: Theme.fontSizeExtraLarge font.pixelSize: Theme.fontSizeExtraLarge
font.weight: Font.ExtraBold font.weight: Font.ExtraBold
color: Theme.primaryColor
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
} }
} }

37
qml/components/PhotoTextsListItem.qml
View file

@ -78,63 +78,42 @@ ListItem {
width: parent.width * 5 / 6 - Theme.horizontalPageMargin width: parent.width * 5 / 6 - Theme.horizontalPageMargin
spacing: Theme.paddingSmall spacing: Theme.paddingSmall
Text { Label {
id: primaryText id: primaryText
textFormat: Text.StyledText textFormat: Text.StyledText
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: Theme.primaryColor truncationMode: TruncationMode.Fade
elide: Text.ElideRight
width: parent.width width: parent.width
onTruncatedChanged: {
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
Row { Row {
id: additionalTextRow id: additionalTextRow
width: parent.width width: parent.width
spacing: Theme.paddingSmall spacing: Theme.paddingSmall
Text { Label {
id: prologSecondaryText id: prologSecondaryText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
width: Math.min(implicitWidth, parent.width) width: Math.min(implicitWidth, parent.width)
elide: Text.ElideRight elide: Text.ElideRight
color: Theme.highlightColor color: Theme.highlightColor
textFormat: Text.StyledText textFormat: Text.StyledText
onTruncatedChanged: { truncationMode: TruncationMode.Fade
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
Text { Label {
id: secondaryText id: secondaryText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width - Theme.paddingMedium - prologSecondaryText.width width: parent.width - Theme.paddingMedium - prologSecondaryText.width
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
onTruncatedChanged: {
// There is obviously a bug in QML in truncating text with images.
// We simply remove Emojis then...
if (truncated) {
text = text.replace(/\<img [^>]+\/\>/g, "");
}
}
} }
} }
Text { Label {
id: tertiaryText id: tertiaryText
width: parent.width width: parent.width
font.pixelSize: Theme.fontSizeTiny font.pixelSize: Theme.fontSizeTiny
color: Theme.secondaryColor color: Theme.secondaryColor
truncationMode: TruncationMode.Fade
} }
} }
} }

8
qml/components/PinnedMessageItem.qml
View file

@ -77,7 +77,7 @@ Item {
spacing: Theme.paddingSmall spacing: Theme.paddingSmall
width: parent.width width: parent.width
Text { Label {
id: pinnedMessageUserText id: pinnedMessageUserText
width: parent.width width: parent.width
@ -85,18 +85,18 @@ Item {
font.weight: Font.ExtraBold font.weight: Font.ExtraBold
color: Theme.primaryColor color: Theme.primaryColor
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
textFormat: Text.StyledText textFormat: Text.StyledText
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
} }
Text { Label {
id: pinnedMessageText id: pinnedMessageText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor color: Theme.primaryColor
width: parent.width width: parent.width
elide: Text.ElideRight truncationMode: TruncationMode.Fade
maximumLineCount: 1 maximumLineCount: 1
textFormat: Text.StyledText textFormat: Text.StyledText
} }

15
qml/components/StickerPicker.qml
View file

@ -63,13 +63,12 @@ Item {
id: stickerPickerColumn id: stickerPickerColumn
spacing: Theme.paddingMedium spacing: Theme.paddingMedium
width: stickerPickerFlickable.width width: stickerPickerFlickable.width
Text { Label {
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
font.bold: true font.bold: true
color: Theme.primaryColor
width: parent.width width: parent.width
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
text: qsTr("Recently used") text: qsTr("Recently used")
} }
@ -122,13 +121,12 @@ Item {
Column { Column {
spacing: Theme.paddingMedium spacing: Theme.paddingMedium
width: parent.width width: parent.width
Text { Label {
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
font.bold: true font.bold: true
color: Theme.primaryColor
width: parent.width width: parent.width
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
text: modelData.title text: modelData.title
} }
@ -159,12 +157,11 @@ Item {
} }
} }
} }
Text { Label {
font.pixelSize: Theme.fontSizeHuge font.pixelSize: Theme.fontSizeHuge
color: Theme.primaryColor
anchors.fill: parent anchors.fill: parent
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
text: Emoji.emojify(modelData.emoji, font.pixelSize) text: Emoji.emojify(modelData.emoji, font.pixelSize)
visible: !modelData.thumbnail.photo.local.is_downloading_completed visible: !modelData.thumbnail.photo.local.is_downloading_completed
} }

18
qml/components/WebPagePreview.qml
View file

@ -70,7 +70,7 @@ Column {
} }
} }
Text { Label {
id: siteNameText id: siteNameText
width: parent.width width: parent.width
@ -78,35 +78,33 @@ Column {
font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall
font.bold: true font.bold: true
color: Theme.secondaryHighlightColor color: Theme.secondaryHighlightColor
elide: Text.ElideRight truncationMode: TruncationMode.Fade
maximumLineCount: 1 maximumLineCount: 1
textFormat: Text.StyledText textFormat: Text.StyledText
visible: (text !== "") visible: (text !== "")
} }
Text { Label {
id: titleText id: titleText
width: parent.width width: parent.width
text: webPageData.title ? Emoji.emojify(webPageData.title, font.pixelSize) : "" text: webPageData.title ? Emoji.emojify(webPageData.title, font.pixelSize) : ""
font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall
font.bold: true font.bold: true
color: Theme.primaryColor truncationMode: TruncationMode.Fade
elide: Text.ElideRight
wrapMode: Text.Wrap wrapMode: Text.Wrap
maximumLineCount: 2 maximumLineCount: 2
textFormat: Text.StyledText textFormat: Text.StyledText
visible: (text !== "") visible: (text !== "")
} }
Text { Label {
id: descriptionText id: descriptionText
width: parent.width width: parent.width
text: webPageData.description ? Emoji.emojify(webPageData.description, font.pixelSize) : "" text: webPageData.description ? Emoji.emojify(webPageData.description, font.pixelSize) : ""
font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeSmall : Theme.fontSizeExtraSmall
color: Theme.primaryColor truncationMode: TruncationMode.Fade
elide: Text.ElideRight
wrapMode: Text.Wrap wrapMode: Text.Wrap
maximumLineCount: 3 maximumLineCount: 3
textFormat: Text.StyledText textFormat: Text.StyledText
@ -146,7 +144,7 @@ Column {
} }
} }
Text { Label {
id: noPreviewAvailableText id: noPreviewAvailableText
width: parent.width width: parent.width
@ -154,7 +152,7 @@ Column {
font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeExtraSmall : Theme.fontSizeTiny font.pixelSize: webPagePreviewColumn.largerFontSize ? Theme.fontSizeExtraSmall : Theme.fontSizeTiny
font.italic: true font.italic: true
color: Theme.secondaryColor color: Theme.secondaryColor
elide: Text.ElideRight truncationMode: TruncationMode.Fade
wrapMode: Text.Wrap wrapMode: Text.Wrap
maximumLineCount: 1 maximumLineCount: 1
textFormat: Text.StyledText textFormat: Text.StyledText

1
qml/components/chatInformationPage/ChatInformationTabItemMembersGroups.qml
View file

@ -89,7 +89,6 @@ ChatInformationTabItemBase {
tertiaryText { tertiaryText {
maximumLineCount: 1 maximumLineCount: 1
text: user.type["@type"] === "userTypeBot" ? (Emoji.emojify("🤖 "+bot_info.description, tertiaryText.font.pixelSize)) : Functions.getChatPartnerStatusText(user.status["@type"], user.status.was_online); text: user.type["@type"] === "userTypeBot" ? (Emoji.emojify("🤖 "+bot_info.description, tertiaryText.font.pixelSize)) : Functions.getChatPartnerStatusText(user.status["@type"], user.status.was_online);
elide: Text.ElideRight
} }
onClicked: { onClicked: {

34
qml/pages/ChatPage.qml
View file

@ -603,15 +603,15 @@ Page {
Row { Row {
id: headerRow id: headerRow
width: parent.width - (3 * Theme.horizontalPageMargin) width: parent.width - (3 * Theme.horizontalPageMargin)
height: chatOverviewColumn.height + ( chatPage.isPortrait ? (2 * Theme.paddingMedium) : (2 * Theme.paddingSmall) ) height: chatOverviewItem.height + ( chatPage.isPortrait ? (2 * Theme.paddingMedium) : (2 * Theme.paddingSmall) )
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
spacing: Theme.paddingMedium spacing: Theme.paddingMedium
ProfileThumbnail { ProfileThumbnail {
id: chatPictureThumbnail id: chatPictureThumbnail
replacementStringHint: chatNameText.text replacementStringHint: chatNameText.text
width: chatOverviewColumn.height width: chatOverviewItem.height
height: chatOverviewColumn.height height: chatOverviewItem.height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall
@ -626,34 +626,38 @@ Page {
} }
} }
Column { Item {
id: chatOverviewColumn id: chatOverviewItem
width: parent.width - chatPictureThumbnail.width - Theme.paddingMedium width: parent.width - chatPictureThumbnail.width - Theme.paddingMedium
height: chatNameText.height + chatStatusText.height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall
Text { Label {
id: chatNameText id: chatNameText
width: Math.min(implicitWidth, parent.width)
anchors.right: parent.right
text: chatInformation.title !== "" ? Emoji.emojify(chatInformation.title, font.pixelSize) : qsTr("Unknown") text: chatInformation.title !== "" ? Emoji.emojify(chatInformation.title, font.pixelSize) : qsTr("Unknown")
textFormat: Text.StyledText textFormat: Text.StyledText
font.pixelSize: chatPage.isPortrait ? Theme.fontSizeLarge : Theme.fontSizeMedium font.pixelSize: chatPage.isPortrait ? Theme.fontSizeLarge : Theme.fontSizeMedium
font.family: Theme.fontFamilyHeading font.family: Theme.fontFamilyHeading
color: Theme.highlightColor color: Theme.highlightColor
elide: Text.ElideRight truncationMode: TruncationMode.Fade
width: parent.width
maximumLineCount: 1 maximumLineCount: 1
horizontalAlignment: Text.AlignRight
} }
Text { Label {
id: chatStatusText id: chatStatusText
width: Math.min(implicitWidth, parent.width)
anchors {
right: parent.right
bottom: parent.bottom
}
text: "" text: ""
textFormat: Text.StyledText textFormat: Text.StyledText
font.pixelSize: chatPage.isPortrait ? Theme.fontSizeExtraSmall : Theme.fontSizeTiny font.pixelSize: chatPage.isPortrait ? Theme.fontSizeExtraSmall : Theme.fontSizeTiny
font.family: Theme.fontFamilyHeading font.family: Theme.fontFamilyHeading
color: headerMouseArea.pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor color: headerMouseArea.pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor
elide: Text.ElideRight truncationMode: TruncationMode.Fade
width: parent.width
maximumLineCount: 1 maximumLineCount: 1
horizontalAlignment: Text.AlignRight
} }
} }
} }
@ -1093,14 +1097,14 @@ Page {
visible: attachmentPreviewRow.isPicture || attachmentPreviewRow.isVideo visible: attachmentPreviewRow.isPicture || attachmentPreviewRow.isVideo
} }
Text { Label {
id: attachmentPreviewText id: attachmentPreviewText
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
text: typeof attachmentPreviewRow.fileProperties !== "undefined" ? attachmentPreviewRow.fileProperties.fileName || "" : ""; text: typeof attachmentPreviewRow.fileProperties !== "undefined" ? attachmentPreviewRow.fileProperties.fileName || "" : "";
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
maximumLineCount: 1 maximumLineCount: 1
elide: Text.ElideRight truncationMode: TruncationMode.Fade
color: Theme.secondaryColor color: Theme.secondaryColor
visible: attachmentPreviewRow.isDocument visible: attachmentPreviewRow.isDocument
} }

5
qml/pages/CoverPage.qml
View file

@ -120,15 +120,14 @@ CoverBackground {
color: Theme.primaryColor color: Theme.primaryColor
text: Functions.getShortenedCount(coverPage.unreadMessages) text: Functions.getShortenedCount(coverPage.unreadMessages)
} }
Text { Label {
id: unreadMessagesText id: unreadMessagesText
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.primaryColor
width: parent.width - unreadMessagesCountText.width - Theme.paddingMedium width: parent.width - unreadMessagesCountText.width - Theme.paddingMedium
wrapMode: Text.Wrap wrapMode: Text.Wrap
anchors.verticalCenter: unreadMessagesCountText.verticalCenter anchors.verticalCenter: unreadMessagesCountText.verticalCenter
maximumLineCount: 2 maximumLineCount: 2
elide: Text.ElideRight truncationMode: TruncationMode.Fade
} }
} }