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

Display information for forwarded messages

Browse source
This commit is contained in:
Sebastian J. Wolf 2020-10-07 22:17:44 +02:00
parent c76240e914
commit c0269b5502
14 changed files with 114 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qml/components/ProfileThumbnail.qml
View file

@ -161,7 +161,7 @@ Item {
text: getReplacementString()
color: Theme.primaryColor
font.bold: true
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: ( profileThumbnail.height >= Theme.itemSizeSmall ) ? Theme.fontSizeLarge : Theme.fontSizeMedium
}
}

2
qml/pages/AboutPage.qml
View file

@ -56,7 +56,7 @@ Page {
}
Label {
text: "Fernschreiber 0.2"
text: "Fernschreiber 0.3"
horizontalAlignment: Text.AlignHCenter
font.pixelSize: Theme.fontSizeExtraLarge
anchors {

77
qml/pages/ChatPage.qml
View file

@ -502,6 +502,7 @@ Page {
audioPreviewLoader.active = (( display.content['@type'] === "messageVoiceNote" ) || ( display.content['@type'] === "messageAudio" ));
documentPreviewLoader.active = ( display.content['@type'] === "messageDocument" );
locationPreviewLoader.active = ( display.content['@type'] === "messageLocation" || ( display.content['@type'] === "messageVenue" ))
forwardedInformationLoader.active = ( typeof display.forward_info !== "undefined" );
}
}
@ -606,6 +607,82 @@ Page {
visible: false
}
Loader {
id: forwardedInformationLoader
active: false
asynchronous: true
width: parent.width
sourceComponent: Component {
Row {
id: forwardedMessageInformationRow
spacing: Theme.paddingSmall
width: parent.width
Component.onCompleted: {
if (display.forward_info.origin["@type"] === "messageForwardOriginChannel") {
var otherChatInformation = tdLibWrapper.getChat(display.forward_info.origin.chat_id);
forwardedThumbnail.photoData = (typeof otherChatInformation.photo !== "undefined") ? otherChatInformation.photo.small : "";
forwardedChannelText.text = otherChatInformation.title;
} else if (display.forward_info.origin["@type"] === "messageForwardOriginUser") {
var otherUserInformation = tdLibWrapper.getUserInformation(display.forward_info.origin.sender_user_id);
forwardedThumbnail.photoData = (typeof otherUserInformation.profile_photo !== "undefined") ? otherUserInformation.profile_photo.small : "";
forwardedChannelText.text = Functions.getUserName(otherUserInformation);
} else {
forwardedThumbnail.photoData = "";
forwardedChannelText.text = display.forward_info.origin.sender_user_name;
}
}
ProfileThumbnail {
id: forwardedThumbnail
replacementStringHint: forwardedChannelText.text
width: Theme.itemSizeExtraSmall
height: Theme.itemSizeExtraSmall
}
Column {
spacing: Theme.paddingSmall
width: parent.width
Text {
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width
font.italic: true
elide: Text.ElideRight
textFormat: Text.StyledText
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 {
id: forwardedChannelText
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width
font.bold: true
elide: Text.ElideRight
textFormat: Text.StyledText
text: forwardedMessageInformationRow.otherChatInformation.title
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 {
id: messageText

3
rpm/harbour-fernschreiber.spec
View file

@ -11,7 +11,7 @@ Name: harbour-fernschreiber
# << macros
Summary: Fernschreiber is a Telegram client for Sailfish OS
Version: 0.2
Version: 0.3
Release: 1
Group: Qt/Qt
License: LICENSE
@ -27,7 +27,6 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(nemonotifications-qt5)
BuildRequires: pkgconfig(ngf-qt5)
BuildRequires: desktop-file-utils
BuildRequires: qt5-qttools-linguist
%description
Fernschreiber is a Telegram client for Sailfish OS

2
rpm/harbour-fernschreiber.yaml
View file

@ -1,6 +1,6 @@
Name: harbour-fernschreiber
Summary: Fernschreiber is a Telegram client for Sailfish OS
Version: 0.2
Version: 0.3
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS

2
src/tdlibwrapper.cpp
View file

@ -803,7 +803,7 @@ void TDLibWrapper::setInitialParameters()
QSettings hardwareSettings("/etc/hw-release", QSettings::NativeFormat);
initialParameters.insert("device_model", hardwareSettings.value("NAME", "Unknown Mobile Device").toString());
initialParameters.insert("system_version", QSysInfo::prettyProductName());
initialParameters.insert("application_version", "0.2");
initialParameters.insert("application_version", "0.3");
requestObject.insert("parameters", initialParameters);
this->sendRequest(requestObject);
}

4
translations/harbour-fernschreiber-de.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation>Lade hoch...</translation>
</message>
<message>
<source>Forwarded Message</source>
<translation>Weitergeleitete Nachricht</translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-es.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation>Subiendo...</translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-fi.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation>Lähetetään...</translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-hu.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-pl.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-ru.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation>Отправка...</translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber-zh_CN.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation>正在上传……</translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>

4
translations/harbour-fernschreiber.ts
View file

@ -173,6 +173,10 @@
<source>Uploading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forwarded Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CoverPage</name>