diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue index 8998c73c..97185375 100644 --- a/client/components/Reader/HelpPage/HelpPage.vue +++ b/client/components/Reader/HelpPage/HelpPage.vue @@ -43,8 +43,8 @@ const pages = { const tabs = [ ['CommonHelpPage', 'Общее'], - ['HotkeysHelpPage', 'Клавиатура'], ['MouseHelpPage', 'Мышь/тачскрин'], + ['HotkeysHelpPage', 'Клавиатура'], ['VersionHistoryPage', 'История версий'], ['DonateHelpPage', 'Помочь проекту'], ]; diff --git a/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue b/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue index b6078c70..5073bdd3 100644 --- a/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue +++ b/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue @@ -1,8 +1,13 @@ @@ -11,11 +16,25 @@ import Vue from 'vue'; import Component from 'vue-class-component'; +import UserHotKeys from '../../SettingsPage/UserHotKeys/UserHotKeys.vue'; + export default @Component({ + components: { + UserHotKeys, + }, }) class HotkeysHelpPage extends Vue { created() { } + + get userHotKeys() { + return this.$store.state.reader.settings.userHotKeys; + } + + set userHotKeys(value) { + //no setter + } + } //----------------------------------------------------------------------------- @@ -24,7 +43,13 @@ class HotkeysHelpPage extends Vue { .page { padding: 15px; overflow-y: auto; +} + +.header { font-size: 120%; - line-height: 130%; +} + +.table { + width: 550px; } diff --git a/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue index 00045b6b..4053df5a 100644 --- a/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue +++ b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue @@ -4,13 +4,15 @@
Команда
- Сочетание клавиш - Сочетание клавиш
+ -
+
Установить все сочетания по умолчанию @@ -26,14 +28,14 @@
{{ code }}
-
+