diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 5954962e..0412273f 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -76,6 +76,8 @@ import _ from 'lodash';
import * as utils from '../../../share/utils';
import Window from '../../share/Window.vue';
import NumInput from '../../share/NumInput.vue';
+import UserHotKeys from './UserHotKeys/UserHotKeys.vue';
+
import rstore from '../../../store/modules/reader';
import defPalette from './defPalette';
@@ -85,6 +87,7 @@ export default @Component({
components: {
Window,
NumInput,
+ UserHotKeys,
},
data: function() {
return Object.assign({}, rstore.settingDefaults);
diff --git a/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue
new file mode 100644
index 00000000..1535c6af
--- /dev/null
+++ b/client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
Действие
+
+ Сочетания клавиш
+
+
+
+
+
+
+
{{ rstore.readerActions[action] }}
+
+
+ {{ code }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/components/Reader/SettingsPage/include/KeysTab.inc b/client/components/Reader/SettingsPage/include/KeysTab.inc
index a33c44ce..6e53e36c 100644
--- a/client/components/Reader/SettingsPage/include/KeysTab.inc
+++ b/client/components/Reader/SettingsPage/include/KeysTab.inc
@@ -11,3 +11,7 @@
{{ testCode }}
+
+
+
+
\ No newline at end of file
diff --git a/client/quasar.js b/client/quasar.js
index f4325299..05526c9b 100644
--- a/client/quasar.js
+++ b/client/quasar.js
@@ -30,6 +30,7 @@ import {QSelect} from 'quasar/src/components/select';
import {QColor} from 'quasar/src/components/color';
import {QPopupProxy} from 'quasar/src/components/popup-proxy';
import {QDialog} from 'quasar/src/components/dialog';
+import {QChip} from 'quasar/src/components/chip';
const components = {
//QLayout,
@@ -55,6 +56,7 @@ const components = {
QColor,
QPopupProxy,
QDialog,
+ QChip,
};
//directives
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index cd9fa0a8..26307ddf 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -1,6 +1,6 @@
const readerActions = {
'help': 'Справка',
- 'loader': 'Загрузить книгу',
+ 'loader': 'Страница загрузки',
'settings': 'Настроить',
'undoAction': 'Действие назад',
'redoAction': 'Действие вперед',