Skip to content

Commit 07ee1f5

Browse files
ollmollm
committed
New: Improved opening behavior options for files and folders
1 parent d4fa53b commit 07ee1f5

29 files changed

Lines changed: 282 additions & 97 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Turn pages with mouse wheel [`f164068`](https://github.com/ollm/OpenComic/commit/f16406851b7adee7609004c95d4a0fec25f2f025)
1212
- Custom name in image saving function [`4b01440`](https://github.com/ollm/OpenComic/commit/4b01440b70b52e10c3cbcb37f1379081242c523f)
1313
- Option to save bookmarked images [`7def9ec`](https://github.com/ollm/OpenComic/commit/7def9eca58ceb24fb3444a3daf3ed81178a13fd1)
14+
- Improved opening behavior options for files and folders
1415

1516
##### 🐛 Bug Fixes
1617

‎languages/ca.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "Navegació (Carpetes)",
257257
"files": "Navegació (Fitxers)",
258258
"ignoreSingleFoldersLibrary": "Ignorar carpetes individuals (S'obren automàticament)",
259-
"whenOpenFolderFirstImageOrContinueReading": "Obrir directament a la primera imatge o en continuar llegint en lloc de la llista de fitxers",
260-
"whenOpenFolderContinueReading": "Obrir directament en continuar llegint en lloc de la llista de fitxers",
259+
"openingBehaviorFolder": "Comportament al obrir carpetes",
260+
"openingBehaviorFolderDescription": "Estableix el comportament desitjat al obrir carpetes durant la navegació",
261+
"openingBehaviorFile": "Comportament al obrir fitxers",
262+
"openingBehaviorFileDescription": "Estableix el comportament desitjat al obrir fitxers durant la navegació",
261263
"useTheFirstImageAsPoster": "Utilitzar la primera imatge com a pòster (Només si no n'hi ha cap actualment)",
262264
"showFullPathLibrary": "Mostrar la ruta completa a l'obrir els còmics de la biblioteca",
263265
"showFullPathOpened": "Mostrar la ruta completa a l'obrir un arxiu o carpeta",

‎languages/cs.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "",
257257
"files": "",
258258
"ignoreSingleFoldersLibrary": "",
259-
"whenOpenFolderFirstImageOrContinueReading": "",
260-
"whenOpenFolderContinueReading": "",
259+
"openingBehaviorFolder": "",
260+
"openingBehaviorFolderDescription": "",
261+
"openingBehaviorFile": "",
262+
"openingBehaviorFileDescription": "",
261263
"useTheFirstImageAsPoster": "",
262264
"showFullPathLibrary": "",
263265
"showFullPathOpened": "",

‎languages/de.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "",
257257
"files": "",
258258
"ignoreSingleFoldersLibrary": "",
259-
"whenOpenFolderFirstImageOrContinueReading": "",
260-
"whenOpenFolderContinueReading": "",
259+
"openingBehaviorFolder": "",
260+
"openingBehaviorFolderDescription": "",
261+
"openingBehaviorFile": "",
262+
"openingBehaviorFileDescription": "",
261263
"useTheFirstImageAsPoster": "",
262264
"showFullPathLibrary": "",
263265
"showFullPathOpened": "",

‎languages/empty.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "",
257257
"files": "",
258258
"ignoreSingleFoldersLibrary": "",
259-
"whenOpenFolderFirstImageOrContinueReading": "",
260-
"whenOpenFolderContinueReading": "",
259+
"openingBehaviorFolder": "",
260+
"openingBehaviorFolderDescription": "",
261+
"openingBehaviorFile": "",
262+
"openingBehaviorFileDescription": "",
261263
"useTheFirstImageAsPoster": "",
262264
"showFullPathLibrary": "",
263265
"showFullPathOpened": "",

‎languages/en.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "Navigation (Folders)",
257257
"files": "Navigation (Files)",
258258
"ignoreSingleFoldersLibrary": "Ignore single folders (Open automatically)",
259-
"whenOpenFolderFirstImageOrContinueReading": "Open directly in first image or in continue reading instead of the file list",
260-
"whenOpenFolderContinueReading": "Open directly in continue reading instead of the file list",
259+
"openingBehaviorFolder": "Behavior when opening folders",
260+
"openingBehaviorFolderDescription": "Sets the desired behavior when opening folders while navigation",
261+
"openingBehaviorFile": "Behavior when opening files",
262+
"openingBehaviorFileDescription": "Sets the desired behavior when opening files while navigation",
261263
"useTheFirstImageAsPoster": "Use the first image as a poster (Only if there is none currently)",
262264
"showFullPathLibrary": "Show full path when opening library comics",
263265
"showFullPathOpened": "Show full path when opening a file or folder",

‎languages/es.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "Navegación (Carpetas)",
257257
"files": "Navegación (Archivos)",
258258
"ignoreSingleFoldersLibrary": "Ignorar carpetas individuales (Se abren automáticamente)",
259-
"whenOpenFolderFirstImageOrContinueReading": "Abrir directamente en la primera imagen o en continuar leyendo en lugar de la lista de archivos",
260-
"whenOpenFolderContinueReading": "Abrir directamente en continuar leyendo en lugar de la lista de archivos",
259+
"openingBehaviorFolder": "Comportamiento al abrir carpetas",
260+
"openingBehaviorFolderDescription": "Establece el comportamiento deseado al abrir carpetas durante la navegación",
261+
"openingBehaviorFile": "Comportamiento al abrir archivos",
262+
"openingBehaviorFileDescription": "Establece el comportamiento deseado al abrir archivos durante la navegación",
261263
"useTheFirstImageAsPoster": "Utilizar la primera imagen como póster (Solo si no hay ninguno actualmente)",
262264
"showFullPathLibrary": "Mostrar la ruta completa al abrir los cómics de la biblioteca",
263265
"showFullPathOpened": "Mostrar la ruta completa al abrir un archivo o carpeta",

‎languages/fill-languages.js‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ function getColor(percentage)
9090
return '#f6664c';
9191
}
9292

93+
function round(number, precision = 0) {
94+
95+
multipler = Math.pow(10, precision);
96+
97+
return Math.round(number * multipler) / multipler;
98+
99+
}
100+
93101
function generateGraph()
94102
{
95103
let languagesSVG = '';
@@ -101,10 +109,10 @@ function generateGraph()
101109
{
102110
const percentage = languagesPercentage[key].percentage;
103111
const color = getColor(percentage);
104-
const height = percentage * 1.4;
112+
const height = round(percentage * 1.4, 1);
105113

106114
languagesSVG += ' <text style="font-size: 11px; font-family: monospace; letter-spacing: 1.5px; fill: #888; text-anchor: end;" x="-150" y="'+(index * 18 + 16)+'" transform="rotate(-90)">'+key.replace(/\.json/, '').toUpperCase()+'</text>\n';
107-
languagesSVG += ' <rect style="fill: '+color+';" height="'+height+'" width="6" rx="2" y="'+(140 - height)+'" x="'+(index * 18 + 10)+'" />\n';
115+
languagesSVG += ' <rect style="fill: '+color+';" height="'+height+'" width="6" rx="2" y="'+round(140 - height, 1)+'" x="'+(index * 18 + 10)+'" />\n';
108116

109117
index++;
110118
}
@@ -134,15 +142,15 @@ function generateMD()
134142
if(key !== 'empty.json')
135143
{
136144
const lang = key.replace(/\.json/, '');
137-
const percentage = Math.round(languagesPercentage[key].percentage * 10) / 10;
145+
const percentage = round(languagesPercentage[key].percentage, 1);
138146
const color = getColor(percentage);
139147

140148
markdown += '### '+languagesList[lang].nativeName+'\n\n['+key+'](https://github.com/ollm/OpenComic/blob/master/languages/'+key+')\n\n`'+percentage+'% | Remain '+(languagesPercentage[key].total - languagesPercentage[key].translated)+' | Translated '+languagesPercentage[key].translated+'`\n\n';
141149
markdown += '<a href="https://github.com/ollm/OpenComic/blob/master/languages/'+key+'"><img src="https://raw.githubusercontent.com/ollm/OpenComic/master/images/translated/'+lang+'.svg" /></a>\n\n\n';
142150

143151
let svg = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="830" height="10">\n <g>';
144152
svg += '\n <rect style="fill: #ddd;" height="10" width="830" rx="4" y="0" x="0" />';
145-
svg += '\n <rect style="fill: '+color+';" height="10" width="'+(percentage * 8.3)+'" rx="4" y="0" x="0" />';
153+
svg += '\n <rect style="fill: '+color+';" height="10" width="'+round(percentage * 8.3, 1)+'" rx="4" y="0" x="0" />';
146154
svg += '\n </g>\n</svg>';
147155

148156
fs.writeFileSync('./images/translated/'+lang+'.svg', svg);

‎languages/fr.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "Dossiers",
257257
"files": "Fichiers",
258258
"ignoreSingleFoldersLibrary": "Ignorer les dossiers uniques dans la bibliothèque",
259-
"whenOpenFolderFirstImageOrContinueReading": "Ouvrir le dossier à la première image ou continuer la lecture",
260-
"whenOpenFolderContinueReading": "Ouvrir le dossier et continuer la lecture",
259+
"openingBehaviorFolder": "",
260+
"openingBehaviorFolderDescription": "",
261+
"openingBehaviorFile": "",
262+
"openingBehaviorFileDescription": "",
261263
"useTheFirstImageAsPoster": "Utiliser la première image comme affiche",
262264
"showFullPathLibrary": "Afficher le chemin complet de la bibliothèque",
263265
"showFullPathOpened": "Afficher le chemin complet ouvert",

‎languages/hu.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,10 @@
256256
"folders": "",
257257
"files": "",
258258
"ignoreSingleFoldersLibrary": "",
259-
"whenOpenFolderFirstImageOrContinueReading": "",
260-
"whenOpenFolderContinueReading": "",
259+
"openingBehaviorFolder": "",
260+
"openingBehaviorFolderDescription": "",
261+
"openingBehaviorFile": "",
262+
"openingBehaviorFileDescription": "",
261263
"useTheFirstImageAsPoster": "",
262264
"showFullPathLibrary": "",
263265
"showFullPathOpened": "",

0 commit comments

Comments
 (0)