Skip to content

Commit 1c29f2b

Browse files
marcelklehrmarcelklehr
committed
enh(AutoSync): Add an explantion in settings
fixes #1832 Signed-off-by: Marcel Klehr <[email protected]>
1 parent 3d97f82 commit 1c29f2b

File tree

7 files changed

+61
-40
lines changed

7 files changed

+61
-40
lines changed

‎_locales/en/messages.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,5 +812,8 @@
812812
},
813813
"DescriptionScheduledforcesync": {
814814
"message": "Do you really want to force sync? Syncing with two devices at the same time can have unforeseen consequences including corruption of your data. Make sure that no other device is syncing at the moment before confirming."
815+
},
816+
"DescriptionAutosync": {
817+
"message": "Turning on automatic sync, will make sure a sync run is triggered regularly within a certain configurable interval as well as on demand a few seconds after you make changes. If you don't turn on automatic sync you will need to trigger sync runs manually by press the sync button."
815818
}
816819
}

‎src/ui/components/OptionAutoSync.vue‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<template>
2+
<div>
3+
<div class="text-h6">
4+
{{ t('LabelAutosync') }}
5+
</div>
6+
<div class="caption">
7+
{{ t('DescriptionAutosync') }}
8+
</div>
9+
<v-switch
10+
:input-value="value"
11+
:aria-label="t('LabelAutosync')"
12+
:label="t('LabelAutosync')"
13+
dense
14+
class="mt-0 pt-0"
15+
@change="$emit('input', $event)" />
16+
</div>
17+
</template>
18+
19+
<script>
20+
export default {
21+
name: 'OptionAutoSync',
22+
props: {
23+
value: {
24+
type: Boolean,
25+
default: true,
26+
}
27+
},
28+
}
29+
</script>
30+
31+
<style scoped>
32+
33+
</style>

‎src/ui/components/OptionsGit.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,9 @@
9393
{{ t('LabelOptionsSyncBehavior') }}
9494
</v-card-title>
9595
<v-card-text>
96-
<v-switch
97-
:input-value="enabled"
98-
:aria-label="t('LabelAutosync')"
99-
:label="t('LabelAutosync')"
100-
dense
101-
class="mt-0 pt-0"
102-
@change="$emit('update:enabled', $event)" />
96+
<OptionAutoSync
97+
:value="enabled"
98+
@input="$emit('update:enabled', $event)" />
10399
<OptionSyncInterval
104100
:value="syncInterval"
105101
@input="$emit('update:syncInterval', $event)" />
@@ -154,10 +150,11 @@ import OptionDownloadLogs from './OptionDownloadLogs'
154150
import OptionAllowNetwork from './native/OptionAllowNetwork'
155151
import OptionFileType from './OptionFileType'
156152
import OptionExportBookmarks from './OptionExportBookmarks.vue'
153+
import OptionAutoSync from './OptionAutoSync.vue'
157154
158155
export default {
159156
name: 'OptionsGit',
160-
components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType },
157+
components: { OptionAutoSync, OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType },
161158
props: ['url', 'username', 'password', 'branch', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled', 'label'],
162159
data() {
163160
return {

‎src/ui/components/OptionsGoogleDrive.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,9 @@
9191
{{ t('LabelOptionsSyncBehavior') }}
9292
</v-card-title>
9393
<v-card-text>
94-
<v-switch
95-
:input-value="enabled"
96-
:aria-label="t('LabelAutosync')"
97-
:label="t('LabelAutosync')"
98-
dense
99-
class="mt-0 pt-0"
100-
@change="$emit('update:enabled', $event)" />
94+
<OptionAutoSync
95+
:value="enabled"
96+
@input="$emit('update:enabled', $event)" />
10197
<OptionSyncInterval
10298
:value="syncInterval"
10399
@input="$emit('update:syncInterval', $event)" />
@@ -142,10 +138,11 @@ import OptionDownloadLogs from './OptionDownloadLogs'
142138
import OptionAllowNetwork from './native/OptionAllowNetwork'
143139
import OptionPassphrase from './OptionPassphrase'
144140
import OptionExportBookmarks from './OptionExportBookmarks.vue'
141+
import OptionAutoSync from './OptionAutoSync.vue'
145142
146143
export default {
147144
name: 'OptionsGoogleDrive',
148-
components: { OptionExportBookmarks, OptionPassphrase, OptionAllowNetwork, OptionDownloadLogs, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync },
145+
components: { OptionAutoSync, OptionExportBookmarks, OptionPassphrase, OptionAllowNetwork, OptionDownloadLogs, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync },
149146
props: ['username', 'password', 'refreshToken', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'enabled', 'label'],
150147
data() {
151148
return {

‎src/ui/components/OptionsLinkwarden.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,9 @@
8686
{{ t('LabelOptionsSyncBehavior') }}
8787
</v-card-title>
8888
<v-card-text>
89-
<v-switch
90-
:input-value="enabled"
91-
:aria-label="t('LabelAutosync')"
92-
:label="t('LabelAutosync')"
93-
dense
94-
class="mt-0 pt-0"
95-
@change="$emit('update:enabled', $event)" />
89+
<OptionAutoSync
90+
:value="enabled"
91+
@input="$emit('update:enabled', $event)" />
9692
<OptionSyncInterval
9793
:value="syncInterval"
9894
@input="$emit('update:syncInterval', $event)" />
@@ -146,10 +142,11 @@ import OptionAllowRedirects from './OptionAllowRedirects'
146142
import OptionDownloadLogs from './OptionDownloadLogs'
147143
import OptionAllowNetwork from './native/OptionAllowNetwork'
148144
import OptionExportBookmarks from './OptionExportBookmarks.vue'
145+
import OptionAutoSync from './OptionAutoSync.vue'
149146
150147
export default {
151148
name: 'OptionsLinkwarden',
152-
components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync },
149+
components: { OptionAutoSync, OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync },
153150
props: ['url', 'username', 'password', 'serverFolder', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'nestedSync', 'failsafe', 'allowRedirects', 'enabled', 'label'],
154151
data() {
155152
return {

‎src/ui/components/OptionsNextcloudBookmarks.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,9 @@
8282
{{ t('LabelOptionsSyncBehavior') }}
8383
</v-card-title>
8484
<v-card-text>
85-
<v-switch
86-
:input-value="enabled"
87-
:aria-label="t('LabelAutosync')"
88-
:label="t('LabelAutosync')"
89-
dense
90-
class="mt-0 pt-0"
91-
@change="$emit('update:enabled', $event)" />
85+
<OptionAutoSync
86+
:value="enabled"
87+
@input="$emit('update:enabled', $event)" />
9288
<OptionSyncInterval
9389
:value="syncInterval"
9490
@input="$emit('update:syncInterval', $event)" />
@@ -153,10 +149,11 @@ import OptionDownloadLogs from './OptionDownloadLogs'
153149
import OptionAllowNetwork from './native/OptionAllowNetwork'
154150
import OptionExportBookmarks from './OptionExportBookmarks.vue'
155151
import { actions } from '../store/definitions'
152+
import OptionAutoSync from './OptionAutoSync.vue'
156153
157154
export default {
158155
name: 'OptionsNextcloudBookmarks',
159-
components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionNestedSync, NextcloudLogin, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval },
156+
components: { OptionAutoSync, OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionNestedSync, NextcloudLogin, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval },
160157
props: ['url', 'username', 'password', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'nestedSync', 'failsafe', 'allowRedirects', 'enabled', 'label', 'clickCountEnabled'],
161158
data() {
162159
return {

‎src/ui/components/OptionsWebdav.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,9 @@
9191
{{ t('LabelOptionsSyncBehavior') }}
9292
</v-card-title>
9393
<v-card-text>
94-
<v-switch
95-
:input-value="enabled"
96-
:aria-label="t('LabelAutosync')"
97-
:label="t('LabelAutosync')"
98-
dense
99-
class="mt-0 pt-0"
100-
@change="$emit('update:enabled', $event)" />
94+
<OptionAutoSync
95+
:value="enabled"
96+
@input="$emit('update:enabled', $event)" />
10197
<OptionSyncInterval
10298
:value="syncInterval"
10399
@input="$emit('update:syncInterval', $event)" />
@@ -153,10 +149,11 @@ import OptionAllowNetwork from './native/OptionAllowNetwork'
153149
import OptionFileType from './OptionFileType'
154150
import OptionExportBookmarks from './OptionExportBookmarks.vue'
155151
import OptionPassphrase from './OptionPassphrase.vue'
152+
import OptionAutoSync from './OptionAutoSync.vue'
156153
157154
export default {
158155
name: 'OptionsWebdav',
159-
components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType, OptionPassphrase },
156+
components: { OptionAutoSync, OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType, OptionPassphrase },
160157
props: ['url', 'username', 'password','passphrase', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled', 'label'],
161158
data() {
162159
return {

0 commit comments

Comments
 (0)