diff --git a/src/app/qml/viewers/ImageBrowser.qml b/src/app/qml/viewers/ImageBrowser.qml index 8b9bb60..29aa725 100644 --- a/src/app/qml/viewers/ImageBrowser.qml +++ b/src/app/qml/viewers/ImageBrowser.qml @@ -1,273 +1,273 @@ /* * Copyright (C) 2015 Vishesh Handa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ -import QtQuick 2.13 +import QtQuick 2.12 // import QtQuick.Layouts 1.1 // import QtQuick.Controls 1.0 as QtControls import org.kde.kirigami 2.1 as Kirigami import "helpers" as Helpers /** * @brief The image viewer used by the CBR and Folder Viewer Base classes. * * It handles drawing the image and the different zoom modes. */ ListView { id: root function goNextFrame() { root.currentItem.goNextFrame(); } function goPreviousFrame() { root.currentItem.goPreviousFrame(); } signal goNextPage(); signal goPreviousPage(); interactive: false // No interactive flicky stuff here, we'll handle that with the navigator instance property int imageWidth property int imageHeight orientation: ListView.Horizontal snapMode: ListView.SnapOneItem cacheBuffer: 3000 // This ensures that the current index is always up to date, which we need to ensure we can track the current page // as required by the thumbnail navigator, and the resume-reading-from functionality onMovementEnded: { var indexHere = indexAt(contentX + width / 2, contentY + height / 2); if(currentIndex !== indexHere) { currentIndex = indexHere; } } /** * An interactive area with an image. * * Clicking once on the image will hide all other controls from view. * Clicking twice will instead zoom in. * * Pinch will zoom in as well. */ delegate: Flickable { id: flick width: imageWidth height: imageHeight contentWidth: imageWidth contentHeight: imageHeight interactive: (contentWidth > width || contentHeight > height) && (totalFrames === 0) z: interactive ? 1000 : 0 function goNextFrame() { image.nextFrame(); } function goPreviousFrame() { image.previousFrame(); } function setColouredHole(holeRect,holeColor) { holyRect.setHole(holeRect); holyRect.color = holeColor; } function resetHole() { if(image.status == Image.Ready) { var holeColor = "blue"; if (image.currentPageObject !== null) { holeColor = image.currentPageObject.bgcolor; } setColouredHole(image.paintedRect, holeColor); } } ListView.onIsCurrentItemChanged: resetHole(); Connections { target: image onStatusChanged: resetHole(); } property alias totalFrames: image.totalFrames; property alias currentFrame: image.currentFrame; pixelAligned: true Behavior on contentX { NumberAnimation { duration: applicationWindow().animationDuration; easing.type: Easing.InOutQuad; } } Behavior on contentY { NumberAnimation { duration: applicationWindow().animationDuration; easing.type: Easing.InOutQuad; } } Behavior on contentWidth { NumberAnimation { duration: applicationWindow().animationDuration; easing.type: Easing.InOutQuad; } } Behavior on contentHeight { NumberAnimation { duration: applicationWindow().animationDuration; easing.type: Easing.InOutQuad; } } PinchArea { width: Math.max(flick.contentWidth, flick.width) height: Math.max(flick.contentHeight, flick.height) property real initialWidth property real initialHeight onPinchStarted: { initialWidth = flick.contentWidth initialHeight = flick.contentHeight } onPinchUpdated: { // adjust content pos due to drag flick.contentX += pinch.previousCenter.x - pinch.center.x flick.contentY += pinch.previousCenter.y - pinch.center.y // resize content flick.resizeContent(Math.max(imageWidth, initialWidth * pinch.scale), Math.max(imageHeight, initialHeight * pinch.scale), pinch.center) } onPinchFinished: { // Move its content within bounds. flick.returnToBounds(); } Image { id: image width: flick.contentWidth height: flick.contentHeight Helpers.HolyRectangle { id: holyRect anchors.fill: parent color: image.currentFrameObj.bgcolor opacity: flick.ListView.isCurrentItem ? 1 : 0 visible: opacity > 0 } source: model.url fillMode: Image.PreserveAspectFit asynchronous: true property bool shouldCheat: imageWidth * 2 > maxTextureSize || imageHeight * 2 > maxTextureSize; property bool isTall: imageHeight < imageWidth; property int fixedWidth: isTall ? maxTextureSize * (imageWidth / imageHeight) : maxTextureSize; property int fixedHeight: isTall ? maxTextureSize : maxTextureSize * (imageHeight / imageWidth); sourceSize.width: shouldCheat ? fixedWidth : imageWidth * 2; sourceSize.height: shouldCheat ? fixedHeight : imageHeight * 2; MouseArea { anchors.fill: parent } // Setup for all the entries. property QtObject currentPageObject: { if (root.model.acbfData) { if (model.index===0) { currentPageObject = root.model.acbfData.metaData.bookInfo.coverpage(); } else if (model.index > 0) { currentPageObject = root.model.acbfData.body.page(model.index-1); } } else { null; } } property real muliplier: isTall? (paintedHeight / implicitHeight): (paintedWidth / implicitWidth); property int offsetX: (width-paintedWidth)/2; property int offsetY: (height-paintedHeight)/2; property rect paintedRect: Qt.rect(offsetX, offsetY, paintedWidth, paintedHeight); function focusOnFrame(index) { if (index>-1) { var frameObj = image.currentPageObject.frame(index); var frameBounds = frameObj.bounds; var frameMultiplier = image.implicitWidth/frameBounds.width; //Check if the height of the final frame is higher than the contentHeight //When we're using a *fit to with scheme. if ((frameBounds.height/frameBounds.width)*contentWidth > contentHeight) { frameMultiplier = image.implicitHeight/frameBounds.height; frameMultiplier = frameMultiplier * (contentHeight/image.paintedHeight); } else { frameMultiplier = frameMultiplier * (contentWidth/image.paintedWidth); } flick.resizeContent(globalUiScaleFactor * imageWidth * frameMultiplier, globalUiScaleFactor * imageHeight * frameMultiplier, Qt.point(flick.contentX,flick.contentY)); var frameRect = Qt.rect((image.muliplier * frameBounds.x) / globalUiScaleFactor + image.offsetX , (image.muliplier * frameBounds.y) / globalUiScaleFactor + image.offsetY , (image.muliplier * frameBounds.width) / globalUiScaleFactor , (image.muliplier * frameBounds.height) / globalUiScaleFactor); flick.contentX = frameRect.x - (flick.width-frameRect.width)/2; flick.contentY = frameRect.y - (flick.height-frameRect.height)/2; } } function nextFrame() { if (image.totalFrames > 0 && image.currentFrame+1 < image.totalFrames) { image.currentFrame++; } else { flick.resizeContent(imageWidth, imageHeight, Qt.point(imageWidth/2, imageHeight/2)); image.currentFrame = -1; flick.returnToBounds(); root.goNextPage(); if(root.currentItem.totalFrames > 0) { root.currentItem.currentFrame = 0; } } } function previousFrame() { if (image.totalFrames > 0 && image.currentFrame-1 > -1) { image.currentFrame--; } else { flick.resizeContent(imageWidth, imageHeight, Qt.point(imageWidth/2, imageHeight/2)); image.currentFrame = -1; flick.returnToBounds(); root.goPreviousPage(); if(root.currentItem.totalFrames > 0) { root.currentItem.currentFrame = root.currentItem.totalFrames - 1; } } } property int totalFrames: image.currentPageObject? image.currentPageObject.framePointStrings.length: 0; property int currentFrame: -1; property QtObject currentFrameObj: image.currentPageObject && image.currentFrame > -1 ? image.currentPageObject.frame(currentFrame) : noFrame; onCurrentFrameObjChanged: { holyRect.setHole(Qt.rect((image.muliplier * currentFrameObj.bounds.x) / globalUiScaleFactor + image.offsetX, (image.muliplier * currentFrameObj.bounds.y) / globalUiScaleFactor + image.offsetY, (image.muliplier * currentFrameObj.bounds.width) / globalUiScaleFactor, (image.muliplier * currentFrameObj.bounds.height) / globalUiScaleFactor)); } property QtObject noFrame: QtObject { property rect bounds: image.paintedRect property color bgcolor: image.currentPageObject.bgcolor } onCurrentFrameChanged: focusOnFrame(currentFrame); Repeater { model: image.currentPageObject? image.currentPageObject.framePointStrings: 0; Rectangle { id: frame; x: ((image.muliplier * image.currentPageObject.frame(index).bounds.x) / globalUiScaleFactor) + image.offsetX; y: ((image.muliplier * image.currentPageObject.frame(index).bounds.y) / globalUiScaleFactor) + image.offsetY; width: (image.muliplier * image.currentPageObject.frame(index).bounds.width) / globalUiScaleFactor; height: (image.muliplier * image.currentPageObject.frame(index).bounds.height) / globalUiScaleFactor; color: "blue"; opacity: 0; } } MouseArea { anchors.fill: parent; enabled: flick.interactive; onClicked: startToggleControls(); onDoubleClicked: { abortToggleControls(); flick.resizeContent(imageWidth, imageHeight, Qt.point(imageWidth/2, imageHeight/2)); flick.returnToBounds(); } } } } } Helpers.Navigator { enabled: root.currentItem ? !root.currentItem.interactive : false; anchors.fill: parent; onLeftRequested: root.layoutDirection === Qt.RightToLeft? root.goNextFrame(): root.goPreviousFrame(); onRightRequested: root.layoutDirection === Qt.RightToLeft? root.goPreviousFrame(): root.goNextFrame(); onTapped: startToggleControls(); onDoubleTapped: { abortToggleControls(); if (root.currentItem.totalFrames === 0) { root.currentItem.resizeContent(imageWidth * 2, imageHeight * 2, Qt.point(eventPoint.x, eventPoint.y)); root.currentItem.returnToBounds(); } } } } diff --git a/src/app/qml/viewers/helpers/Navigator.qml b/src/app/qml/viewers/helpers/Navigator.qml index bd6f00a..597f98c 100644 --- a/src/app/qml/viewers/helpers/Navigator.qml +++ b/src/app/qml/viewers/helpers/Navigator.qml @@ -1,182 +1,182 @@ /* * Copyright (C) 2019 Dan Leinir Turthra Jensen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ -import QtQuick 2.13 +import QtQuick 2.12 import org.kde.kirigami 2.5 as Kirigami /** * @brief Navigation overlay for all books * * This will take taps/clicks on the left and right hand side of the viewport, * and detect swipes across the full width of the viewport, as well as forward * taps (and double taps) made in between the sides */ Item { id: component signal leftRequested() signal rightRequested() signal tapped(point eventPoint); signal doubleTapped(point eventPoint); Timer { id: swipeTimer interval: 300 running: false repeat: false onTriggered: { swipeHandler.swipeActive = false; // console.debug("No swipe for you, too slow!"); } } PointHandler { id: swipeHandler property bool swipeActive: false; property var velocity; onActiveChanged: { if (active === true) { swipeActive = true; swipeTimer.start(); } else if (swipeActive === true) { swipeTimer.stop(); swipeActive = false; // console.log("Velocity during the swipe was: " + velocity); if (velocity.x > 0.1) { component.leftRequested(); } else if (velocity.x < -0.1) { component.rightRequested(); }/* else { console.debug("Swipe was too weak to determine anything..."); }*/ } } onPointChanged: { if (swipeActive === true) { velocity = point.velocity; } } } Item { id: leftHandNav anchors { top: parent.top; left: parent.left; bottom: parent.bottom; } width: parent.width / 6; TapHandler { onTapped: component.leftRequested(); } MouseArea { anchors.fill: parent enabled: !Kirigami.Settings.tabletMode hoverEnabled: true; acceptedButtons: Qt.NoButton onPositionChanged: { var hWidth = width/2; var hHeight = height/2; var opacityX = mouse.x>hWidth? hWidth-(mouse.x-hWidth) : mouse.x; opacityX = opacityX/(hWidth - (Kirigami.Units.iconSizes.huge/2)); var opacityY = mouse.y>hHeight? hHeight-(mouse.y-hHeight) : mouse.y; opacityY = opacityY/(hHeight - (Kirigami.Units.iconSizes.huge/2)); leftPageIcon.opacity = opacityX*opacityY; } onExited: { leftPageIcon.opacity = 0; } } Rectangle { id: leftPageIcon; anchors.centerIn: parent; width: Kirigami.Units.iconSizes.huge; height: width; radius:width/2; color: Kirigami.Theme.highlightColor; opacity: 0; Kirigami.Icon { anchors.centerIn: parent; source: "go-previous" width: parent.width*(2/3); height: width; } } } Item { anchors { top: parent.top left: leftHandNav.right right: rightHandNav.left bottom: parent.bottom } TapHandler { onTapped: component.tapped(eventPoint.position); onDoubleTapped: component.doubleTapped(eventPoint.position); } } Item { id: rightHandNav anchors { top: parent.top; right: parent.right; bottom: parent.bottom; } width: parent.width / 6; TapHandler { onTapped: component.rightRequested(); } MouseArea { anchors.fill: parent enabled: !Kirigami.Settings.tabletMode hoverEnabled: true; acceptedButtons: Qt.NoButton onPositionChanged: { var hWidth = width/2; var hHeight = height/2; var opacityX = mouse.x>hWidth? hWidth-(mouse.x-hWidth) : mouse.x; opacityX = opacityX/(hWidth - (Kirigami.Units.iconSizes.huge/2)); var opacityY = mouse.y>hHeight? hHeight-(mouse.y-hHeight) : mouse.y; opacityY = opacityY/(hHeight - (Kirigami.Units.iconSizes.huge/2)); rightPageIcon.opacity = opacityX*opacityY; } onExited: { rightPageIcon.opacity = 0; } } Rectangle { id: rightPageIcon; anchors.centerIn: parent; width: Kirigami.Units.iconSizes.huge; height: width; radius:width/2; color: Kirigami.Theme.highlightColor; opacity: 0; Kirigami.Icon { anchors.centerIn: parent; source: "go-next" width: parent.width*(2/3); height: width; } } } }