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

Добавлена поддержка галереии в постах. #16

Open
sprainbrains wants to merge 77 commits from sprainbrains/harbour-fernschreiber:media_gallery into master
pull from: sprainbrains/harbour-fernschreiber:media_gallery
merge into: medvedych:master
Conversation 0 Commits 77 Files changed 40 +1 -6
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3ac98a4e17 - Show all commits

1
qml/components/settingsPage/SettingsBehavior.qml
View file

@ -216,6 +216,7 @@ AccordionItem {
} }
} }
} }
TextSwitch { TextSwitch {
checked: appSettings.notificationSuppressContent && enabled checked: appSettings.notificationSuppressContent && enabled
text: qsTr("Hide content in notifications") text: qsTr("Hide content in notifications")

6
src/appsettings.h
View file

@ -97,12 +97,9 @@ public:
bool notificationAlwaysShowPreview() const; bool notificationAlwaysShowPreview() const;
void setNotificationAlwaysShowPreview(bool enable); void setNotificationAlwaysShowPreview(bool enable);
<<<<<<< HEAD
bool goToQuotedMessage() const; bool goToQuotedMessage() const;
void setGoToQuotedMessage(bool enable); void setGoToQuotedMessage(bool enable);
=======
>>>>>>> b11f7dd (Always append last message content to notifications (#514))
bool storageOptimizer() const; bool storageOptimizer() const;
void setStorageOptimizer(bool enable); void setStorageOptimizer(bool enable);
@ -142,10 +139,7 @@ signals:
void notificationSuppressContentChanged(); void notificationSuppressContentChanged();
void notificationFeedbackChanged(); void notificationFeedbackChanged();
void notificationAlwaysShowPreviewChanged(); void notificationAlwaysShowPreviewChanged();
<<<<<<< HEAD
void goToQuotedMessageChanged(); void goToQuotedMessageChanged();
=======
>>>>>>> b11f7dd (Always append last message content to notifications (#514))
void storageOptimizerChanged(); void storageOptimizerChanged();
void allowInlineBotLocationAccessChanged(); void allowInlineBotLocationAccessChanged();
void remainingInteractionHintsChanged(); void remainingInteractionHintsChanged();