Переглянути джерело

Скрыта опция "Помочь проекту".
Добавлена кнопка "Вызвать справку".

Book Pauk 3 роки тому
батько
коміт
b4ee9d6c00

+ 4 - 4
client/components/Reader/HelpPage/HelpPage.vue

@@ -29,14 +29,14 @@ import CommonHelpPage from './CommonHelpPage/CommonHelpPage.vue';
 import HotkeysHelpPage from './HotkeysHelpPage/HotkeysHelpPage.vue';
 import MouseHelpPage from './MouseHelpPage/MouseHelpPage.vue';
 import VersionHistoryPage from './VersionHistoryPage/VersionHistoryPage.vue';
-import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
+//import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
 
 const pages = {
     'CommonHelpPage': CommonHelpPage,
     'HotkeysHelpPage': HotkeysHelpPage,
     'MouseHelpPage': MouseHelpPage,
     'VersionHistoryPage': VersionHistoryPage,
-    'DonateHelpPage': DonateHelpPage,
+    //'DonateHelpPage': DonateHelpPage,
 };
 
 const tabs = [
@@ -44,7 +44,7 @@ const tabs = [
     ['MouseHelpPage', 'Мышь/тачскрин'],
     ['HotkeysHelpPage', 'Клавиатура'],
     ['VersionHistoryPage', 'История версий'],
-    ['DonateHelpPage', 'Помочь проекту'],
+    //['DonateHelpPage', 'Помочь проекту'],
 ];
 
 const componentOptions = {
@@ -73,7 +73,7 @@ class HelpPage {
     }
 
     activateDonateHelpPage() {
-        this.selectedTab = 'DonateHelpPage';
+        //this.selectedTab = 'DonateHelpPage';
     }
 
     activateVersionHistoryHelpPage() {

+ 6 - 2
client/components/Reader/LoaderPage/LoaderPage.vue

@@ -46,7 +46,7 @@
 
         <div class="col column justify-end items-center no-wrap overflow-hidden">
             <span class="bottom-span clickable" @click="openHelp">Справка</span>
-            <span class="bottom-span clickable" @click="openDonate">Помочь проекту</span>
+            <!--span class="bottom-span clickable" @click="openDonate">Помочь проекту</span-->
 
             <span v-if="version == clientVersion" class="bottom-span">v{{ version }}</span>
             <span v-else class="bottom-span">Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу</span>
@@ -136,7 +136,7 @@ class LoaderPage {
     }
 
     loadBufferClick() {
-        this.pasteTextToggle();
+        this.showPasteText();
     }
 
     loadBuffer(opts) {
@@ -146,6 +146,10 @@ class LoaderPage {
         }
     }
 
+    showPasteText() {
+        this.pasteTextActive = true;
+    }
+
     pasteTextToggle() {
         this.pasteTextActive = !this.pasteTextActive;
     }

+ 8 - 0
client/components/Reader/Reader.vue

@@ -9,6 +9,13 @@
                             {{ rstore.readerActions['loader'] }}
                         </q-tooltip>
                     </button>
+
+                    <button ref="help" v-ripple class="tool-button" :class="buttonActiveClass('help')" @click="buttonClick('help')">
+                        <q-icon name="la la-question" size="32px" />
+                        <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">
+                            {{ rstore.readerActions['help'] }}
+                        </q-tooltip>
+                    </button>
                 </div>
 
                 <div>
@@ -889,6 +896,7 @@ class Reader {
 
         switch (action) {
             case 'loader':
+            case 'help':
             case 'fullScreen':
             case 'setPosition':
             case 'search':

+ 2 - 2
client/components/Reader/ReaderDialogs/ReaderDialogs.vue

@@ -54,9 +54,9 @@
 
                 <br><br>
                 <div class="row justify-center">
-                    <q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
+                    <!--q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
                         Помочь проекту
-                    </q-btn>
+                    </q-btn-->
                 </div>
             </div>
 

+ 1 - 0
client/store/modules/reader.js

@@ -35,6 +35,7 @@ const readerActions = {
 
 //readerActions[name]
 const toolButtons = [
+    {name: 'help',        show: true},
     {name: 'undoAction',  show: true},
     {name: 'redoAction',  show: true},
     {name: 'fullScreen',  show: true},