Commit 475912ad authored by Karel Slaný's avatar Karel Slaný

Merge branch 'disable-msg-delete' into 'develop'

Messages and attachments are not deleted in default settings

Closes #114

See merge request !115
parents eefb6fd5 d2a3bb35
......@@ -90,7 +90,7 @@ Item {
/* Must be a non-decreasing list ending with infinity. */
items: [90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165, 170, 175, 180, qsTr("don't delete")]
dfltIdx: 0
dfltIdx: 19
accessibleDescription: qsTr("Select the number of days how long downloaded messages are kept in local storage after download.")
......@@ -102,7 +102,7 @@ Item {
text: if (messageLifeSpinBox.val() === 0) {
qsTr("Messages won't automatically be deleted from the local storage.")
} else {
qsTr("Messages will be locally stored for a period of %1 days since their acceptance time. Default is %2 days.").arg(messageLifeSpinBox.val()).arg(messageLifeSpinBox.items[messageLifeSpinBox.dfltIdx])
qsTr("Messages will be locally stored for a period of %1 days since their acceptance time. Default is not delete.").arg(messageLifeSpinBox.val())
}
wrapMode: Text.Wrap
}
......@@ -117,7 +117,7 @@ Item {
/* Must be a non-decreasing list ending with infinity. */
items: [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, qsTr("like messages")]
dfltIdx: 1
dfltIdx: 17
accessibleDescription: qsTr("Select the number of days how long message content is kept in local storage after download.")
......@@ -129,7 +129,7 @@ Item {
text: if (attachLifeSpinBox.val() === 0) {
qsTr("Attachments won't be deleted from the local storage as long as the corresponding messages won't be deleted.")
} else {
qsTr("Attachments will be locally stored, but no longer than corresponding messages, for a period of %1 days since their download time. Default is %2 days.").arg(attachLifeSpinBox.val()).arg(attachLifeSpinBox.items[attachLifeSpinBox.dfltIdx])
qsTr("Attachments will be locally stored, but no longer than corresponding messages, for a period of %1 days since their download time. Default is like message settings.").arg(attachLifeSpinBox.val())
}
wrapMode: Text.Wrap
}
......
......@@ -37,8 +37,8 @@
/* Supported languages. Default is system */
/* Default value which define how long will have
* attachment files stored in local database (in days)*/
#define DEFAULT_MSG_LIFETIME 90
#define DEFAULT_FILE_LIFETIME 10
#define DEFAULT_MSG_LIFETIME 0 // 0 means mesasges do not delete
#define DEFAULT_FILE_LIFETIME 0 // 0 means files do not delete
#define DEFAULT_ZFO_LIMIT_MB 200
#define DEFAULT_PIN_INACT_TIMEOUT 0
#define DEFAULT_FONT_SIZE 16
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment