deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Переход на quasar

Browse Source
This commit is contained in:
Book Pauk
2020-02-20 18:45:31 +07:00
parent d8141a1628
commit bb1069ca60
7 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/components/Reader/SettingsPage/SettingsPage.vue
View File

@@ -51,6 +51,10 @@
<div v-if="selectedTab == 'keys'" class="fit tab-panel">
@@include('./include/KeysTab.inc');
</div>
<!-- Листание -------------------------------------------------------------------->
<div v-if="selectedTab == 'pagemove'" class="fit tab-panel">
@@include('./include/PageMoveTab.inc');
</div>
</div>
@@ -61,11 +65,7 @@
<script>
/*
<el-tabs type="border-card" tab-position="left" v-model="selectedTabOld">
<!-- Управление ------------------------------------------------------------------>
@@include('./includeOld/KeysTabOld.inc');
<!-- Листание -------------------------------------------------------------------->
@@include('./includeOld/PageMoveTabOld.inc');
<!-- Прочее ---------------------------------------------------------------------->
@@include('./includeOld/OthersTabOld.inc');
@@ -260,6 +260,20 @@ class SettingsPage extends Vue {
return result;
}
get pageChangeAnimationOptions() {
let result = [
{label: 'Нет', value: ''},
{label: 'Вверх-вниз', value: 'downShift'},
{label: 'Вправо-влево', value: 'rightShift'},
{label: 'Протаивание', value: 'thaw'},
{label: 'Мерцание', value: 'blink'},
{label: 'Вращение', value: 'rotate'},
];
if (this.wallpaper == '')
result.push({label: 'Листание', value: 'flip'});
return result;
}
get currentProfile() {
return this.$store.state.reader.currentProfile;
}
@@ -556,7 +570,11 @@ class SettingsPage extends Vue {
width: 110px;
}
.label-1, .label-2, .label-3, .label-4 {
.label-5 {
width: 110px;
}
.label-1, .label-2, .label-3, .label-4, .label-5 {
display: flex;
flex-direction: column;
justify-content: center;
@@ -591,7 +609,7 @@ class SettingsPage extends Vue {
padding: 0;
}
.col-left-2 {
.col-left {
width: 150px;
}
</style>

12
client/components/Reader/SettingsPage/include/KeysTab.inc
View File

@@ -6,15 +6,3 @@
<q-checkbox size="xs" v-model="clickControl" label="Включить управление кликом" />
</div>
</div>
<!--
<el-tab-pane label="Управление">
<el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
<div class="partHeader">Управление</div>
<el-form-item label="">
<el-checkbox v-model="clickControl">Включить управление кликом</el-checkbox>
</el-form-item>
</el-form>
</el-tab-pane>
-->

58
client/components/Reader/SettingsPage/include/PageMoveTab.inc
View File

@@ -1,38 +1,28 @@
<el-tab-pane label="Листание">
<el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
<div class="partHeader">Анимация</div>
<!---------------------------------------------->
<div class="part-header">Анимация</div>
<el-form-item label="Тип">
<el-col :span="11">
<el-select v-model="pageChangeAnimation">
<el-option label="Нет" value=""></el-option>
<el-option label="Вверх-вниз" value="downShift"></el-option>
<el-option label="Вправо-влево" value="rightShift"></el-option>
<el-option label="Протаивание" value="thaw"></el-option>
<el-option label="Мерцание" value="blink"></el-option>
<el-option label="Вращение" value="rotate"></el-option>
<el-option v-show="wallpaper == ''" label="Листание" value="flip"></el-option>
</el-select>
</el-col>
</el-form-item>
<div class="item row">
<div class="label-5">Тип</div>
<q-select class="col-left" v-model="pageChangeAnimation" :options="pageChangeAnimationOptions"
dropdown-icon="la la-angle-down la-sm"
outlined dense emit-value map-options
/>
</div>
<el-form-item label="Скорость">
<el-input-number v-model="pageChangeAnimationSpeed" :min="0" :max="100" :disabled="pageChangeAnimation == ''"></el-input-number>
</el-form-item>
</el-form>
<div class="item row">
<div class="label-5">Скорость</div>
<NumInput class="col-left" v-model="pageChangeAnimationSpeed" :min="0" :max="100" :disable="pageChangeAnimation == ''"/>
</div>
<el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
<div class="partHeader">Другое</div>
<el-form-item label="Страница">
<el-tooltip :open-delay="500" effect="light">
<template slot="content">
Переносить последнюю строку страницы<br>
в начало следующей при листании
</template>
<el-checkbox v-model="keepLastToFirst">Переносить последнюю строку</el-checkbox>
</el-tooltip>
</el-form-item>
</el-form>
</el-tab-pane>
<!---------------------------------------------->
<div class="part-header">Другое</div>
<div class="item row">
<div class="label-5">Страница</div>
<q-checkbox v-model="keepLastToFirst" size="xs" label="Переносить последнюю строку">
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
Переносить последнюю строку страницы<br>
в начало следующей при листании
</q-tooltip>
</q-checkbox>
</div>

4
client/components/Reader/SettingsPage/include/ViewTab/Color.inc
View File

@@ -4,7 +4,7 @@
<div class="item row">
<div class="label-2">Текст</div>
<div class="col row">
<q-input class="col-left-2 no-mp"
<q-input class="col-left no-mp"
outlined dense
v-model="textColorFiltered"
:rules="['hexColor']"
@@ -31,7 +31,7 @@
<div class="item row">
<div class="label-2">Фон</div>
<div class="col row">
<q-input class="col-left-2 no-mp"
<q-input class="col-left no-mp"
outlined dense
v-model="bgColorFiltered"
:rules="['hexColor']"

6
client/components/Reader/SettingsPage/include/ViewTab/Font.inc
View File

@@ -4,7 +4,7 @@
<div class="item row">
<div class="label-2">Локальный/веб</div>
<div class="col row">
<q-select class="col-left-2" v-model="fontName" :options="fontsOptions" :disable="webFontName != ''"
<q-select class="col-left" v-model="fontName" :options="fontsOptions" :disable="webFontName != ''"
dropdown-icon="la la-angle-down la-sm"
outlined dense emit-value map-options
/>
@@ -26,7 +26,7 @@
<div class="item row">
<div class="label-2">Размер</div>
<div class="col row">
<NumInput class="col-left-2" v-model="fontSize" :min="5" :max="200"/>
<NumInput class="col-left" v-model="fontSize" :min="5" :max="200"/>
<div class="col q-pt-xs text-right">
<a href="https://fonts.google.com/?subset=cyrillic" target="_blank">Примеры</a>
@@ -37,7 +37,7 @@
<div class="item row">
<div class="label-2">Сдвиг</div>
<div class="col row">
<NumInput class="col-left-2" v-model="vertShift" :min="-100" :max="100">
<NumInput class="col-left" v-model="vertShift" :min="-100" :max="100">
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
Сдвиг шрифта по вертикали в процентах от размера.<br>
Отрицательное значение сдвигает вверх, положительное -<br>

4
client/components/Reader/SettingsPage/include/ViewTab/Status.inc
View File

@@ -12,13 +12,13 @@
<div class="item row">
<div class="label-2">Высота</div>
<div class="col row">
<NumInput class="col-left-2" v-model="statusBarHeight" :min="5" :max="100" :disable="!showStatusBar"/>
<NumInput class="col-left" v-model="statusBarHeight" :min="5" :max="100" :disable="!showStatusBar"/>
</div>
</div>
<div class="item row">
<div class="label-2">Прозрачность</div>
<div class="col row">
<NumInput class="col-left-2" v-model="statusBarColorAlpha" :min="0" :max="1" :digits="2" :step="0.1" :disable="!showStatusBar"/>
<NumInput class="col-left" v-model="statusBarColorAlpha" :min="0" :max="1" :digits="2" :step="0.1" :disable="!showStatusBar"/>
</div>
</div>

16
client/components/Reader/SettingsPage/include/ViewTab/Text.inc
View File

@@ -4,21 +4,21 @@
<div class="item row">
<div class="label-2">Интервал</div>
<div class="col row">
<NumInput class="col-left-2" v-model="lineInterval" :min="0" :max="200"/>
<NumInput class="col-left" v-model="lineInterval" :min="0" :max="200"/>
</div>
</div>
<div class="item row">
<div class="label-2">Параграф</div>
<div class="col row">
<NumInput class="col-left-2" v-model="p" :min="0" :max="2000"/>
<NumInput class="col-left" v-model="p" :min="0" :max="2000"/>
</div>
</div>
<div class="item row">
<div class="label-2">Отступ</div>
<div class="col row">
<NumInput class="col-left-2" v-model="indentLR" :min="0" :max="2000">
<NumInput class="col-left" v-model="indentLR" :min="0" :max="2000">
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
Слева/справа
</q-tooltip>
@@ -35,7 +35,7 @@
<div class="item row">
<div class="label-2">Сдвиг</div>
<div class="col row">
<NumInput class="col-left-2" v-model="textVertShift" :min="-100" :max="100">
<NumInput class="col-left" v-model="textVertShift" :min="-100" :max="100">
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
Сдвиг текста по вертикали в процентах от размера шрифта.<br>
Отрицательное значение сдвигает вверх, положительное -<br>
@@ -48,7 +48,7 @@
<div class="item row">
<div class="label-2">Скроллинг</div>
<div class="col row">
<NumInput class="col-left-2" v-model="scrollingDelay" :min="1" :max="10000">
<NumInput class="col-left" v-model="scrollingDelay" :min="1" :max="10000">
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
Замедление скроллинга в миллисекундах.<br>
Определяет время, за которое текст<br>
@@ -79,7 +79,7 @@
<div class="item row">
<div class="label-2"></div>
<div class="col-left-2 column justify-center text-right">
<div class="col-left column justify-center text-right">
Компактность
</div>
<div class="q-px-sm"/>
@@ -101,7 +101,7 @@
<div class="item row">
<div class="label-2"></div>
<div class="col-left-2 column justify-center text-right">
<div class="col-left column justify-center text-right">
Добавлять пустые
</div>
<div class="q-px-sm"/>
@@ -145,7 +145,7 @@
<div class="item row">
<div class="label-2"></div>
<div class="col-left-2 column justify-center text-right">
<div class="col-left column justify-center text-right">
Высота не более
</div>
<div class="q-px-sm"/>