Merge pull request #3040 from BimBimSalaBim/master

E-Reader Font Boldness Slider #3020

client/components/readers/EpubReader.vue

@@ -46,7 +46,8 @@ export default {
         font: 'serif',
         fontScale: 100,
         lineSpacing: 115,
-        spread: 'auto'
+        spread: 'auto',
+        textStroke: 0
       }
     }
   },
@@ -109,11 +110,14 @@ export default {
 
       const fontScale = this.ereaderSettings.fontScale / 100
 
+      const textStroke = this.ereaderSettings.textStroke / 100
+
       return {
         '*': {
           color: `${fontColor}!important`,
           'background-color': `${backgroundColor}!important`,
-          'line-height': lineSpacing * fontScale + 'rem!important'
+          'line-height': lineSpacing * fontScale + 'rem!important',
+          '-webkit-text-stroke': textStroke + 'px ' + fontColor + '!important'
         },
         a: {
           color: `${fontColor}!important`

client/components/readers/Reader.vue

@@ -98,6 +98,12 @@
           </div>
           <ui-range-input v-model="ereaderSettings.lineSpacing" :min="100" :max="300" :step="5" @input="settingsUpdated" />
         </div>
+        <div class="flex items-center mb-4">
+          <div class="w-40">
+            <p class="text-lg">{{ $strings.LabelFontBoldness }}:</p>
+          </div>
+          <ui-range-input v-model="ereaderSettings.textStroke" :min="0" :max="300" :step="5" @input="settingsUpdated" />
+        </div>
         <div class="flex items-center">
           <div class="w-40">
             <p class="text-lg">{{ $strings.LabelLayout }}:</p>
@@ -130,7 +136,9 @@ export default {
         font: 'serif',
         fontScale: 100,
         lineSpacing: 115,
-        spread: 'auto'
+        fontBoldness: 100,
+        spread: 'auto',
+        textStroke: 0
       }
     }
   },
@@ -378,7 +386,12 @@ export default {
       try {
         const settings = localStorage.getItem('ereaderSettings')
         if (settings) {
-          this.ereaderSettings = JSON.parse(settings)
+          const _ereaderSettings = JSON.parse(settings)
+          for (const key in this.ereaderSettings) {
+            if (_ereaderSettings[key] !== undefined) {
+              this.ereaderSettings[key] = _ereaderSettings[key]
+            }
+          }
           this.settingsUpdated()
         }
       } catch (error) {

client/strings/bg.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Папка",
   "LabelFolders": "Папки",
   "LabelFontBold": "Получерно",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Шрифт",
   "LabelFontItalic": "Курсив",
   "LabelFontScale": "Мащаб на Шрифта",

client/strings/bn.json

@@ -307,6 +307,7 @@
   "LabelFolder": "ফোল্ডার",
   "LabelFolders": "ফোল্ডারগুলো",
   "LabelFontBold": "বোল্ড",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "ফন্ট পরিবার",
   "LabelFontItalic": "ইটালিক",
   "LabelFontScale": "ফন্ট স্কেল",

client/strings/cs.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Složka",
   "LabelFolders": "Složky",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Rodina písem",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Měřítko písma",

client/strings/da.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Mappe",
   "LabelFolders": "Mapper",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Fontfamilie",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Skriftstørrelse",

client/strings/de.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Ordner",
   "LabelFolders": "Verzeichnisse",
   "LabelFontBold": "Fett",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Schriftfamilie",
   "LabelFontItalic": "Kursiv",
   "LabelFontScale": "Schriftgröße",

client/strings/en-us.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Font family",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font scale",

client/strings/es.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Carpeta",
   "LabelFolders": "Carpetas",
   "LabelFontBold": "Negrilla",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Familia tipográfica",
   "LabelFontItalic": "Itálica",
   "LabelFontScale": "Tamaño de Fuente",

client/strings/et.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Kaust",
   "LabelFolders": "Kataloogid",
   "LabelFontBold": "Paks",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Fondi pere",
   "LabelFontItalic": "Kaldkiri",
   "LabelFontScale": "Fondi suurus",

client/strings/fr.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Dossier",
   "LabelFolders": "Dossiers",
   "LabelFontBold": "Gras",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Polices de caractères",
   "LabelFontItalic": "Italique",
   "LabelFontScale": "Taille de la police de caractère",

client/strings/gu.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "ફોન્ટ કુટુંબ",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font scale",

client/strings/he.json

@@ -307,6 +307,7 @@
   "LabelFolder": "תיקייה",
   "LabelFolders": "תיקיות",
   "LabelFontBold": "מודגש",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "משפחת הפונטים",
   "LabelFontItalic": "נטוי",
   "LabelFontScale": "קנה מידה של הפונט",

client/strings/hi.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "फुहारा परिवार",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font scale",

client/strings/hr.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Folder",
   "LabelFolders": "Folderi",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Font family",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font scale",

client/strings/hu.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Mappa",
   "LabelFolders": "Mappák",
   "LabelFontBold": "Félkövér",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Betűtípus család",
   "LabelFontItalic": "Dőlt",
   "LabelFontScale": "Betűméret skála",

client/strings/it.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Cartella",
   "LabelFolders": "Cartelle",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Font family",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Dimensione Font",

client/strings/lt.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Aplankas",
   "LabelFolders": "Aplankai",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Famiglia di font",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Šrifto mastelis",

client/strings/nl.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Map",
   "LabelFolders": "Mappen",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Lettertypefamilie",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Lettertype schaal",

client/strings/no.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Mappe",
   "LabelFolders": "Mapper",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Fontfamilie",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font størrelse",

client/strings/pl.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Folder",
   "LabelFolders": "Foldery",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Rodzina czcionek",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Font scale",

client/strings/pt-br.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Pasta",
   "LabelFolders": "Pastas",
   "LabelFontBold": "Negrito",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Família de fonte",
   "LabelFontItalic": "Itálico",
   "LabelFontScale": "Escala de fonte",

client/strings/ru.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Папка",
   "LabelFolders": "Папки",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Семейство шрифтов",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Масштаб шрифта",

client/strings/sv.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Mapp",
   "LabelFolders": "Mappar",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Teckensnittsfamilj",
   "LabelFontItalic": "Italic",
   "LabelFontScale": "Teckensnittsskala",

client/strings/uk.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Тека",
   "LabelFolders": "Теки",
   "LabelFontBold": "Жирний",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Гарнітура",
   "LabelFontItalic": "Курсив",
   "LabelFontScale": "Розмір шрифту",

client/strings/vi-vn.json

@@ -307,6 +307,7 @@
   "LabelFolder": "Thư Mục",
   "LabelFolders": "Các Thư Mục",
   "LabelFontBold": "Đậm",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "Gia đình font",
   "LabelFontItalic": "Nghiêng",
   "LabelFontScale": "Tỷ lệ font",

client/strings/zh-cn.json

@@ -307,6 +307,7 @@
   "LabelFolder": "文件夹",
   "LabelFolders": "文件夹",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "字体系列",
   "LabelFontItalic": "斜体",
   "LabelFontScale": "字体比例",

client/strings/zh-tw.json

@@ -307,6 +307,7 @@
   "LabelFolder": "資料夾",
   "LabelFolders": "資料夾",
   "LabelFontBold": "Bold",
+  "LabelFontBoldness": "Font Boldness",
   "LabelFontFamily": "字體系列",
   "LabelFontItalic": "斜體",
   "LabelFontScale": "字體比例",