Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-06 08:32:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge d6a37e6852 into 361d20df2c

Browse source
This commit is contained in:
Klara Robinson 2025-12-01 14:18:37 +08:00 committed by GitHub
commit 0abcd0e2fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
komga-webui/src/locales/en.json
View file

@ -781,7 +781,8 @@
"click": "Click / Tap" "click": "Click / Tap"
}, },
"page_margins": "Page margins", "page_margins": "Page margins",
"viewing_theme": "Viewing theme" "viewing_theme": "Viewing theme",
"progress_markers": "Progress markers"
}, },
"shortcuts": { "shortcuts": {
"cycle_pagination": "Cycle column count", "cycle_pagination": "Cycle column count",

22
komga-webui/src/views/EpubReader.vue
View file

@ -164,12 +164,15 @@
v-if="!verticalScroll" v-if="!verticalScroll"
> >
<v-row> <v-row>
<v-col cols="10" class="text-truncate"> <v-col cols="10" class="text-truncate" v-if="progressMarkers">
{{ $t('epubreader.page_of', {page: progressionPage, count: progressionPageCount}) }} {{ $t('epubreader.page_of', {page: progressionPage, count: progressionPageCount}) }}
({{ progressionTitle || $t('epubreader.current_chapter') }}) ({{ progressionTitle || $t('epubreader.current_chapter')}})
</v-col>
<v-col cols="10" class="text-truncate" v-else-if="progressionTitle">
{{ progressionTitle || $t('epubreader.current_chapter') }}
</v-col> </v-col>
<v-spacer/> <v-spacer/>
<v-col cols="auto">{{ progressionTotalPercentage }}</v-col> <v-col cols="auto" v-if="progressMarkers">{{ progressionTotalPercentage }}</v-col>
</v-row> </v-row>
</v-container> </v-container>
@ -250,6 +253,9 @@
<v-btn v-for="(c, i) in columnCounts" :key="i" :value="c.value">{{ c.text }}</v-btn> <v-btn v-for="(c, i) in columnCounts" :key="i" :value="c.value">{{ c.text }}</v-btn>
</v-btn-toggle> </v-btn-toggle>
</v-list-item> </v-list-item>
<v-list-item>
<settings-switch v-model="progressMarkers" :label="$t('epubreader.settings.progress_markers')"/>
</v-list-item>
<v-list-item class="justify-center"> <v-list-item class="justify-center">
<v-btn depressed @click="fontSize-=10"> <v-btn depressed @click="fontSize-=10">
@ -412,6 +418,7 @@ export default Vue.extend({
alwaysFullscreen: false, alwaysFullscreen: false,
navigationClick: true, navigationClick: true,
navigationButtons: true, navigationButtons: true,
progressMarkers: true,
}, },
navigationOptions: [ navigationOptions: [
{text: this.$t('epubreader.settings.navigation_options.buttons').toString(), value: 'button'}, {text: this.$t('epubreader.settings.navigation_options.buttons').toString(), value: 'button'},
@ -617,6 +624,15 @@ export default Vue.extend({
else screenfull.isEnabled && screenfull.exit() else screenfull.isEnabled && screenfull.exit()
}, },
}, },
progressMarkers: {
get: function (): boolean {
return this.settings.progressMarkers
},
set: function (value: boolean): void {
this.settings.progressMarkers = value
this.$store.commit('setEpubreaderSettings', this.settings)
},
},
navigationMode: { navigationMode: {
get: function (): string { get: function (): string {
let r = this.settings.navigationButtons ? 'button' : '' let r = this.settings.navigationButtons ? 'button' : ''