From 225de11e6a45fdf7dee658f4d64077d37653ed1a Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 17 Feb 2020 11:26:05 +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=20quasar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/SettingsPage/SettingsPage.vue      | 20 ++++++++++++++++--
 .../Reader/SettingsPage/include/ViewTab.inc   | 21 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 01577a35..d31d5957 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -234,13 +234,29 @@ selectedTabOld = null;//todo: remove
     }
 
     get wallpaperOptions() {
-        let result = [{label: 'Нет', value: ''}];        
+        let result = [{label: 'Нет', value: ''}];
         for (let i = 1; i < 10; i++) {
             result.push({label: i, value: `paper${i}`});
         }
         return result;
     }
 
+    get fontsOptions() {
+        let result = [];
+        this.fonts.forEach(font => {
+            result.push({label: (font.label ? font.label : font.name), value: font.name});
+        });
+        return result;
+    }
+
+    get webFontsOptions() {
+        let result = [{label: 'Нет', value: ''}];
+        this.webFonts.forEach(font => {
+            result.push({label: font.name, value: font.name});
+        });
+        return result;
+    }
+
     get currentProfile() {
         return this.$store.state.reader.currentProfile;
     }
@@ -526,7 +542,7 @@ selectedTabOld = null;//todo: remove
 }
 
 .label-2 {
-    width: 100px;
+    width: 110px;
 }
 
 .label-1, .label-2 {
diff --git a/client/components/Reader/SettingsPage/include/ViewTab.inc b/client/components/Reader/SettingsPage/include/ViewTab.inc
index b9fe4b4b..ee150feb 100644
--- a/client/components/Reader/SettingsPage/include/ViewTab.inc
+++ b/client/components/Reader/SettingsPage/include/ViewTab.inc
@@ -26,7 +26,7 @@
             </q-input>
         </div>
 
-        <span class="col" style="position: relative; top: 35px; left: 30px;">Обои:</span>
+        <span class="col" style="position: relative; top: 35px; left: 15px;">Обои:</span>
     </div>
 </div>
 
@@ -55,8 +55,8 @@
             </q-input>
         </div>
 
+        <div class="q-px-sm"/>
         <q-select class="col" v-model="wallpaper" :options="wallpaperOptions"
-            style="max-width: 120px; margin-left: 30px"
             dropdown-icon="la la-angle-down la-sm"
             outlined dense emit-value map-options
         />
@@ -66,6 +66,23 @@
 <!---------------------------------------------->
 <div class="part-header">Шрифт</div>
 
+<div class="item row">
+    <div class="label-2">Локальный/веб</div>
+    <div class="col row">
+        <div class="col-left-2">
+            <q-select class="col" v-model="fontName" :options="fontsOptions" :disable="webFontName != ''"
+                dropdown-icon="la la-angle-down la-sm"
+                outlined dense emit-value map-options
+            />
+        </div>
+
+        <div class="q-px-sm"/>
+        <q-select class="col" v-model="webFontName" :options="webFontsOptions"
+            dropdown-icon="la la-angle-down la-sm"
+            outlined dense emit-value map-options
+        />
+    </div>
+</div>
 
 
                 <!--el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>