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

Merge latest upstream changes...

Browse source
This commit is contained in:
Sebastian Wolf 2020-11-26 15:38:15 +01:00
commit 6f889437ed
18 changed files with 246 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
qml/pages/AboutPage.qml
View file

@ -156,39 +156,48 @@ Page {
}
}
Text {
x: Theme.horizontalPageMargin
width: parent.width - ( 2 * Theme.horizontalPageMargin )
horizontalAlignment: Text.AlignHCenter
text: qsTr("Logged in as %1").arg(Emoji.emojify(aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name, Theme.fontSizeSmall))
font.pixelSize: Theme.fontSizeSmall
wrapMode: Text.Wrap
color: Theme.primaryColor
textFormat: Text.StyledText
anchors {
horizontalCenter: parent.horizontalCenter
}
}
Loader {
active: !!aboutPage.userInformation.phone_number
width: parent.width
sourceComponent: Component {
Column {
ProfileThumbnail {
photoData: aboutPage.userInformation.profile_photo.small
width: Theme.itemSizeExtraLarge
height: Theme.itemSizeExtraLarge
replacementStringHint: aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name
anchors {
horizontalCenter: parent.horizontalCenter
}
}
Text {
x: Theme.horizontalPageMargin
width: parent.width - ( 2 * Theme.horizontalPageMargin )
horizontalAlignment: Text.AlignHCenter
text: qsTr("Logged in as %1").arg(Emoji.emojify(aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name, Theme.fontSizeSmall))
font.pixelSize: Theme.fontSizeSmall
wrapMode: Text.Wrap
color: Theme.primaryColor
textFormat: Text.StyledText
anchors {
horizontalCenter: parent.horizontalCenter
}
}
Label {
x: Theme.horizontalPageMargin
width: parent.width - ( 2 * Theme.horizontalPageMargin )
horizontalAlignment: Text.AlignHCenter
text: qsTr("Phone number: +%1").arg(aboutPage.userInformation.phone_number)
font.pixelSize: Theme.fontSizeSmall
wrapMode: Text.Wrap
anchors {
horizontalCenter: parent.horizontalCenter
ProfileThumbnail {
photoData: aboutPage.userInformation.profile_photo.small
width: Theme.itemSizeExtraLarge
height: Theme.itemSizeExtraLarge
replacementStringHint: aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name
anchors {
horizontalCenter: parent.horizontalCenter
}
}
Label {
x: Theme.horizontalPageMargin
width: parent.width - ( 2 * Theme.horizontalPageMargin )
horizontalAlignment: Text.AlignHCenter
text: qsTr("Phone number: +%1").arg(aboutPage.userInformation.phone_number)
font.pixelSize: Theme.fontSizeSmall
wrapMode: Text.Wrap
anchors {
horizontalCenter: parent.horizontalCenter
}
}
}
}
}

7
qml/pages/InitializationPage.qml
View file

@ -105,6 +105,13 @@ Page {
Behavior on contentHeight { NumberAnimation {} }
anchors.fill: parent
PullDownMenu {
MenuItem {
text: qsTr("About Fernschreiber")
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
}
}
Column {
id: content
width: parent.width

17
qml/pages/SettingsPage.qml
View file

@ -149,6 +149,23 @@ Page {
}
}
SectionHeader {
text: qsTr("Storage")
}
TextSwitch {
checked: appSettings.storageOptimizer
text: qsTr("Enable storage optimizer")
automaticCheck: false
onClicked: {
appSettings.storageOptimizer = !checked
}
}
Item {
width: 1
height: Theme.paddingLarge // Some space at the bottom
}
}
VerticalScrollDecorator {}

15
src/appsettings.cpp
View file

@ -27,6 +27,7 @@ namespace {
const QString KEY_ANIMATE_STICKERS("animateStickers");
const QString KEY_NOTIFICATION_TURNS_DISPLAY_ON("notificationTurnsDisplayOn");
const QString KEY_NOTIFICATION_FEEDBACK("notificationFeedback");
const QString KEY_STORAGE_OPTIMIZER("storageOptimizer");
}
AppSettings::AppSettings(QObject *parent) : QObject(parent), settings("harbour-fernschreiber", "settings")
@ -116,3 +117,17 @@ void AppSettings::setNotificationFeedback(NotificationFeedback feedback)
emit notificationFeedbackChanged();
}
}
bool AppSettings::storageOptimizer() const
{
return settings.value(KEY_STORAGE_OPTIMIZER, false).toBool();
}
void AppSettings::setStorageOptimizer(bool enable)
{
if (storageOptimizer() != enable) {
LOG(KEY_STORAGE_OPTIMIZER << enable);
settings.setValue(KEY_STORAGE_OPTIMIZER, enable);
emit storageOptimizerChanged();
}
}

5
src/appsettings.h
View file

@ -29,6 +29,7 @@ class AppSettings : public QObject {
Q_PROPERTY(bool animateStickers READ animateStickers WRITE setAnimateStickers NOTIFY animateStickersChanged)
Q_PROPERTY(bool notificationTurnsDisplayOn READ notificationTurnsDisplayOn WRITE setNotificationTurnsDisplayOn NOTIFY notificationTurnsDisplayOnChanged)
Q_PROPERTY(NotificationFeedback notificationFeedback READ notificationFeedback WRITE setNotificationFeedback NOTIFY notificationFeedbackChanged)
Q_PROPERTY(bool storageOptimizer READ storageOptimizer WRITE setStorageOptimizer NOTIFY storageOptimizerChanged)
public:
enum NotificationFeedback {
@ -59,6 +60,9 @@ public:
NotificationFeedback notificationFeedback() const;
void setNotificationFeedback(NotificationFeedback feedback);
bool storageOptimizer() const;
void setStorageOptimizer(bool enable);
signals:
void sendByEnterChanged();
void useOpenWithChanged();
@ -66,6 +70,7 @@ signals:
void animateStickersChanged();
void notificationTurnsDisplayOnChanged();
void notificationFeedbackChanged();
void storageOptimizerChanged();
private:
QSettings settings;

35
src/tdlibwrapper.cpp
View file

@ -40,6 +40,7 @@ namespace {
const QString LAST_NAME("last_name");
const QString FIRST_NAME("first_name");
const QString USERNAME("username");
const QString VALUE("value");
const QString _TYPE("@type");
const QString _EXTRA("@extra");
}
@ -119,6 +120,7 @@ TDLibWrapper::TDLibWrapper(AppSettings *appSettings, MceInterface *mceInterface,
connect(&emojiSearchWorker, SIGNAL(searchCompleted(QString, QVariantList)), this, SLOT(handleEmojiSearchCompleted(QString, QVariantList)));
connect(this->appSettings, SIGNAL(useOpenWithChanged()), this, SLOT(handleOpenWithChanged()));
connect(this->appSettings, SIGNAL(storageOptimizerChanged()), this, SLOT(handleStorageOptimizerChanged()));
this->tdLibReceiver->start();
@ -482,14 +484,25 @@ void TDLibWrapper::getMessage(const QString &chatId, const QString &messageId)
void TDLibWrapper::setOptionInteger(const QString &optionName, int optionValue)
{
LOG("Setting integer option" << optionName << optionValue);
QVariantMap requestObject;
requestObject.insert(_TYPE, "setOption");
requestObject.insert("name", optionName);
QVariantMap optionValueMap;
optionValueMap.insert(_TYPE, "optionValueInteger");
optionValueMap.insert("value", optionValue);
requestObject.insert("value", optionValueMap);
this->sendRequest(requestObject);
setOption(optionName, "optionValueInteger", optionValue);
}
void TDLibWrapper::setOptionBoolean(const QString &optionName, bool optionValue)
{
LOG("Setting boolean option" << optionName << optionValue);
setOption(optionName, "optionValueBoolean", optionValue);
}
void TDLibWrapper::setOption(const QString &name, const QString &type, const QVariant &value)
{
QVariantMap optionValue;
optionValue.insert(_TYPE, type);
optionValue.insert(VALUE, value);
QVariantMap request;
request.insert(_TYPE, "setOption");
request.insert("name", name);
request.insert(VALUE, optionValue);
sendRequest(request);
}
void TDLibWrapper::setChatNotificationSettings(const QString &chatId, const QVariantMap &notificationSettings)
@ -1177,6 +1190,11 @@ void TDLibWrapper::handleSecretChatUpdated(const QString &secretChatId, const QV
emit secretChatUpdated(secretChatId, secretChat);
}
void TDLibWrapper::handleStorageOptimizerChanged()
{
setOptionBoolean("use_storage_optimizer", appSettings->storageOptimizer());
}
void TDLibWrapper::setInitialParameters()
{
LOG("Sending initial parameters to TD Lib");
@ -1195,6 +1213,7 @@ void TDLibWrapper::setInitialParameters()
initialParameters.insert("device_model", hardwareSettings.value("NAME", "Unknown Mobile Device").toString());
initialParameters.insert("system_version", QSysInfo::prettyProductName());
initialParameters.insert("application_version", "0.5");
initialParameters.insert("enable_storage_optimizer", appSettings->storageOptimizer());
// initialParameters.insert("use_test_dc", true);
requestObject.insert("parameters", initialParameters);
this->sendRequest(requestObject);

3
src/tdlibwrapper.h
View file

@ -144,6 +144,7 @@ public:
Q_INVOKABLE void forwardMessages(const QString &chatId, const QString &fromChatId, const QVariantList &messageIds, const bool sendCopy, const bool removeCaption);
Q_INVOKABLE void getMessage(const QString &chatId, const QString &messageId);
Q_INVOKABLE void setOptionInteger(const QString &optionName, int optionValue);
Q_INVOKABLE void setOptionBoolean(const QString &optionName, bool optionValue);
Q_INVOKABLE void setChatNotificationSettings(const QString &chatId, const QVariantMap &notificationSettings);
Q_INVOKABLE void editMessageText(const QString &chatId, const QString &messageId, const QString &message);
Q_INVOKABLE void deleteMessages(const QString &chatId, const QVariantList messageIds);
@ -260,8 +261,10 @@ public slots:
void handleOpenWithChanged();
void handleSecretChatReceived(const QString &secretChatId, const QVariantMap &secretChat);
void handleSecretChatUpdated(const QString &secretChatId, const QVariantMap &secretChat);
void handleStorageOptimizerChanged();
private:
void setOption(const QString &name, const QString &type, const QVariant &value);
void setInitialParameters();
void setEncryptionKey();
void setLogVerbosityLevel();

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

@ -833,6 +833,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Nutzen Sie das internationale Format, z.B. %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>Über Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1249,6 +1253,14 @@
<source>Notification turns on the display</source>
<translation>Hinweis schaltet den Bildschirm an</translation>
</message>
<message>
<source>Storage</source>
<translation>Speicher</translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation>Speicheroptimierer einschalten</translation>
</message>
</context>
<context>
<name>StickerPicker</name>

12
translations/harbour-fernschreiber-en.ts
View file

@ -833,6 +833,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Use the international format, e.g. %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>About Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1249,6 +1253,14 @@
<source>Notification turns on the display</source>
<translation>Notification turns on the display</translation>
</message>
<message>
<source>Storage</source>
<translation>Storage</translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation>Enable storage optimizer</translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -823,6 +823,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Usar el formato internacional %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>Acerca de</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1230,6 +1234,14 @@
<source>Notification turns on the display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -834,6 +834,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Käytä kansainvälistä muotoa, esimerkiksi %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>Tietoa Fernschreiberista</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1250,6 +1254,14 @@
<source>Notification turns on the display</source>
<translation>Ilmoitus kytkee näytön päälle</translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -823,6 +823,10 @@
<source>Use the international format, e.g. %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>A Fernschreiber névjegye</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1230,6 +1234,14 @@
<source>Notification turns on the display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

12
translations/harbour-fernschreiber-it.ts
View file

@ -833,6 +833,10 @@
<source>Loading...</source>
<translation>Carica...</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>Informazioni su Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1249,6 +1253,14 @@
<source>Notification turns on the display</source>
<translation>Notifiche attivano il display</translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -843,6 +843,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Użyj międzynarodowego formatu, %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>O Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1268,6 +1272,14 @@
<source>Notification turns on the display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -843,6 +843,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Используйте международный формат, например %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1268,6 +1272,14 @@
<source>Notification turns on the display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

12
translations/harbour-fernschreiber-sv.ts
View file

@ -833,6 +833,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Använd internationellt format, t.ex. %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>Om Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1249,6 +1253,14 @@
<source>Notification turns on the display</source>
<translation>Avisering tänder skärmen</translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

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

@ -823,6 +823,10 @@
<source>Use the international format, e.g. %1</source>
<translation>请使用国际区号格式，例如 %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>关于 Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1230,6 +1234,14 @@
<source>Notification turns on the display</source>
<translation>收到通知时点亮屏幕</translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>

12
translations/harbour-fernschreiber.ts
View file

@ -833,6 +833,10 @@
<source>Use the international format, e.g. %1</source>
<translation>Use the international format, e.g. %1</translation>
</message>
<message>
<source>About Fernschreiber</source>
<translation>About Fernschreiber</translation>
</message>
</context>
<context>
<name>LocationPreview</name>
@ -1249,6 +1253,14 @@
<source>Notification turns on the display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Storage</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable storage optimizer</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StickerPicker</name>