New: Setting to enable/disable go next/previous chapter with mouse sc…

…roll (Vertical reading)
ollm · Jan 26, 2024 · 37612bf · 37612bf
1 parent 2bbd49e
commit 37612bf
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Now when applying Webtoon mode the vertical margin is 0 [`683a08a`](https://github.com/ollm/OpenComic/commit/683a08aad3a6d947004ad77476184d613718b098)
 - Show the current reading title in app window [`9520faa`](https://github.com/ollm/OpenComic/commit/9520faa7486e4494bb878ffe2430e9fd198ee33a)
 - Option to open file location of current reading from the file menu [`c9215dc`](https://github.com/ollm/OpenComic/commit/c9215dc5cb29a3b5a759d80d21f7ff734053f23c)
+- Setting to enable/disable go next/previous chapter with mouse scroll (Vertical reading)
 
 ##### 🐛 Bug Fixes
 
@@ -23,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Using the first image as a poster does not work [`fd6c748`](https://github.com/ollm/OpenComic/commit/dfd6c748090088109416b847a5e7581d80e36ea7)
 - Some errors in scroll reading [`a4887c3`](https://github.com/ollm/OpenComic/commit/a4887c3bfe3f0ec8b75d3cdceedfaae8684fe6df)
 - Stuck in a loop trying to read an epub file when the epub or zip is corrupt [`6388a9e`](https://github.com/ollm/OpenComic/commit/6388a9ef8eb118e1d337fb6becd68ec64b5defc3)
-- Next chapter button not work inscroll mode if last page is smaller than the window and "Adjust to width" is enabled
+- Next chapter button not work inscroll mode if last page is smaller than the window and "Adjust to width" is enabled [`2bbd49e`](https://github.com/ollm/OpenComic/commit/2bbd49e43f9bb96c2dc00f21494acd7a92820331)
 
 ## [v1.1.0](https://github.com/ollm/OpenComic/releases/tag/v1.1.0) (13-01-2024)
 

diff --git a/languages/ca.json b/languages/ca.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "Zoom global en comptes d'imatge a imatge (Lectura horitzontal)",
 			"moveZoomWithMouse": "Moure el zoom mitjançant el cursor (Desactiva moure mitjançant arrossegar i deixar anar)",
 			"scrollWithMouse": "Realitzar desplaçament movent el cursor per les vores de la pantalla (Desactiva desplaçament mitjançant arrossegar i deixar anar)",
+			"goNextPrevChapterWithScroll": "Anar al capítol següent/anterior amb el desplaçament del ratolí (Lectura vertical)",
 			"startReadingInFullScreen": "Començar la lectura a pantalla completa",
 			"trackingAtTheEnd": "Seguiment al final del capítol/tom"
 		},

diff --git a/languages/cs.json b/languages/cs.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/de.json b/languages/de.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/en.json b/languages/en.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "Global zoom instead of image by image (Slide reading)",
 			"moveZoomWithMouse": "Move zoom using cursor (Disables moving by drag and drop)",
 			"scrollWithMouse": "Scroll by moving the cursor along the edges of the screen (Disables drag and drop scrolling)",
+			"goNextPrevChapterWithScroll": "Go next/previous chapter with mouse scroll (Vertical reading)",
 			"startReadingInFullScreen": "Start reading in full screen",
 			"trackingAtTheEnd": "Tracking at the end of the chapter/volume"
 		},

diff --git a/languages/es.json b/languages/es.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "Zoom global en vez de imagen a imagen (Lectura horizontal)",
 			"moveZoomWithMouse": "Mover el zoom mediante el cursor (Desactiva mover mediante arrastrar y soltar)",
 			"scrollWithMouse": "Realizar desplazamiento moviendo el cursor por los bordes de la pantalla (Desactiva desplazamiento mediante arrastrar y soltar)",
+			"goNextPrevChapterWithScroll": "Ir al capítulo siguiente/anterior con el desplazamiento del mouse (Lectura vertical)",
 			"startReadingInFullScreen": "Empezar la lectura en pantalla completa",
 			"trackingAtTheEnd": "Seguimiento al final del capítulo/tomo"
 		},

diff --git a/languages/fr.json b/languages/fr.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/hu.json b/languages/hu.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/it.json b/languages/it.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/ja.json b/languages/ja.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/pt-br.json b/languages/pt-br.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/ru.json b/languages/ru.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/languages/th.json b/languages/th.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "ใช้การซูมที่ตั้งไว้แทนการซูมแบบภาพต่อภาพ (อ่านแบบเลื่อน)",
 			"moveZoomWithMouse": "ย้ายซูมโดยใช้เคอร์เซอร์ (ปิดการย้ายโดยลากวาง)",
 			"scrollWithMouse": "เลื่อนโดยย้ายเคอร์เซอร์ไปตามขอบจอ (ปิดการเลื่อนแบบลากและวาง)",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "เริ่มอ่านแบบเต็มจอ",
 			"trackingAtTheEnd": "ติดตามส่วนท้ายของตอน/เล่ม"
 		},

diff --git a/languages/vi.json b/languages/vi.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "Thu phóng chung thay cho từng ảnh một (Trình đọc ngang)",
 			"moveZoomWithMouse": "Thay đổi thu phóng với con trỏ (tắt di chuyển bằng đúp chuột)",
 			"scrollWithMouse": "Cuộn khi di chuyển con trỏ theo viền màn hình (tắt cuộn bằng đúp chuột)",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "Khởi động trình đọc trong chế độ toàn màn hình",
 			"trackingAtTheEnd": "Theo dõi tại đầu của chương/tập truyện"
 		},

diff --git a/languages/zh-hans.json b/languages/zh-hans.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "全局缩放而不是逐个图片（幻灯片阅读）",
 			"moveZoomWithMouse": "使用鼠标移动缩放（禁用通过拖放移动）",
 			"scrollWithMouse": "通过沿着屏幕边缘移动鼠标来滚动（禁用拖放滚动）",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "开始全屏阅读",
 			"trackingAtTheEnd": "在章节/卷末尾进行跟踪"
 		},

diff --git a/languages/zh-hant.json b/languages/zh-hant.json
@@ -193,6 +193,7 @@
 			"globalZoomSlide": "",
 			"moveZoomWithMouse": "",
 			"scrollWithMouse": "",
+			"goNextPrevChapterWithScroll": "",
 			"startReadingInFullScreen": "",
 			"trackingAtTheEnd": ""
 		},

diff --git a/scripts/dom.js b/scripts/dom.js
@@ -370,7 +370,6 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 	reading.hideContent();
 	reading.music.pause();
 
-	generateAppMenu();
 	setWindowTitle();
 
 	currentPathScrollTop[currentPath === false ? 0 : currentPath] = template.contentRight().children().scrollTop();
@@ -384,7 +383,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 	if(currentPathScrollTop[path === false ? 0 : path])
 		keepScroll = currentPathScrollTop[path === false ? 0 : path];
 
-	let _indexLabel = prevIndexLabel = indexLabel;
+	let _indexLabel = prevIndexLabel = (indexLabel || false);
 	indexLabel = false;
 
 	currentPath = path;
@@ -398,6 +397,8 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		dom.fromLibrary(true);
 		dom.indexPathControl(false);
 
+		generateAppMenu();
+
 		if(!fromSetOfflineMode)
 			fileManager.setServerInOfflineMode(false);
 
@@ -663,6 +664,8 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		if(!fromGoBack)
 			indexPathControl(path, mainPath);
 
+		generateAppMenu();
+
 		handlebarsContext.comics = [];
 		handlebarsContext.comicsIndex = false;
 		handlebarsContext.comicsDeep2 = path.replace(new RegExp('^\s*'+pregQuote(mainPathR)), '').split(p.sep).length >= 2 ? true : false;

diff --git a/scripts/opencomic.js b/scripts/opencomic.js
@@ -751,13 +751,15 @@ var generateAppMenuData = {resetZoom: null, onReading: null};
 
 function generateAppMenu(force = false)
 {
-	if(force || generateAppMenuData.resetZoom !== electron.webFrame.getZoomFactor() || generateAppMenuData.onReading !== onReading)
+	let indexPathA = dom.indexPathA();
+
+	if(force || generateAppMenuData.resetZoom !== electron.webFrame.getZoomFactor() || generateAppMenuData.onReading !== onReading || generateAppMenuData.indexPathA !== indexPathA)
 	{
 		let currentWindow = electronRemote.getCurrentWindow();
-		generateAppMenuData = {resetZoom: electron.webFrame.getZoomFactor(), onReading: onReading};
+		generateAppMenuData = {resetZoom: electron.webFrame.getZoomFactor(), onReading: onReading, indexPathA: indexPathA};
 
-		let readingCurrentPath = reading.readingCurrentPath();
-		let readingFolder = (onReading && fs.existsSync(readingCurrentPath) && fs.statSync(readingCurrentPath).isDirectory()) ? true : false;
+		let currentPath = onReading ? reading.readingCurrentPath() : indexPathA;
+		let pathIsFolder = (currentPath && fs.existsSync(currentPath) && fs.statSync(currentPath).isDirectory()) ? true : false;
 
 		var menuTemplate = [
 			{
@@ -768,7 +770,7 @@ function generateAppMenu(force = false)
 					{label: language.menu.file.addFile, click: function(){addComic()}},
 					{label: language.menu.file.addFolder, click: function(){addComic(true)}},
 					{type: 'separator'},
-					{label: readingFolder ? language.global.contextMenu.openFolderLocation : language.global.contextMenu.openFileLocation, click: function(){electron.shell.showItemInFolder(fileManager.firstCompressedFile(readingCurrentPath))}},
+					{label: pathIsFolder ? language.global.contextMenu.openFolderLocation : language.global.contextMenu.openFileLocation, enabled: currentPath, click: function(){pathIsFolder ? electron.shell.openPath(currentPath) : electron.shell.showItemInFolder(fileManager.firstCompressedFile(currentPath))}},
 					{type: 'separator'},
 					{role: 'quit', label: language.menu.file.quit, click: function(){electronRemote.app.quit();}},
 				]
@@ -813,9 +815,6 @@ function generateAppMenu(force = false)
 			}
 		];
 
-		if(!onReading)
-			menuTemplate[0].submenu.splice(4, 2);
-
 		var menu = electronRemote.Menu.buildFromTemplate(menuTemplate);
 		currentWindow.setMenu(menu);
 

diff --git a/scripts/reading.js b/scripts/reading.js
@@ -1381,6 +1381,8 @@ var scrollNextOrPrevComicDelayed = false, scrollNextOrPrevComicST = false;
 
 function scrollNextOrPrevComic(prev = false, delay = false)
 {
+	if(!config.readingGoNextPrevChapterWithScroll) return;
+
 	if(delay && !scrollNextOrPrevComicDelayed && ((prev && scrollInStart) || (!prev && scrollInEnd)))
 	{
 		if(scrollNextOrPrevComicST) return;
@@ -4407,7 +4409,7 @@ async function read(path, index = 1, end = false, isCanvas = false, isEbook = fa
 			}
 			else
 			{
-				if(reading.scrollNextOrPrevComic(e.originalEvent.wheelDelta / 120 > 0))
+				if(reading.scrollNextOrPrevComic(e.originalEvent.wheelDelta / 120 > 0, true))
 					e.preventDefault();
 			}
 		}

diff --git a/scripts/storage.js b/scripts/storage.js
@@ -1,4 +1,4 @@
-var changes = 77; // Update this if readingPagesConfig is updated
+var changes = 78; // Update this if readingPagesConfig is updated
 
 var readingPagesConfig = {
 	readingConfigName: '',
@@ -114,6 +114,7 @@ var storageDefault = {
 		readingGlobalZoomSlide: true,
 		readingMoveZoomWithMouse: false,
 		readingScrollWithMouse: false,
+		readingGoNextPrevChapterWithScroll: true,
 		readingStartReadingInFullScreen: false,
 		readingTrackingAtTheEnd: true,
 		readingImageInterpolationMethodDownscaling: 'lanczos3',

diff --git a/templates/settings.content.right.html b/templates/settings.content.right.html
@@ -84,6 +84,14 @@ <h2 class="headline-small">{{language.settings.reading.main}}</h2>
 				</div>
 			</div>
 
+			<div class="menu-simple-text gamepad-item">
+				<span>{{language.settings.reading.goNextPrevChapterWithScroll}}</span>
+				<div class="switch{{#if config.readingGoNextPrevChapterWithScroll}} a{{/if}}" on="settings.set('readingGoNextPrevChapterWithScroll', true)" off="settings.set('readingGoNextPrevChapterWithScroll', false)">
+					<div></div>
+					<svg viewBox="0 0 52 32"><path d="M 8,0 C 3.58,0 0,3.58 0,8 0,12.42 3.58,16 8,16 8,16 8,16 8,16 12.42,16 16,12.42 16,8 16,3.58 12.42,0 8,0 8,0 8,0 8,0 Z"></path></svg>
+				</div>
+			</div>
+
 			<div class="menu-simple-text gamepad-item">
 				<span>{{language.settings.reading.startReadingInFullScreen}}</span>
 				<div class="switch{{#if config.readingStartReadingInFullScreen}} a{{/if}}" on="settings.setStartReadingInFullScreen(true)" off="settings.setStartReadingInFullScreen(false)">