From 1a8f241aad76b890297dd8fe6c077d3b23128328 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 1 Nov 2021 17:56:45 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20Vue=203,=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=B0=D1=8F=20=D1=80=D0=B5=D1=81=D1=82=D1=80=D1=83=D0=BA?=
 =?UTF-8?q?=D1=82=D1=83=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettingsPage/{include => }/ButtonsTab.inc |   0
 .../SettingsPage/{include => }/ConvertTab.inc |   0
 .../SettingsPage/{include => }/KeysTab.inc    |   0
 .../SettingsPage/{include => }/OthersTab.inc  |   0
 .../{include => }/PageMoveTab.inc             |   0
 .../{include => }/ProfilesTab.inc             |   0
 .../SettingsPage/{include => }/ResetTab.inc   |   0
 .../Reader/SettingsPage/SettingsPage.vue      |  54 ++++++--
 .../Reader/SettingsPage/ViewTab/Color.inc     | 116 ++++++++++++++++++
 .../{include => }/ViewTab/Font.inc            |   0
 .../{include => }/ViewTab/Mode.inc            |   0
 .../{include => }/ViewTab/Status.inc          |   0
 .../{include => }/ViewTab/Text.inc            |   0
 .../Reader/SettingsPage/include/ViewTab.inc   |  39 ------
 .../SettingsPage/include/ViewTab/Color.inc    |  95 --------------
 15 files changed, 162 insertions(+), 142 deletions(-)
 rename client/components/Reader/SettingsPage/{include => }/ButtonsTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ConvertTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/KeysTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/OthersTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/PageMoveTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ProfilesTab.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ResetTab.inc (100%)
 create mode 100644 client/components/Reader/SettingsPage/ViewTab/Color.inc
 rename client/components/Reader/SettingsPage/{include => }/ViewTab/Font.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ViewTab/Mode.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ViewTab/Status.inc (100%)
 rename client/components/Reader/SettingsPage/{include => }/ViewTab/Text.inc (100%)
 delete mode 100644 client/components/Reader/SettingsPage/include/ViewTab.inc
 delete mode 100644 client/components/Reader/SettingsPage/include/ViewTab/Color.inc

diff --git a/client/components/Reader/SettingsPage/include/ButtonsTab.inc b/client/components/Reader/SettingsPage/ButtonsTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ButtonsTab.inc
rename to client/components/Reader/SettingsPage/ButtonsTab.inc
diff --git a/client/components/Reader/SettingsPage/include/ConvertTab.inc b/client/components/Reader/SettingsPage/ConvertTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ConvertTab.inc
rename to client/components/Reader/SettingsPage/ConvertTab.inc
diff --git a/client/components/Reader/SettingsPage/include/KeysTab.inc b/client/components/Reader/SettingsPage/KeysTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/KeysTab.inc
rename to client/components/Reader/SettingsPage/KeysTab.inc
diff --git a/client/components/Reader/SettingsPage/include/OthersTab.inc b/client/components/Reader/SettingsPage/OthersTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/OthersTab.inc
rename to client/components/Reader/SettingsPage/OthersTab.inc
diff --git a/client/components/Reader/SettingsPage/include/PageMoveTab.inc b/client/components/Reader/SettingsPage/PageMoveTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/PageMoveTab.inc
rename to client/components/Reader/SettingsPage/PageMoveTab.inc
diff --git a/client/components/Reader/SettingsPage/include/ProfilesTab.inc b/client/components/Reader/SettingsPage/ProfilesTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ProfilesTab.inc
rename to client/components/Reader/SettingsPage/ProfilesTab.inc
diff --git a/client/components/Reader/SettingsPage/include/ResetTab.inc b/client/components/Reader/SettingsPage/ResetTab.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ResetTab.inc
rename to client/components/Reader/SettingsPage/ResetTab.inc
diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index a88515f3..2cb0dc21 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -37,35 +37,73 @@
             <div class="col fit">
                 <!-- Профили --------------------------------------------------------------------->
                 <div v-if="selectedTab == 'profiles'" class="fit tab-panel">
-                    @@include('./include/ProfilesTab.inc');
+                    @@include('./ProfilesTab.inc');
                 </div>
                 <!-- Вид ------------------------------------------------------------------------->                    
                 <div v-if="selectedTab == 'view'" class="fit column">
-                    @@include('./include/ViewTab.inc');
+                    <q-tabs
+                        v-model="selectedViewTab"
+                        active-color="black"
+                        active-bg-color="white"
+                        indicator-color="white"
+                        dense
+                        no-caps
+                        class="no-mp bg-grey-4 text-grey-7"
+                    >
+                        <q-tab name="mode" label="Режим" />
+                        <q-tab name="color" label="Цвет" />
+                        <q-tab name="font" label="Шрифт" />
+                        <q-tab name="text" label="Текст" />
+                        <q-tab name="status" label="Строка статуса" />
+                    </q-tabs>
+
+                    <div class="q-mb-sm" />
+
+                    <div class="col tab-panel">
+                        <div v-if="selectedViewTab == 'mode'">
+                            @@include('./ViewTab/Mode.inc');
+                        </div>
+
+                        <div v-if="selectedViewTab == 'color'">
+                            @@include('./ViewTab/Color.inc');
+                        </div>
+
+                        <div v-if="selectedViewTab == 'font'">
+                            @@include('./ViewTab/Font.inc');
+                        </div>
+
+                        <div v-if="selectedViewTab == 'text'">
+                            @@include('./ViewTab/Text.inc');
+                        </div>
+
+                        <div v-if="selectedViewTab == 'status'">
+                            @@include('./ViewTab/Status.inc');
+                        </div>
+                    </div>
                 </div>
                 <!-- Кнопки ---------------------------------------------------------------------->
                 <div v-if="selectedTab == 'buttons'" class="fit tab-panel">
-                    @@include('./include/ButtonsTab.inc');
+                    @@include('./ButtonsTab.inc');
                 </div>
                 <!-- Управление ------------------------------------------------------------------>
                 <div v-if="selectedTab == 'keys'" class="fit column">
-                    @@include('./include/KeysTab.inc');
+                    @@include('./KeysTab.inc');
                 </div>
                 <!-- Листание -------------------------------------------------------------------->
                 <div v-if="selectedTab == 'pagemove'" class="fit tab-panel">
-                    @@include('./include/PageMoveTab.inc');
+                    @@include('./PageMoveTab.inc');
                 </div>
                 <!-- Конвертирование ------------------------------------------------------------->
                 <div v-if="selectedTab == 'convert'" class="fit tab-panel">
-                    @@include('./include/ConvertTab.inc');
+                    @@include('./ConvertTab.inc');
                 </div>
                 <!-- Прочее ---------------------------------------------------------------------->
                 <div v-if="selectedTab == 'others'" class="fit tab-panel">
-                    @@include('./include/OthersTab.inc');
+                    @@include('./OthersTab.inc');
                 </div>
                 <!-- Сброс ----------------------------------------------------------------------->
                 <div v-if="selectedTab == 'reset'" class="fit tab-panel">
-                    @@include('./include/ResetTab.inc');
+                    @@include('./ResetTab.inc');
                 </div>
             </div>
         </div>
diff --git a/client/components/Reader/SettingsPage/ViewTab/Color.inc b/client/components/Reader/SettingsPage/ViewTab/Color.inc
new file mode 100644
index 00000000..b1d7b279
--- /dev/null
+++ b/client/components/Reader/SettingsPage/ViewTab/Color.inc
@@ -0,0 +1,116 @@
+                            <!---------------------------------------------->
+                            <div class="hidden part-header">
+                                Цвет
+                            </div>
+
+                            <div class="item row">
+                                <div class="label-2">
+                                    Текст
+                                </div>
+                                <div class="col row">
+                                    <q-input
+                                        v-model="textColorFiltered"
+                                        class="col-left no-mp"
+                                        outlined dense
+                                        
+                                        :rules="['hexColor']"
+                                        style="max-width: 150px"
+                                    >
+                                        <template #prepend>
+                                            <q-icon name="la la-angle-down la-xs" class="cursor-pointer text-white" :style="colorPanStyle('text')">
+                                                <q-popup-proxy anchor="bottom middle" self="top middle">
+                                                    <div>
+                                                        <q-color
+                                                            v-model="textColor"
+                                                            no-header default-view="palette" :palette="predefineTextColors"
+                                                        />
+                                                    </div>
+                                                </q-popup-proxy>
+                                            </q-icon>
+                                        </template>
+                                    </q-input>
+                                </div>
+                            </div>
+
+                            <div class="q-mt-md" />
+                            <div class="item row">
+                                <div class="label-2">
+                                    Фон
+                                </div>
+                                <div class="col row">
+                                    <q-input 
+                                        v-model="bgColorFiltered"
+                                        class="col-left no-mp"
+                                        outlined dense
+                                        
+                                        :rules="['hexColor']"
+                                        style="max-width: 150px"
+                                    >
+                                        <template #prepend>
+                                            <q-icon name="la la-angle-down la-xs" class="cursor-pointer text-white" :style="colorPanStyle('bg')">
+                                                <q-popup-proxy anchor="bottom middle" self="top middle">
+                                                    <div>
+                                                        <q-color v-model="backgroundColor" no-header default-view="palette" :palette="predefineBackgroundColors" />
+                                                    </div>
+                                                </q-popup-proxy>
+                                            </q-icon>
+                                        </template>
+                                    </q-input>
+                                </div>
+                            </div>
+
+                            <div class="q-mt-md" />
+                            <div class="item row">
+                                <div class="label-2">
+                                    Обои
+                                </div>
+                                <div class="col row items-center">
+                                    <q-select 
+                                        v-model="wallpaper"
+                                        class="col-left no-mp"
+                                        :options="wallpaperOptions"
+                                        dropdown-icon="la la-angle-down la-sm"
+                                        outlined dense emit-value map-options
+                                    >
+                                        <template #selected-item="scope">
+                                            <div>
+                                                {{ scope.opt.label }}
+                                            </div>
+                                            <div v-show="scope.opt.value" class="q-ml-sm" :class="scope.opt.value" style="width: 40px; height: 28px;"></div>
+                                        </template>
+
+                                        <template #option="scope">
+                                            <q-item
+                                                v-bind="scope.itemProps"
+                                            >
+                                                <q-item-section style="min-width: 50px;">
+                                                    <q-item-label v-html="scope.opt.label" />
+                                                </q-item-section>
+                                                <q-item-section v-show="scope.opt.value" :class="scope.opt.value" style="min-width: 70px; min-height: 50px;" />
+                                            </q-item>
+                                        </template>
+                                    </q-select>
+
+                                    <div class="q-px-xs" />
+                                    <q-btn class="q-ml-sm" round dense color="blue" icon="la la-plus" @click.stop="loadWallpaperFileClick">
+                                        <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                                            Добавить файл обоев
+                                        </q-tooltip>
+                                    </q-btn>
+                                    <q-btn v-show="wallpaper.indexOf('user-paper') === 0" class="q-ml-sm" round dense color="blue" icon="la la-minus" @click.stop="delWallpaper">
+                                        <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
+                                            Удалить выбранные обои
+                                        </q-tooltip>
+                                    </q-btn>
+                                </div>
+                            </div>
+
+                            <div class="q-mt-sm" />
+                            <div class="item row">
+                                <div class="label-2"></div>
+                                <div class="col row items-center">
+                                    <q-checkbox v-model="wallpaperIgnoreStatusBar" size="xs" label="Не включать строку статуса в обои" />
+                                </div>
+                            </div>
+
+                            <input ref="file" type="file" style="display: none;" @change="loadWallpaperFile" />
diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Font.inc b/client/components/Reader/SettingsPage/ViewTab/Font.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ViewTab/Font.inc
rename to client/components/Reader/SettingsPage/ViewTab/Font.inc
diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc b/client/components/Reader/SettingsPage/ViewTab/Mode.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ViewTab/Mode.inc
rename to client/components/Reader/SettingsPage/ViewTab/Mode.inc
diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Status.inc b/client/components/Reader/SettingsPage/ViewTab/Status.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ViewTab/Status.inc
rename to client/components/Reader/SettingsPage/ViewTab/Status.inc
diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Text.inc b/client/components/Reader/SettingsPage/ViewTab/Text.inc
similarity index 100%
rename from client/components/Reader/SettingsPage/include/ViewTab/Text.inc
rename to client/components/Reader/SettingsPage/ViewTab/Text.inc
diff --git a/client/components/Reader/SettingsPage/include/ViewTab.inc b/client/components/Reader/SettingsPage/include/ViewTab.inc
deleted file mode 100644
index 08a76b68..00000000
--- a/client/components/Reader/SettingsPage/include/ViewTab.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<q-tabs
-    v-model="selectedViewTab"
-    active-color="black"
-    active-bg-color="white"
-    indicator-color="white"
-    dense
-    no-caps
-    class="no-mp bg-grey-4 text-grey-7"
->
-    <q-tab name="mode" label="Режим" />
-    <q-tab name="color" label="Цвет" />
-    <q-tab name="font" label="Шрифт" />
-    <q-tab name="text" label="Текст" />
-    <q-tab name="status" label="Строка статуса" />
-</q-tabs>
-
-<div class="q-mb-sm"/>
-
-<div class="col tab-panel">
-    <div v-if="selectedViewTab == 'mode'">
-        @@include('./ViewTab/Mode.inc');
-    </div>
-
-    <div v-if="selectedViewTab == 'color'">
-        @@include('./ViewTab/Color.inc');
-    </div>
-
-    <div v-if="selectedViewTab == 'font'">
-        @@include('./ViewTab/Font.inc');
-    </div>
-
-    <div v-if="selectedViewTab == 'text'">
-        @@include('./ViewTab/Text.inc');
-    </div>
-
-    <div v-if="selectedViewTab == 'status'">
-        @@include('./ViewTab/Status.inc');
-    </div>
-</div>
\ No newline at end of file
diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Color.inc b/client/components/Reader/SettingsPage/include/ViewTab/Color.inc
deleted file mode 100644
index 934df86b..00000000
--- a/client/components/Reader/SettingsPage/include/ViewTab/Color.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-<!---------------------------------------------->
-<div class="hidden part-header">Цвет</div>
-
-<div class="item row">
-    <div class="label-2">Текст</div>
-    <div class="col row">
-        <q-input class="col-left no-mp"
-            outlined dense
-            v-model="textColorFiltered"
-            :rules="['hexColor']"
-            style="max-width: 150px"
-        >
-            <template v-slot:prepend>
-                <q-icon name="la la-angle-down la-xs" class="cursor-pointer text-white" :style="colorPanStyle('text')">
-                    <q-popup-proxy anchor="bottom middle" self="top middle">
-                        <div>
-                            <q-color v-model="textColor"
-                                no-header default-view="palette" :palette="predefineTextColors"
-                            />
-                        </div>
-                    </q-popup-proxy>
-                </q-icon>
-            </template>
-        </q-input>
-    </div>
-</div>
-
-<div class="q-mt-md"/>
-<div class="item row">
-    <div class="label-2">Фон</div>
-    <div class="col row">
-        <q-input class="col-left no-mp"
-            outlined dense
-            v-model="bgColorFiltered"
-            :rules="['hexColor']"
-            style="max-width: 150px"
-        >
-            <template v-slot:prepend>
-                <q-icon name="la la-angle-down la-xs" class="cursor-pointer text-white" :style="colorPanStyle('bg')">
-                    <q-popup-proxy anchor="bottom middle" self="top middle">
-                        <div>
-                            <q-color v-model="backgroundColor" no-header default-view="palette" :palette="predefineBackgroundColors"/>
-                        </div>
-                    </q-popup-proxy>
-                </q-icon>
-            </template>
-        </q-input>
-    </div>
-</div>
-
-<div class="q-mt-md"/>
-<div class="item row">
-    <div class="label-2">Обои</div>
-    <div class="col row items-center">
-        <q-select class="col-left no-mp" v-model="wallpaper" :options="wallpaperOptions"
-            dropdown-icon="la la-angle-down la-sm"
-            outlined dense emit-value map-options
-        >
-            <template v-slot:selected-item="scope">
-                <div >{{ scope.opt.label }}</div>
-                <div v-show="scope.opt.value" class="q-ml-sm" :class="scope.opt.value" style="width: 40px; height: 28px;"></div>
-            </template>
-
-            <template v-slot:option="scope">
-                <q-item
-                    v-bind="scope.itemProps"
-                    v-on="scope.itemEvents"
-                >
-                    <q-item-section style="min-width: 50px;">
-                        <q-item-label v-html="scope.opt.label" />
-                    </q-item-section>
-                    <q-item-section v-show="scope.opt.value" :class="scope.opt.value" style="min-width: 70px; min-height: 50px;"/>
-                </q-item>
-            </template>
-        </q-select>
-
-        <div class="q-px-xs"/>
-        <q-btn class="q-ml-sm" round dense color="blue" icon="la la-plus" @click.stop="loadWallpaperFileClick">
-            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Добавить файл обоев</q-tooltip>
-        </q-btn>
-        <q-btn v-show="wallpaper.indexOf('user-paper') === 0" class="q-ml-sm" round dense color="blue" icon="la la-minus" @click.stop="delWallpaper">
-            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Удалить выбранные обои</q-tooltip>
-        </q-btn>
-    </div>
-</div>
-
-<div class="q-mt-sm"/>
-<div class="item row">
-    <div class="label-2"></div>
-    <div class="col row items-center">
-        <q-checkbox v-model="wallpaperIgnoreStatusBar" size="xs" label="Не включать строку статуса в обои" />
-    </div>
-</div>
-
-<input type="file" ref="file" @change="loadWallpaperFile" style='display: none;'/>