Merge pull request 'fix_own_message_ui_3' (#4) from fix_own_message_ui_3 into master

Reviewed-on: #4
This commit is contained in:
medvedych 2023-07-09 14:43:42 +03:00
commit c9773fb5ab
5 changed files with 23 additions and 23 deletions

View file

@ -6,6 +6,6 @@ Exec=harbour-fernschreiber
Name=Fernschreiber Name=Fernschreiber
[X-Sailjail] [X-Sailjail]
Permissions=Audio;Contacts;Documents;Downloads;Internet;Location;MediaIndexing;Microphone;Music;Pictures;PublicDir;RemovableMedia;UserDirs;Videos Permissions=Audio;Documents;Downloads;Internet;Location;MediaIndexing;Microphone;Music;Pictures;PublicDir;RemovableMedia;UserDirs;Videos
OrganizationName=de.ygriega OrganizationName=de.ygriega
ApplicationName=fernschreiber ApplicationName=fernschreiber

View file

@ -17,28 +17,28 @@
along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>. along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.0 import QtQuick 2.0
import org.nemomobile.contacts 1.0 //import org.nemomobile.contacts 1.0
Item { Item {
signal syncError(); // signal syncError();
function synchronize() { // function synchronize() {
if (peopleModel.count === 0) { // if (peopleModel.count === 0) {
appNotification.show(qsTr("Could not synchronize your contacts with Telegram.")); // appNotification.show(qsTr("Could not synchronize your contacts with Telegram."));
syncError(); // syncError();
} else { // } else {
contactsModel.startImportingContacts(); // contactsModel.startImportingContacts();
for (var i = 0; i < peopleModel.count; i++ ) { // for (var i = 0; i < peopleModel.count; i++ ) {
contactsModel.importContact(peopleModel.get(i)); // contactsModel.importContact(peopleModel.get(i));
} // }
contactsModel.stopImportingContacts(); // contactsModel.stopImportingContacts();
} // }
} // }
PeopleModel { // PeopleModel {
id: peopleModel // id: peopleModel
requiredProperty: PeopleModel.PhoneNumberRequired // requiredProperty: PeopleModel.PhoneNumberRequired
} // }
} }

View file

@ -38,7 +38,7 @@ ListItem {
readonly property var userInformation: tdLibWrapper.getUserInformation(myMessage.sender_id.user_id) readonly property var userInformation: tdLibWrapper.getUserInformation(myMessage.sender_id.user_id)
property QtObject precalculatedValues: ListView.view.precalculatedValues property QtObject precalculatedValues: ListView.view.precalculatedValues
readonly property color textColor: isOwnMessage ? Theme.highlightColor : Theme.primaryColor readonly property color textColor: isOwnMessage ? Theme.highlightColor : Theme.primaryColor
readonly property int textAlign: isOwnMessage ? Text.AlignRight : Text.AlignLeft readonly property int textAlign: Text.AlignLeft
readonly property Page page: precalculatedValues.page readonly property Page page: precalculatedValues.page
readonly property bool isSelected: messageListItem.precalculatedValues.pageIsSelecting && page.selectedMessages.some(function(existingMessage) { readonly property bool isSelected: messageListItem.precalculatedValues.pageIsSelecting && page.selectedMessages.some(function(existingMessage) {
return existingMessage.id === messageId return existingMessage.id === messageId

View file

@ -95,7 +95,7 @@ MessageContentBase {
tdLibWrapper.downloadFile(previewFileId); tdLibWrapper.downloadFile(previewFileId);
} }
} else { } else {
placeholderImage.source = "image://theme/icon-l-video?white"; placeholderImage.source = "image://theme/icon-m-video?white";
placeholderImage.width = Theme.itemSizeLarge placeholderImage.width = Theme.itemSizeLarge
placeholderImage.height = Theme.itemSizeLarge placeholderImage.height = Theme.itemSizeLarge
} }

View file

@ -12,14 +12,14 @@ Name: harbour-fernschreiber
Summary: Fernschreiber is a Telegram client for Sailfish OS Summary: Fernschreiber is a Telegram client for Sailfish OS
Version: 0.17 Version: 0.17
Release: 1 Release: 2
Group: Qt/Qt Group: Qt/Qt
License: LICENSE License: LICENSE
URL: http://werkwolf.eu/ URL: http://werkwolf.eu/
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source100: harbour-fernschreiber.yaml Source100: harbour-fernschreiber.yaml
Requires: sailfishsilica-qt5 >= 0.10.9 Requires: sailfishsilica-qt5 >= 0.10.9
Requires: nemo-qml-plugin-contacts-qt5 #Requires: nemo-qml-plugin-contacts-qt5
BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(sailfishapp) >= 1.0.2
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Qml)