Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: lockable sliders #412

Merged
merged 28 commits into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9825ed1
fix: replace tab characters by spaces
dw-0 Nov 7, 2021
926c67e
fix: replace tab characters by spaces
dw-0 Nov 7, 2021
59151cb
feature: add lockable sliders
dw-0 Nov 7, 2021
4ca08f5
feat: add lockable sliders
dw-0 Nov 7, 2021
3fa8bf7
Merge branch 'develop' into feature/lockable-sliders
dw-0 Nov 9, 2021
e3abdbb
Merge remote-tracking branch 'origin/feature/lockable-sliders' into f…
dw-0 Nov 9, 2021
6c6b27a
locale: add EN locale for LockSlider and AutoLockSlider features.
dw-0 Nov 10, 2021
ecf9ea6
chore: rename autoLockSliders to lockSliders
dw-0 Nov 10, 2021
0ad3146
refactor: refactor startLockTimer method
dw-0 Nov 14, 2021
3240879
refactor: lockSlidersChanged Watcher
dw-0 Nov 14, 2021
a83eb81
Merge branch 'develop' into feature/lockable-sliders
dw-0 Nov 14, 2021
1246dc9
refactor: remove helper, use new isTouchDevice BaseMixin method instead
dw-0 Nov 14, 2021
67bacff
feat: add lockable sliders to miscellaneous sliders
dw-0 Nov 14, 2021
da1ab48
Merge branch 'develop' into feature/lockable-sliders
dw-0 Nov 15, 2021
bdbc83d
fix: every interaction with the slider resets timeout correctly
dw-0 Nov 16, 2021
2b7ef4a
fix: fix typo
dw-0 Nov 16, 2021
c5be5c3
Merge branch 'develop' into feature/lockable-sliders
dw-0 Nov 17, 2021
87baa93
chore: remove unused import
dw-0 Nov 17, 2021
81463e5
chore: remove unused import
dw-0 Nov 17, 2021
492786b
chore: replace tabs with spaces
dw-0 Nov 17, 2021
88fbd34
chore: replace tabs with spaces / remove trailing newlines
dw-0 Nov 17, 2021
33d968e
refactor: rename name/value pairs to a more appropriate name
dw-0 Nov 17, 2021
7355688
refactor(locale): update EN locale file
dw-0 Nov 17, 2021
c424192
fix: get/set correct store name
dw-0 Nov 17, 2021
6aca6f3
refactor: use "Delay" instead of "Timeout"
dw-0 Nov 17, 2021
690952e
refactor(locale): update EN locale file
dw-0 Nov 17, 2021
987c81b
refactor(locale): update DE locale file
dw-0 Nov 17, 2021
9ff30ae
refactor: rename menuStyle to navigationStyle
dw-0 Nov 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(locale): update EN locale file
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
  • Loading branch information
dw-0 committed Nov 17, 2021
commit 73556885ad53532fd725b88eeb6f7aeceb492b0e
12 changes: 6 additions & 6 deletions src/components/settings/SettingsUiSettingsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
</settings-row>
<v-divider class="my-2"></v-divider>
<v-expand-transition>
<settings-row v-show="lockSliders" :title="$t('Settings.UiSettingsTab.AutoLockSlidersTimeout')" :sub-title="$t('Settings.UiSettingsTab.AutoLockSlidersTimeoutDescription')" :dynamicSlotWidth="true">
<settings-row v-show="lockSliders" :title="$t('Settings.UiSettingsTab.LockSlidersTimeout')" :sub-title="$t('Settings.UiSettingsTab.LockSlidersTimeoutDescription')" :dynamicSlotWidth="true">
<v-text-field
class="mt-0"
prepend-icon="mdi-timer-outline"
:style="isMobile ? { 'max-width': '140px' } : {}"
v-model="autoLockSlidersTimeout"
v-model="lockSlidersTimeout"
label="Timeout"
type="number"
:rules="[t => t >= 0]"
Expand Down Expand Up @@ -185,12 +185,12 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
this.$store.dispatch('gui/saveSetting', {name: 'general.lockSliders', value: newVal})
}

get autoLockSlidersTimeout() {
return this.$store.state.gui.general.autoLockSlidersTimeout
get lockSlidersTimeout() {
return this.$store.state.gui.general.lockSlidersTimeout
}

set autoLockSlidersTimeout(newVal) {
(newVal >= 0) ? this.$store.dispatch('gui/saveSetting', {name: 'general.autoLockSlidersTimeout', value: newVal}) : {}
set lockSlidersTimeout(newVal) {
(newVal >= 0) ? this.$store.dispatch('gui/saveSetting', {name: 'general.lockSlidersTimeout', value: newVal}) : {}
}

get boolWideNavDrawer() {
Expand Down
8 changes: 4 additions & 4 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -680,10 +680,10 @@
"DisplayCANCEL_PRINTDescription": "Shows the CANCEL_PRINT button permanently - no second layer confirmation needed.",
"DisplayZOffset": "Show Z-Offset-Panel",
"DisplayZOffsetDescription": "Otherwise, the panel will appear only after a print has started.",
"LockSliders": "Lock sliders on Mobile and Tablet devices",
"LockSlidersDescription": "Sliders on smaller displays need to be unlocked before changes are allowed.",
"AutoLockSlidersTimeout": "Automatic slider locking timeout",
"AutoLockSlidersTimeoutDescription": "Auto-lock slider after a timeout. If set to 0 or left blank, sliders will only be locked on page change or reload.",
"LockSliders": "Lock sliders on touchscreen devices",
"LockSlidersDescription": "Sliders on touchscreens need to be unlocked before changes are allowed.",
"LockSlidersTimeout": "Slider locking timeout",
"LockSlidersTimeoutDescription": "Sliders will lock after a timeout. If set to 0 or left blank, sliders will only lock on page change/reload.",
"ConfirmOnEmergencyStop": "Require confirm on Emergency Stop",
"ConfirmOnEmergencyStopDescription": "Show a confirmation dialog on Emergency Stop",
"ConfirmOnPowerDeviceChange": "Require confirm on Device Power changes",
Expand Down