From d3b8f4d5b897b397b1d8b00f0dc6fd1078b561fa Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Sun, 5 Aug 2018 13:14:30 +0200 Subject: [PATCH] Normalize line endings for .qml files --- YACReaderLibrary/qml/ComicInfoView.qml | 1056 +++++------ YACReaderLibrary/qml/FlowView.qml | 422 ++--- YACReaderLibrary/qml/GridComicsView.qml | 1662 ++++++++--------- YACReaderLibrary/qml/InfoComicsView.qml | 242 +-- YACReaderLibrary/qml/InfoFavorites.qml | 64 +- YACReaderLibrary/qml/InfoRating.qml | 100 +- YACReaderLibrary/qml/InfoTick.qml | 58 +- .../qml/RatingContextMenu-osx.qml | 64 +- .../qml/RatingContextMenu-win.qml | 72 +- YACReaderLibrary/qml/YACReaderScrollView.qml | 714 +++---- .../qml/YACReaderScrollViewStyle.qml | 806 ++++---- 11 files changed, 2630 insertions(+), 2630 deletions(-) diff --git a/YACReaderLibrary/qml/ComicInfoView.qml b/YACReaderLibrary/qml/ComicInfoView.qml index 93aac174..f3b408f5 100644 --- a/YACReaderLibrary/qml/ComicInfoView.qml +++ b/YACReaderLibrary/qml/ComicInfoView.qml @@ -1,528 +1,528 @@ -import QtQuick 2.6 - -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 - -import QtGraphicalEffects 1.0 - -import com.yacreader.ComicInfo 1.0 -import com.yacreader.ComicDB 1.0 - -Rectangle { - - color : "transparent" - id: mainContainer - - height: info.height + 2 * topMargin - - property string infoColor: infoTextColor - property font infoFont: Qt.font({ - - family: "Arial", - pixelSize: 14 - }); - - property int topMargin : 27 - - property bool compact : width <= 650 - - RowLayout - { - id:main_layout - anchors.fill: parent - - //READ------------------------------------------------------------ - ColumnLayout - { - Layout.topMargin: topMargin - Layout.maximumWidth: 61 - Layout.fillHeight: true - id: readStatus - - Layout.alignment: Qt.AlignTop | - Qt.AlignHCenter - - Rectangle { - color: "transparent" - width: 61 - height: 24 - - InfoTick { - x: 27 - y: 5 - - read: comicInfo.read - - onReadChangedByUser: { - comicInfo.read = read; - comicInfoHelper.setRead(comic_info_index, read); - } - } - } - - visible: !mainContainer.compact - } - - //INFO------------------------------------------------------------ - ColumnLayout - { - id: info - //width: parent.width - //Layout.fillWidth: true - - Layout.alignment: Qt.AlignTop | - Qt.AlignLeft - - Layout.maximumWidth: mainContainer.compact ? mainContainer.width : 960 - - Layout.leftMargin: mainContainer.compact ? 30 : 0 - - RowLayout - { - Layout.topMargin: topMargin - - InfoTick { - Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft - - read: comicInfo.read - - onReadChangedByUser: { - comicInfo.read = read; - comicInfoHelper.setRead(comic_info_index, read); - } - } - - Item { - Layout.fillWidth: true - } - - InfoFavorites { - Layout.topMargin: 1 - Layout.rightMargin: 17 - Layout.alignment: Qt.AlignTop - - active: comicInfo.isFavorite - - onActiveChangedByUser: { - if(active) - comicInfoHelper.addToFavorites(comic_info_index); - else - comicInfoHelper.removeFromFavorites(comic_info_index); - - comicInfo.isFavorite = active; - } - } - - InfoRating { - Layout.alignment: Qt.AlignTop - Layout.rightMargin: 30 - rating: comicInfo.rating - - onRatingChangedByUser: { - comicInfo.rating = rating; - comicInfoHelper.rate(comic_info_index, rating); - } - } - - visible: mainContainer.compact - } - - RowLayout - { - Text { - Layout.topMargin: mainContainer.compact ? 18 : topMargin - Layout.fillWidth: true - Layout.rightMargin: mainContainer.compact ? 30 : 0 - - id: title - - color: infoTitleColor - font.family: "Arial" - font.bold: true - font.pixelSize: mainContainer.compact ? 18 : 21; - wrapMode: Text.WordWrap - - text: comic.getTitleIncludingNumber() - } - - RowLayout - { - visible: !mainContainer.compact - - Layout.alignment: Qt.AlignTop - Layout.topMargin: topMargin - - InfoFavorites { - Layout.topMargin: 1 - Layout.rightMargin: 17 - Layout.alignment: Qt.AlignTop - - active: comicInfo.isFavorite - - onActiveChangedByUser: { - if(active) - comicInfoHelper.addToFavorites(comic_info_index); - else - comicInfoHelper.removeFromFavorites(comic_info_index); - - comicInfo.isFavorite = active; - } - } - - InfoRating { - Layout.alignment: Qt.AlignTop - Layout.rightMargin: 30 - rating: comicInfo.rating - - onRatingChangedByUser: { - comicInfo.rating = rating; - comicInfoHelper.rate(comic_info_index, rating); - } - } - } - } - - Flow { - spacing: 0 - - Layout.fillWidth: true - Text { - id: volume - color: infoColor - font: mainContainer.infoFont - text: comicInfo.volume - rightPadding: 20 - visible: comicInfo.volume - } - - Text { - id: numbering - color: infoColor - font: mainContainer.infoFont - text: comicInfo.number + "/" + comicInfo.count - rightPadding: 20 - visible : comicInfo.number - } - - Text { - id: genre - color: infoColor - font: mainContainer.infoFont - text: comicInfo.genere - rightPadding: 20 - visible: comicInfo.genere - } - - Text { - id: date - color: infoColor - font: mainContainer.infoFont - text: comicInfo.date - rightPadding: 20 - visible: comicInfo.date - } - - Text { - id: pages - color: infoColor - font: mainContainer.infoFont - text: comicInfo.numPages + " pages" - rightPadding: 20 - visible: comicInfo.numPages - } - - Text { - id: showInComicVine - font: mainContainer.infoFont - color: "#ffcc00" - text: "Show in Comic Vine" - visible: comicInfo.comicVineID - MouseArea { - anchors.fill: parent - onClicked: { - Qt.openUrlExternally("http://www.comicvine.com/comic/4000-%1/".arg(comicInfo.comicVineID)); - } - } - } - } - - Text { - Layout.topMargin: 22 - Layout.rightMargin: 30 - Layout.bottomMargin: 5 - Layout.fillWidth: true - - id: sinopsis - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignJustify - text: comicInfo.synopsis - visible: comicInfo.synopsis - } - - Text { - Layout.topMargin: 25 - Layout.bottomMargin: 5 - - id: authors_title - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 18 - font.bold: true - - text: qsTr("Authors") - - visible: comicInfo.getWriters().length + - comicInfo.getPencillers().length + - comicInfo.getInkers().length + - comicInfo.getColorists().length + - comicInfo.getLetterers().length + - comicInfo.getCoverArtists().length > 0 - } - - Flow { - Layout.fillWidth: true - spacing: 20 - Repeater { - id: writers - model: comicInfo.getWriters().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getWriters()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("writer") - } - } - } - - Repeater { - id: pencilllers - model: comicInfo.getPencillers().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getPencillers()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("penciller") - } - } - } - - Repeater { - id: inkers - model: comicInfo.getInkers().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getInkers()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("inker") - } - } - } - - Repeater { - id: colorist - model: comicInfo.getColorists().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getColorists()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("colorist") - } - } - } - - Repeater { - id: letterers - model: comicInfo.getLetterers().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getLetterers()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("letterer") - } - } - } - - Repeater { - id: cover_artist - model: comicInfo.getCoverArtists().length - Column{ - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getCoverArtists()[index] - } - - Text { - color: infoTextColor - font.family: "Arial" - font.pixelSize: 13 - font.italic: true - text: qsTr("cover artist") - } - } - } - } - - Text { - Layout.topMargin: 25 - - id: publisher_title - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 18 - font.bold: true - - text: qsTr("Publisher") - - visible: publisher.visible || format.visible || color.visible || age_rating.visible - } - - Flow { - Layout.fillWidth: true - spacing: 20 - - Text { - id: publisher - - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.publisher - - visible: comicInfo.publisher - } - - Text { - id: format - - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.format - - visible: comicInfo.format - } - - Text { - id: color - - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.color ? qsTr("color") : qsTr("b/w") - - visible: comicInfo.color - } - - Text { - id: age_rating - - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.ageRating - - visible: comicInfo.ageRating - } - } - - Text { - Layout.topMargin: 25 - Layout.bottomMargin: 5 - - id: characters_title - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 18 - font.bold: true - - text: qsTr("Characters") - - visible: comicInfo.getCharacters().length > 0 - } - - Flow { - Layout.fillWidth: true - spacing: 20 - Repeater { - id: characters - model: comicInfo.getCharacters().length - - Text { - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 15 - - text: comicInfo.getCharacters()[index] - } - } - } - } - - Item { - Layout.fillHeight: true - Layout.fillWidth: true - Layout.minimumWidth: 0 - Layout.preferredWidth: 0 - } - } -} +import QtQuick 2.6 + +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.2 + +import QtGraphicalEffects 1.0 + +import com.yacreader.ComicInfo 1.0 +import com.yacreader.ComicDB 1.0 + +Rectangle { + + color : "transparent" + id: mainContainer + + height: info.height + 2 * topMargin + + property string infoColor: infoTextColor + property font infoFont: Qt.font({ + + family: "Arial", + pixelSize: 14 + }); + + property int topMargin : 27 + + property bool compact : width <= 650 + + RowLayout + { + id:main_layout + anchors.fill: parent + + //READ------------------------------------------------------------ + ColumnLayout + { + Layout.topMargin: topMargin + Layout.maximumWidth: 61 + Layout.fillHeight: true + id: readStatus + + Layout.alignment: Qt.AlignTop | + Qt.AlignHCenter + + Rectangle { + color: "transparent" + width: 61 + height: 24 + + InfoTick { + x: 27 + y: 5 + + read: comicInfo.read + + onReadChangedByUser: { + comicInfo.read = read; + comicInfoHelper.setRead(comic_info_index, read); + } + } + } + + visible: !mainContainer.compact + } + + //INFO------------------------------------------------------------ + ColumnLayout + { + id: info + //width: parent.width + //Layout.fillWidth: true + + Layout.alignment: Qt.AlignTop | + Qt.AlignLeft + + Layout.maximumWidth: mainContainer.compact ? mainContainer.width : 960 + + Layout.leftMargin: mainContainer.compact ? 30 : 0 + + RowLayout + { + Layout.topMargin: topMargin + + InfoTick { + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + + read: comicInfo.read + + onReadChangedByUser: { + comicInfo.read = read; + comicInfoHelper.setRead(comic_info_index, read); + } + } + + Item { + Layout.fillWidth: true + } + + InfoFavorites { + Layout.topMargin: 1 + Layout.rightMargin: 17 + Layout.alignment: Qt.AlignTop + + active: comicInfo.isFavorite + + onActiveChangedByUser: { + if(active) + comicInfoHelper.addToFavorites(comic_info_index); + else + comicInfoHelper.removeFromFavorites(comic_info_index); + + comicInfo.isFavorite = active; + } + } + + InfoRating { + Layout.alignment: Qt.AlignTop + Layout.rightMargin: 30 + rating: comicInfo.rating + + onRatingChangedByUser: { + comicInfo.rating = rating; + comicInfoHelper.rate(comic_info_index, rating); + } + } + + visible: mainContainer.compact + } + + RowLayout + { + Text { + Layout.topMargin: mainContainer.compact ? 18 : topMargin + Layout.fillWidth: true + Layout.rightMargin: mainContainer.compact ? 30 : 0 + + id: title + + color: infoTitleColor + font.family: "Arial" + font.bold: true + font.pixelSize: mainContainer.compact ? 18 : 21; + wrapMode: Text.WordWrap + + text: comic.getTitleIncludingNumber() + } + + RowLayout + { + visible: !mainContainer.compact + + Layout.alignment: Qt.AlignTop + Layout.topMargin: topMargin + + InfoFavorites { + Layout.topMargin: 1 + Layout.rightMargin: 17 + Layout.alignment: Qt.AlignTop + + active: comicInfo.isFavorite + + onActiveChangedByUser: { + if(active) + comicInfoHelper.addToFavorites(comic_info_index); + else + comicInfoHelper.removeFromFavorites(comic_info_index); + + comicInfo.isFavorite = active; + } + } + + InfoRating { + Layout.alignment: Qt.AlignTop + Layout.rightMargin: 30 + rating: comicInfo.rating + + onRatingChangedByUser: { + comicInfo.rating = rating; + comicInfoHelper.rate(comic_info_index, rating); + } + } + } + } + + Flow { + spacing: 0 + + Layout.fillWidth: true + Text { + id: volume + color: infoColor + font: mainContainer.infoFont + text: comicInfo.volume + rightPadding: 20 + visible: comicInfo.volume + } + + Text { + id: numbering + color: infoColor + font: mainContainer.infoFont + text: comicInfo.number + "/" + comicInfo.count + rightPadding: 20 + visible : comicInfo.number + } + + Text { + id: genre + color: infoColor + font: mainContainer.infoFont + text: comicInfo.genere + rightPadding: 20 + visible: comicInfo.genere + } + + Text { + id: date + color: infoColor + font: mainContainer.infoFont + text: comicInfo.date + rightPadding: 20 + visible: comicInfo.date + } + + Text { + id: pages + color: infoColor + font: mainContainer.infoFont + text: comicInfo.numPages + " pages" + rightPadding: 20 + visible: comicInfo.numPages + } + + Text { + id: showInComicVine + font: mainContainer.infoFont + color: "#ffcc00" + text: "Show in Comic Vine" + visible: comicInfo.comicVineID + MouseArea { + anchors.fill: parent + onClicked: { + Qt.openUrlExternally("http://www.comicvine.com/comic/4000-%1/".arg(comicInfo.comicVineID)); + } + } + } + } + + Text { + Layout.topMargin: 22 + Layout.rightMargin: 30 + Layout.bottomMargin: 5 + Layout.fillWidth: true + + id: sinopsis + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + text: comicInfo.synopsis + visible: comicInfo.synopsis + } + + Text { + Layout.topMargin: 25 + Layout.bottomMargin: 5 + + id: authors_title + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 18 + font.bold: true + + text: qsTr("Authors") + + visible: comicInfo.getWriters().length + + comicInfo.getPencillers().length + + comicInfo.getInkers().length + + comicInfo.getColorists().length + + comicInfo.getLetterers().length + + comicInfo.getCoverArtists().length > 0 + } + + Flow { + Layout.fillWidth: true + spacing: 20 + Repeater { + id: writers + model: comicInfo.getWriters().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getWriters()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("writer") + } + } + } + + Repeater { + id: pencilllers + model: comicInfo.getPencillers().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getPencillers()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("penciller") + } + } + } + + Repeater { + id: inkers + model: comicInfo.getInkers().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getInkers()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("inker") + } + } + } + + Repeater { + id: colorist + model: comicInfo.getColorists().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getColorists()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("colorist") + } + } + } + + Repeater { + id: letterers + model: comicInfo.getLetterers().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getLetterers()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("letterer") + } + } + } + + Repeater { + id: cover_artist + model: comicInfo.getCoverArtists().length + Column{ + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getCoverArtists()[index] + } + + Text { + color: infoTextColor + font.family: "Arial" + font.pixelSize: 13 + font.italic: true + text: qsTr("cover artist") + } + } + } + } + + Text { + Layout.topMargin: 25 + + id: publisher_title + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 18 + font.bold: true + + text: qsTr("Publisher") + + visible: publisher.visible || format.visible || color.visible || age_rating.visible + } + + Flow { + Layout.fillWidth: true + spacing: 20 + + Text { + id: publisher + + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.publisher + + visible: comicInfo.publisher + } + + Text { + id: format + + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.format + + visible: comicInfo.format + } + + Text { + id: color + + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.color ? qsTr("color") : qsTr("b/w") + + visible: comicInfo.color + } + + Text { + id: age_rating + + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.ageRating + + visible: comicInfo.ageRating + } + } + + Text { + Layout.topMargin: 25 + Layout.bottomMargin: 5 + + id: characters_title + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 18 + font.bold: true + + text: qsTr("Characters") + + visible: comicInfo.getCharacters().length > 0 + } + + Flow { + Layout.fillWidth: true + spacing: 20 + Repeater { + id: characters + model: comicInfo.getCharacters().length + + Text { + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 15 + + text: comicInfo.getCharacters()[index] + } + } + } + } + + Item { + Layout.fillHeight: true + Layout.fillWidth: true + Layout.minimumWidth: 0 + Layout.preferredWidth: 0 + } + } +} diff --git a/YACReaderLibrary/qml/FlowView.qml b/YACReaderLibrary/qml/FlowView.qml index c0858f04..c121584e 100644 --- a/YACReaderLibrary/qml/FlowView.qml +++ b/YACReaderLibrary/qml/FlowView.qml @@ -1,211 +1,211 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.4 - -import QtGraphicalEffects 1.0 - -import com.yacreader.ComicModel 1.0 - -Rectangle { - id: main - - property url backgroundImageURL; - - property real backgroundBlurRadius : 100; //85; - property real backgroundBlurOpacity : 0.25; //0.35; - property bool backgroundBlurVisible : true; - - property real additionalBottomSpace : 0; - - property real verticalPadding: 12 - - property real itemsSpacing: 17 - - signal currentCoverChanged(int index) - - Rectangle { - id: background - color: "#2A2A2A" - anchors.fill: backgroundImg - } - - Image { - id: backgroundImg - width: parent.width - height: parent.height + additionalBottomSpace - source: backgroundImage - fillMode: Image.PreserveAspectCrop - smooth: true - mipmap: true - asynchronous : true - cache: false //TODO clear cache only when it is needed - opacity: 0 - visible: false - } - - FastBlur { - anchors.fill: backgroundImg - source: backgroundImg - radius: backgroundBlurRadius - opacity: backgroundBlurOpacity - visible: backgroundBlurVisible - } - - anchors.margins: 0 - - MouseArea { - anchors.fill : list - onWheel: { - - if(list.moving) - return; - - var ci - if(wheel.angleDelta.y < 0) { - ci = Math.min(list.currentIndex+1, list.count - 1); - } - else if(wheel.angleDelta.y > 0) { - ci = Math.max(0,list.currentIndex-1); - } else { - return; - } - - list.currentIndex = ci; - } - } - - ListView { - id: list - objectName: "list" - anchors.fill: parent - - property int previousIndex; - - orientation: Qt.Horizontal - pixelAligned: true - - model: comicsList - - spacing: itemsSpacing - anchors.leftMargin: Math.floor(verticalPadding * 1.1) - - snapMode: ListView.SnapToItem - - highlightFollowsCurrentItem: true - highlightRangeMode: ListView.StrictlyEnforceRange - preferredHighlightEnd: 50 - - highlightMoveDuration: 250 - - onCurrentIndexChanged: { - currentCoverChanged(currentIndex); - } - - delegate: Component { - - //cover - Rectangle { - width: Math.floor((list.height - (verticalPadding * 2)) * 0.65); - height: list.height - (verticalPadding * 2); - anchors.verticalCenter: parent.verticalCenter - - color:"transparent" - - BusyIndicator { - scale: 0.5 - anchors.centerIn: parent - running: coverElement.status === Image.Loading - } - - DropShadow { - anchors.fill: coverElement - horizontalOffset: 0 - verticalOffset: 0 - radius: 6 - samples: 17 - color: "#BB000000" - source: coverElement - visible: (Qt.platform.os === "osx") ? false : true; - } - - Image { - id: coverElement - anchors.fill: parent - source: cover_path - fillMode: Image.PreserveAspectCrop - smooth: true - mipmap: true - asynchronous : true - cache: false - } - - //mark - Image { - id: mark - width: 23 - height: 23 - source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":"" - anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9} - asynchronous : true - } - - //border - Rectangle { - width: coverElement.width - height: coverElement.height - anchors.centerIn: coverElement - color: "transparent" - border { - color: "#30FFFFFF" - width: 1 - } - } - - MouseArea { - id: mouseArea - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.RightButton - - hoverEnabled: true - - onDoubleClicked: { - list.currentIndex = index; - currentIndexHelper.selectedItem(index); - } - - onReleased: { - list.currentIndex = index; - - if(mouse.button === Qt.RightButton) // context menu is requested - { - var coordinates = main.mapFromItem(coverElement,mouseX,mouseY) - contextMenuHelper.requestedContextMenu(Qt.point(coordinates.x,coordinates.y)); - } - - mouse.accepted = true; - } - } - } - } - - focus: true - Keys.onPressed: { - - if (event.modifiers & Qt.ControlModifier || event.modifiers & Qt.ShiftModifier) - return; - var ci - if (event.key === Qt.Key_Right) { - ci = Math.min(list.currentIndex+1, list.count - 1); - } - else if (event.key === Qt.Key_Left) { - ci = Math.max(0,list.currentIndex-1); - } else { - return; - } - - list.currentIndex = ci; - - event.accepted = true; - } - - } -} +import QtQuick 2.3 +import QtQuick.Controls 1.4 + +import QtGraphicalEffects 1.0 + +import com.yacreader.ComicModel 1.0 + +Rectangle { + id: main + + property url backgroundImageURL; + + property real backgroundBlurRadius : 100; //85; + property real backgroundBlurOpacity : 0.25; //0.35; + property bool backgroundBlurVisible : true; + + property real additionalBottomSpace : 0; + + property real verticalPadding: 12 + + property real itemsSpacing: 17 + + signal currentCoverChanged(int index) + + Rectangle { + id: background + color: "#2A2A2A" + anchors.fill: backgroundImg + } + + Image { + id: backgroundImg + width: parent.width + height: parent.height + additionalBottomSpace + source: backgroundImage + fillMode: Image.PreserveAspectCrop + smooth: true + mipmap: true + asynchronous : true + cache: false //TODO clear cache only when it is needed + opacity: 0 + visible: false + } + + FastBlur { + anchors.fill: backgroundImg + source: backgroundImg + radius: backgroundBlurRadius + opacity: backgroundBlurOpacity + visible: backgroundBlurVisible + } + + anchors.margins: 0 + + MouseArea { + anchors.fill : list + onWheel: { + + if(list.moving) + return; + + var ci + if(wheel.angleDelta.y < 0) { + ci = Math.min(list.currentIndex+1, list.count - 1); + } + else if(wheel.angleDelta.y > 0) { + ci = Math.max(0,list.currentIndex-1); + } else { + return; + } + + list.currentIndex = ci; + } + } + + ListView { + id: list + objectName: "list" + anchors.fill: parent + + property int previousIndex; + + orientation: Qt.Horizontal + pixelAligned: true + + model: comicsList + + spacing: itemsSpacing + anchors.leftMargin: Math.floor(verticalPadding * 1.1) + + snapMode: ListView.SnapToItem + + highlightFollowsCurrentItem: true + highlightRangeMode: ListView.StrictlyEnforceRange + preferredHighlightEnd: 50 + + highlightMoveDuration: 250 + + onCurrentIndexChanged: { + currentCoverChanged(currentIndex); + } + + delegate: Component { + + //cover + Rectangle { + width: Math.floor((list.height - (verticalPadding * 2)) * 0.65); + height: list.height - (verticalPadding * 2); + anchors.verticalCenter: parent.verticalCenter + + color:"transparent" + + BusyIndicator { + scale: 0.5 + anchors.centerIn: parent + running: coverElement.status === Image.Loading + } + + DropShadow { + anchors.fill: coverElement + horizontalOffset: 0 + verticalOffset: 0 + radius: 6 + samples: 17 + color: "#BB000000" + source: coverElement + visible: (Qt.platform.os === "osx") ? false : true; + } + + Image { + id: coverElement + anchors.fill: parent + source: cover_path + fillMode: Image.PreserveAspectCrop + smooth: true + mipmap: true + asynchronous : true + cache: false + } + + //mark + Image { + id: mark + width: 23 + height: 23 + source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":"" + anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9} + asynchronous : true + } + + //border + Rectangle { + width: coverElement.width + height: coverElement.height + anchors.centerIn: coverElement + color: "transparent" + border { + color: "#30FFFFFF" + width: 1 + } + } + + MouseArea { + id: mouseArea + anchors.fill: parent + acceptedButtons: Qt.LeftButton | Qt.RightButton + + hoverEnabled: true + + onDoubleClicked: { + list.currentIndex = index; + currentIndexHelper.selectedItem(index); + } + + onReleased: { + list.currentIndex = index; + + if(mouse.button === Qt.RightButton) // context menu is requested + { + var coordinates = main.mapFromItem(coverElement,mouseX,mouseY) + contextMenuHelper.requestedContextMenu(Qt.point(coordinates.x,coordinates.y)); + } + + mouse.accepted = true; + } + } + } + } + + focus: true + Keys.onPressed: { + + if (event.modifiers & Qt.ControlModifier || event.modifiers & Qt.ShiftModifier) + return; + var ci + if (event.key === Qt.Key_Right) { + ci = Math.min(list.currentIndex+1, list.count - 1); + } + else if (event.key === Qt.Key_Left) { + ci = Math.max(0,list.currentIndex-1); + } else { + return; + } + + list.currentIndex = ci; + + event.accepted = true; + } + + } +} diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml index 8067df12..997021eb 100644 --- a/YACReaderLibrary/qml/GridComicsView.qml +++ b/YACReaderLibrary/qml/GridComicsView.qml @@ -1,831 +1,831 @@ -import QtQuick 2.9 - -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 - -import QtGraphicalEffects 1.0 -import QtQuick.Controls.Styles 1.4 - -import com.yacreader.ComicModel 1.0 - -import com.yacreader.ComicInfo 1.0 -import com.yacreader.ComicDB 1.0 - -SplitView { - anchors.fill: parent - orientation: Qt.Horizontal - handleDelegate:Rectangle { - width: 1 - height: 1 - color: "#202020" - } - -Rectangle { - id: main - clip: true - - Image { - id: backgroundImg - anchors.fill: parent - source: backgroundImage - fillMode: Image.PreserveAspectCrop - smooth: true - mipmap: true - asynchronous : true - cache: false //TODO clear cache only when it is needed - opacity: 0 - visible: false - } - - FastBlur { - anchors.fill: backgroundImg - source: backgroundImg - radius: backgroundBlurRadius - opacity: backgroundBlurOpacity - visible: backgroundBlurVisible - } - - color: backgroundColor - width: parent.width - (info_container.visible ? info_container.width : 0) - Layout.fillWidth: true - Layout.minimumWidth: coverWidth + 100 - height: parent.height - anchors.margins: 0 - - Component { - id: appDelegate - Rectangle - { - id: cell - width: grid.cellWidth - height: grid.cellHeight - color: "#00000000" - - DropShadow { - anchors.fill: realCell - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - samples: 17 - color: "#FF000000" - source: realCell - visible: (Qt.platform.os === "osx") ? false : true; - } - - Rectangle { - id: realCell - - property int position : 0 - property bool dragging: false; - Drag.active: mouseArea.drag.active - Drag.hotSpot.x: 32 - Drag.hotSpot.y: 32 - Drag.dragType: Drag.Automatic - //Drag.mimeData: { "x": 1 } - Drag.proposedAction: Qt.CopyAction - Drag.onActiveChanged: { - if(!dragging) - { - dragManager.startDrag(); - dragging = true; - }else - dragging = false; - } - - width: itemWidth - height: itemHeight - - color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedColor:cellColor; - //border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedBorderColor:borderColor; - //border.width: ?1:0; - anchors.horizontalCenter: parent.horizontalCenter - - Rectangle - { - id: mouseOverBorder - - property bool commonBorder : false - - property int lBorderwidth : 2 - property int rBorderwidth : 2 - property int tBorderwidth : 2 - property int bBorderwidth : 2 - - property int commonBorderWidth : 1 - - z : -1 - - color: "#00000000" - - anchors - { - left: parent.left - right: parent.right - top: parent.top - bottom: parent.bottom - - topMargin : commonBorder ? -commonBorderWidth : -tBorderwidth - bottomMargin : commonBorder ? -commonBorderWidth : -bBorderwidth - leftMargin : commonBorder ? -commonBorderWidth : -lBorderwidth - rightMargin : commonBorder ? -commonBorderWidth : -rBorderwidth - } - - border.color: (Qt.platform.os === "osx") ? selectedBorderColor : "#ffcc00" - border.width: 3 - - opacity: (dummyValue || !dummyValue) && (comicsSelectionHelper.isSelectedIndex(index) || mouseArea.containsMouse) ? 1 : 0 - - Behavior on opacity { - NumberAnimation { duration: 300 } - } - - radius : 2 - } - - - MouseArea { - id: mouseArea - drag.target: realCell - - drag.minimumX: 0 - drag.maximumX: 0 - drag.minimumY: 0 - drag.maximumY: 0 - - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.RightButton - - hoverEnabled: true - - onDoubleClicked: { - comicsSelectionHelper.clear(); - - comicsSelectionHelper.selectIndex(index); - grid.currentIndex = index; - currentIndexHelper.selectedItem(index); - } - - function selectAll(from,to) - { - for(var i = from;i<=to;i++) - { - comicsSelectionHelper.selectIndex(i); - } - } - - onPressed: { - var ci = grid.currentIndex; //save current index - - /*if(mouse.button != Qt.RightButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) - { - if(!comicsSelectionHelper.isSelectedIndex(index)) - comicsSelectionHelper.clear(); - }*/ - - if(mouse.modifiers & Qt.ShiftModifier) - if(index < ci) - { - selectAll(index,ci); - grid.currentIndex = index; - } - else if (index > ci) - { - selectAll(ci,index); - grid.currentIndex = index; - } - - mouse.accepted = true; - - if(mouse.button === Qt.RightButton) // context menu is requested - { - if(!comicsSelectionHelper.isSelectedIndex(index)) //the context menu is requested outside the current selection, the selection will be - { - currentIndexHelper.setCurrentIndex(index) - grid.currentIndex = index; - } - - var coordinates = main.mapFromItem(realCell,mouseX,mouseY) - contextMenuHelper.requestedContextMenu(Qt.point(coordinates.x,coordinates.y)); - mouse.accepted = false; - - } else //left button - { - - if(mouse.modifiers & Qt.ControlModifier) - { - if(comicsSelectionHelper.isSelectedIndex(index)) - { - if(comicsSelectionHelper.numItemsSelected()>1) - { - comicsSelectionHelper.deselectIndex(index); - if(grid.currentIndex === index) - grid.currentIndex = comicsSelectionHelper.lastSelectedIndex(); - } - } - else - { - comicsSelectionHelper.selectIndex(index); - grid.currentIndex = index; - } - } - - if(mouse.button !== Qt.RightButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) //just left button click - { - if(comicsSelectionHelper.isSelectedIndex(index)) //the context menu is requested outside the current selection, the selection will be - { - - } - else - { - currentIndexHelper.setCurrentIndex(index) - } - - grid.currentIndex = index; - } - } - - } - - onReleased: { - if(mouse.button === Qt.LeftButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) - { - if(comicsSelectionHelper.isSelectedIndex(index)) - { - currentIndexHelper.setCurrentIndex(index) - grid.currentIndex = index; - } - } - } - } - } - - /**/ - - //cover - Image { - id: coverElement - width: coverWidth - height: coverHeight - anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} - source: cover_path - fillMode: Image.PreserveAspectCrop - smooth: true - mipmap: true - asynchronous : true - cache: false //TODO clear cache only when it is needed - - } - - //border - Rectangle { - width: coverElement.width - height: coverElement.height - anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} - color: "transparent" - border { - color: "#20FFFFFF" - width: 1 - } - } - - //mark - Image { - id: mark - width: 23 - height: 23 - source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":"" - anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9} - asynchronous : true - } - - //title - Text { - id : titleText - anchors { top: coverElement.bottom; left: realCell.left; leftMargin: 4; rightMargin: 4; topMargin: 4; } - width: itemWidth - 8 - maximumLineCount: 2 - wrapMode: Text.WordWrap - text: title - elide: Text.ElideRight - color: titleColor - clip: true - font.letterSpacing: fontSpacing - font.pointSize: fontSize - font.family: fontFamily - } - - //number - Text { - anchors {bottom: realCell.bottom; left: realCell.left; margins: 4} - text: number?"#"+number:"" - color: textColor - font.letterSpacing: fontSpacing - font.pointSize: fontSize - font.family: fontFamily - } - - //page icon - Image { - id: pageImage - anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 5; rightMargin: 4; leftMargin: 4} - source: "page.png" - width: 8 - height: 10 - } - - //numPages - Text { - id: pages - anchors {bottom: realCell.bottom; right: pageImage.left; margins: 4} - text: has_been_opened?current_page+"/"+num_pages:num_pages - color: textColor - font.letterSpacing: fontSpacing - font.pointSize: fontSize - font.family: fontFamily - } - - //rating icon - RatingContextMenu { - id: ratingContextMenu - } - - //comic rating - Text { - id: comicRating - anchors {bottom: realCell.bottom; right: ratingContextMenu.left; margins: 4} - text: rating>0?rating:"-" - color: textColor - } - } - } - - ScrollView { - __wheelAreaScrollSpeed: grid.cellHeight * 0.40 - id: scrollView - objectName: "topScrollView" - anchors.fill: parent - anchors.margins: 0 - - function scrollToOrigin() { - flickableItem.contentY = showCurrentComic ? -270 : -20 - flickableItem.contentX = 0 - } - - style: YACReaderScrollViewStyle { - transientScrollBars: false - incrementControl: Item {} - decrementControl: Item {} - handle: Item { - implicitWidth: 16 - implicitHeight: 26 - Rectangle { - color: "#88424242" - anchors.fill: parent - anchors.topMargin: 6 - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.bottomMargin: 6 - border.color: "#AA313131" - border.width: 1 - radius: 8 - } - } - scrollBarBackground: Item { - implicitWidth: 16 - implicitHeight: 26 - } - } - - DropArea { - anchors.fill: parent - - onEntered: { - if(drag.hasUrls) - { - if(dropManager.canDropUrls(drag.urls, drag.action)) - { - drag.accepted = true; - }else - drag.accepted = false; - } - else if (dropManager.canDropFormats(drag.formats)) { - drag.accepted = true; - } else - drag.accepted = false; - } - - onDropped: { - if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action)) - { - dropManager.droppedFiles(drop.urls, drop.action); - } - else{ - if (dropManager.canDropFormats(drop.formats)) - { - var destItem = grid.itemAt(drop.x,drop.y + grid.contentY); - var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x - var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY); - - if(realIndex === -1) - realIndex = grid.count - 1; - - var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1; - dropManager.droppedComicsForResortingAt(drop.getDataAsString(), destIndex); - } - } - } - } - - Component { - id: currentComicView - Rectangle { - id: currentComicViewTopView - color: "#00000000" - - height: showCurrentComic ? 270 : 20 - - Rectangle { - color: (Qt.platform.os === "osx") ? "#88FFFFFF" : "#88000000" - - id: currentComicVisualView - - width: main.width - height: 250 - - visible: showCurrentComic - - //cover - Image { - id: currentCoverElement - anchors.fill: parent - - anchors.leftMargin: 15 - anchors.topMargin: 15 - anchors.bottomMargin: 15 - anchors.rightMargin: 15 - horizontalAlignment: Image.AlignLeft - anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} - source: comicsList.getCoverUrlPathForComicHash(currentComicInfo.hash.toString()) - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - asynchronous : true - cache: false //TODO clear cache only when it is needed - } - - DropShadow { - anchors.fill: currentCoverElement - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - samples: 17 - color: "#FF000000" - source: currentCoverElement - visible: (Qt.platform.os === "osx") ? false : true; - } - - ColumnLayout - { - id: currentComicInfoView - - x: currentCoverElement.anchors.rightMargin + currentCoverElement.paintedWidth + currentCoverElement.anchors.rightMargin - //y: currentCoverElement.anchors.topMargin - - anchors.top: currentCoverElement.top - anchors.right: parent.right - anchors.left: readButton.left - - spacing: 9 - - Text { - Layout.topMargin: 7 - Layout.fillWidth: true - Layout.rightMargin: 20 - - Layout.alignment: Qt.AlignTop | Qt.AlignLeft - - id: currentComicInfoTitleView - - color: infoTitleColor - font.family: "Arial" - font.bold: true - font.pixelSize: 21 - wrapMode: Text.WordWrap - - text: currentComic.getTitleIncludingNumber() - } - - Flow { - spacing: 0 - Layout.alignment: Qt.AlignTop | Qt.AlignLeft - Layout.fillWidth: true - Layout.fillHeight: false - - id: currentComicDetailsFlowView - property font infoFont: Qt.font({ - family: "Arial", - pixelSize: 14 - }); - property string infoFlowTextColor: infoTextColor - - Text { - id: currentComicInfoVolume - color: currentComicDetailsFlowView.infoFlowTextColor - font: currentComicDetailsFlowView.infoFont - text: currentComicInfo.volume ? currentComicInfo.volume : "" - rightPadding: 20 - visible: currentComicInfo.volume ? true : false - } - - Text { - id: currentComicInfoNumbering - color: currentComicDetailsFlowView.infoFlowTextColor - font: currentComicDetailsFlowView.infoFont - text: currentComicInfo.number + "/" + currentComicInfo.count - rightPadding: 20 - visible : currentComicInfo.number ? true : false - } - - Text { - id: currentComicInfoGenre - color: currentComicDetailsFlowView.infoFlowTextColor - font: currentComicDetailsFlowView.infoFont - text: currentComicInfo.genere ? currentComicInfo.genere : "" - rightPadding: 20 - visible: currentComicInfo.genere ? true : false - } - - Text { - id: currentComicInfoDate - color: currentComicDetailsFlowView.infoFlowTextColor - font: currentComicDetailsFlowView.infoFont - text: currentComicInfo.date ? currentComicInfo.date : "" - rightPadding: 20 - visible: currentComicInfo.date ? true : false - } - - Text { - id: currentComicInfoPages - color: currentComicDetailsFlowView.infoFlowTextColor - font: currentComicDetailsFlowView.infoFont - text: (currentComicInfo.numPages ? currentComicInfo.numPages : "") + " pages" - rightPadding: 20 - visible: currentComicInfo.numPages ? true : false - } - - Text { - id: currentComicInfoShowInComicVine - font: currentComicDetailsFlowView.infoFont - color: "#ffcc00" - text: "Show in Comic Vine" - visible: currentComicInfo.comicVineID ? true : false - MouseArea { - anchors.fill: parent - onClicked: { - Qt.openUrlExternally("http://www.comicvine.com/comic/4000-%1/".arg(comicInfo.comicVineID)); - } - } - } - } - - Text { - Layout.topMargin: 6 - Layout.rightMargin: 30 - Layout.bottomMargin: 5 - Layout.fillWidth: true - Layout.maximumHeight: (currentComicVisualView.height * 0.32) - Layout.maximumWidth: 960 - - id: currentComicInfoSinopsis - color: infoTitleColor - font.family: "Arial" - font.pixelSize: 14 - wrapMode: Text.WordWrap - elide: Text.ElideRight - horizontalAlignment: Text.AlignJustify - text: currentComicInfo.synopsis ? currentComicInfo.synopsis : "" - visible: currentComicInfo.synopsis ? true : false - } - } - - Button { - text: "Read" - id: readButton - x: currentCoverElement.anchors.rightMargin + currentCoverElement.paintedWidth + currentCoverElement.anchors.rightMargin - anchors.bottom: currentCoverElement.bottom - anchors.bottomMargin: 15 - - onClicked: comicOpener.triggerOpenCurrentComic() - - style: ButtonStyle { - background: Rectangle { - implicitWidth: 100 - implicitHeight: 30 - border.width: control.activeFocus ? 2 : 1 - border.color: "#FFCC00" - radius: height / 2 - color: "#FFCC00" - - } - label: Text { - renderType: Text.NativeRendering - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - font.family: "Arial" - font.pointSize: 12 - font.bold: true - color: "white" - text: control.text - } - } - } - - - DropShadow { - anchors.fill: readButton - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - samples: 17 - color: "#AA000000" - source: readButton - visible: ((Qt.platform.os === "osx") ? false : true) && !readButton.pressed - } - } - } - } - - GridView { - id:grid - objectName: "grid" - anchors.fill: parent - cellHeight: cellCustomHeight - header: currentComicView - //highlight: appHighlight - focus: true - model: comicsList - delegate: appDelegate - anchors.topMargin: 0 //showCurrentComic ? 0 : 20 - anchors.bottomMargin: 20 - anchors.leftMargin: 0 - anchors.rightMargin: 0 - pixelAligned: true - //flickDeceleration: -2000 - - - currentIndex: 0 - cacheBuffer: 0 - - footer: Rectangle { //fix for the scroll issue, TODO find what causes the issue (some times the bottoms cells are hidden for the toolbar, no full scroll) - height : 25 - width : parent.width - color : "#00000000" - } - - move: Transition { - NumberAnimation { properties: "x,y"; duration: 250 } - } - - moveDisplaced: Transition { - NumberAnimation { properties: "x,y"; duration: 250 } - } - - remove: Transition { - ParallelAnimation { - NumberAnimation { property: "opacity"; to: 0; duration: 250 } - - } - } - - removeDisplaced: Transition { - NumberAnimation { properties: "x,y"; duration: 250 } - } - - - - displaced: Transition { - NumberAnimation { properties: "x,y"; duration: 250 } - } - - function numCellsPerRow() { - return Math.floor(width / cellCustomWidth); - } - - onWidthChanged: { - calculateCellWidths(cellCustomWidth); - } - - function calculateCellWidths(cWidth) { - - var wholeCells = Math.floor(width / cWidth); - var rest = width - (cWidth * wholeCells) - - grid.cellWidth = cWidth + Math.floor(rest / wholeCells); - //console.log("cWidth",cWidth,"wholeCells=",wholeCells,"rest=",rest,"cellWidth=",cellWidth,"width=",width); - } - } - - focus: true - Keys.onPressed: { - if (event.modifiers & Qt.ControlModifier || event.modifiers & Qt.ShiftModifier) - return; - var numCells = grid.numCellsPerRow(); - var ci - if (event.key === Qt.Key_Right) { - ci = Math.min(grid.currentIndex+1,grid.count - 1); - } - else if (event.key === Qt.Key_Left) { - ci = Math.max(0,grid.currentIndex-1); - } - else if (event.key === Qt.Key_Up) { - ci = Math.max(0,grid.currentIndex-numCells); - } - else if (event.key === Qt.Key_Down) { - ci = Math.min(grid.currentIndex+numCells,grid.count - 1); - } - - event.accepted = true; - //var ci = grid.currentIndex; - grid.currentIndex = -1 - comicsSelectionHelper.clear(); - currentIndexHelper.setCurrentIndex(ci); - grid.currentIndex = ci; - } - //} - - /*MouseArea { - anchors.fill: parent - onClicked: { - clicked.accepted = false; - console.log("xx"); - } - - onWheel: { - var newValue = Math.max(0,scrollView.flickableItem.contentY - wheel.angleDelta.y) - scrollView.flickableItem.contentY = newValue - - } - }*/ - /*ScrollBar { - flickable: grid; - } - - PerformanceMeter { - anchors {top: parent.top; left: parent.left; margins: 4} - id: performanceMeter - width: 128 - height: 64 - enabled: (dummyValue || !dummyValue) - }*/ - - } -} -Rectangle { - id: info_container - objectName: "infoContainer" - Layout.preferredWidth: 350 - Layout.minimumWidth: 350 - Layout.maximumWidth: 960 - height: parent.height - - color: infoBackgroundColor - - visible: showInfo - - ScrollView { - __wheelAreaScrollSpeed: 75 - anchors.fill: parent - anchors.margins: 0 - - horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff - - style: ScrollViewStyle { - transientScrollBars: false - incrementControl: Item {} - decrementControl: Item {} - handle: Item { - implicitWidth: 10 - implicitHeight: 26 - Rectangle { - color: "#424246" - anchors.fill: parent - anchors.topMargin: 6 - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.bottomMargin: 6 - } - } - scrollBarBackground: Item { - implicitWidth: 14 - implicitHeight: 26 - } - } - - ComicInfoView { - width: info_container.width - } - } -} -} - - +import QtQuick 2.9 + +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 + +import QtGraphicalEffects 1.0 +import QtQuick.Controls.Styles 1.4 + +import com.yacreader.ComicModel 1.0 + +import com.yacreader.ComicInfo 1.0 +import com.yacreader.ComicDB 1.0 + +SplitView { + anchors.fill: parent + orientation: Qt.Horizontal + handleDelegate:Rectangle { + width: 1 + height: 1 + color: "#202020" + } + +Rectangle { + id: main + clip: true + + Image { + id: backgroundImg + anchors.fill: parent + source: backgroundImage + fillMode: Image.PreserveAspectCrop + smooth: true + mipmap: true + asynchronous : true + cache: false //TODO clear cache only when it is needed + opacity: 0 + visible: false + } + + FastBlur { + anchors.fill: backgroundImg + source: backgroundImg + radius: backgroundBlurRadius + opacity: backgroundBlurOpacity + visible: backgroundBlurVisible + } + + color: backgroundColor + width: parent.width - (info_container.visible ? info_container.width : 0) + Layout.fillWidth: true + Layout.minimumWidth: coverWidth + 100 + height: parent.height + anchors.margins: 0 + + Component { + id: appDelegate + Rectangle + { + id: cell + width: grid.cellWidth + height: grid.cellHeight + color: "#00000000" + + DropShadow { + anchors.fill: realCell + horizontalOffset: 0 + verticalOffset: 0 + radius: 8.0 + samples: 17 + color: "#FF000000" + source: realCell + visible: (Qt.platform.os === "osx") ? false : true; + } + + Rectangle { + id: realCell + + property int position : 0 + property bool dragging: false; + Drag.active: mouseArea.drag.active + Drag.hotSpot.x: 32 + Drag.hotSpot.y: 32 + Drag.dragType: Drag.Automatic + //Drag.mimeData: { "x": 1 } + Drag.proposedAction: Qt.CopyAction + Drag.onActiveChanged: { + if(!dragging) + { + dragManager.startDrag(); + dragging = true; + }else + dragging = false; + } + + width: itemWidth + height: itemHeight + + color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedColor:cellColor; + //border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedBorderColor:borderColor; + //border.width: ?1:0; + anchors.horizontalCenter: parent.horizontalCenter + + Rectangle + { + id: mouseOverBorder + + property bool commonBorder : false + + property int lBorderwidth : 2 + property int rBorderwidth : 2 + property int tBorderwidth : 2 + property int bBorderwidth : 2 + + property int commonBorderWidth : 1 + + z : -1 + + color: "#00000000" + + anchors + { + left: parent.left + right: parent.right + top: parent.top + bottom: parent.bottom + + topMargin : commonBorder ? -commonBorderWidth : -tBorderwidth + bottomMargin : commonBorder ? -commonBorderWidth : -bBorderwidth + leftMargin : commonBorder ? -commonBorderWidth : -lBorderwidth + rightMargin : commonBorder ? -commonBorderWidth : -rBorderwidth + } + + border.color: (Qt.platform.os === "osx") ? selectedBorderColor : "#ffcc00" + border.width: 3 + + opacity: (dummyValue || !dummyValue) && (comicsSelectionHelper.isSelectedIndex(index) || mouseArea.containsMouse) ? 1 : 0 + + Behavior on opacity { + NumberAnimation { duration: 300 } + } + + radius : 2 + } + + + MouseArea { + id: mouseArea + drag.target: realCell + + drag.minimumX: 0 + drag.maximumX: 0 + drag.minimumY: 0 + drag.maximumY: 0 + + anchors.fill: parent + acceptedButtons: Qt.LeftButton | Qt.RightButton + + hoverEnabled: true + + onDoubleClicked: { + comicsSelectionHelper.clear(); + + comicsSelectionHelper.selectIndex(index); + grid.currentIndex = index; + currentIndexHelper.selectedItem(index); + } + + function selectAll(from,to) + { + for(var i = from;i<=to;i++) + { + comicsSelectionHelper.selectIndex(i); + } + } + + onPressed: { + var ci = grid.currentIndex; //save current index + + /*if(mouse.button != Qt.RightButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) + { + if(!comicsSelectionHelper.isSelectedIndex(index)) + comicsSelectionHelper.clear(); + }*/ + + if(mouse.modifiers & Qt.ShiftModifier) + if(index < ci) + { + selectAll(index,ci); + grid.currentIndex = index; + } + else if (index > ci) + { + selectAll(ci,index); + grid.currentIndex = index; + } + + mouse.accepted = true; + + if(mouse.button === Qt.RightButton) // context menu is requested + { + if(!comicsSelectionHelper.isSelectedIndex(index)) //the context menu is requested outside the current selection, the selection will be + { + currentIndexHelper.setCurrentIndex(index) + grid.currentIndex = index; + } + + var coordinates = main.mapFromItem(realCell,mouseX,mouseY) + contextMenuHelper.requestedContextMenu(Qt.point(coordinates.x,coordinates.y)); + mouse.accepted = false; + + } else //left button + { + + if(mouse.modifiers & Qt.ControlModifier) + { + if(comicsSelectionHelper.isSelectedIndex(index)) + { + if(comicsSelectionHelper.numItemsSelected()>1) + { + comicsSelectionHelper.deselectIndex(index); + if(grid.currentIndex === index) + grid.currentIndex = comicsSelectionHelper.lastSelectedIndex(); + } + } + else + { + comicsSelectionHelper.selectIndex(index); + grid.currentIndex = index; + } + } + + if(mouse.button !== Qt.RightButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) //just left button click + { + if(comicsSelectionHelper.isSelectedIndex(index)) //the context menu is requested outside the current selection, the selection will be + { + + } + else + { + currentIndexHelper.setCurrentIndex(index) + } + + grid.currentIndex = index; + } + } + + } + + onReleased: { + if(mouse.button === Qt.LeftButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) + { + if(comicsSelectionHelper.isSelectedIndex(index)) + { + currentIndexHelper.setCurrentIndex(index) + grid.currentIndex = index; + } + } + } + } + } + + /**/ + + //cover + Image { + id: coverElement + width: coverWidth + height: coverHeight + anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} + source: cover_path + fillMode: Image.PreserveAspectCrop + smooth: true + mipmap: true + asynchronous : true + cache: false //TODO clear cache only when it is needed + + } + + //border + Rectangle { + width: coverElement.width + height: coverElement.height + anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} + color: "transparent" + border { + color: "#20FFFFFF" + width: 1 + } + } + + //mark + Image { + id: mark + width: 23 + height: 23 + source: read_column&&show_marks?"tick.png":has_been_opened&&show_marks?"reading.png":"" + anchors {right: coverElement.right; top: coverElement.top; topMargin: 9; rightMargin: 9} + asynchronous : true + } + + //title + Text { + id : titleText + anchors { top: coverElement.bottom; left: realCell.left; leftMargin: 4; rightMargin: 4; topMargin: 4; } + width: itemWidth - 8 + maximumLineCount: 2 + wrapMode: Text.WordWrap + text: title + elide: Text.ElideRight + color: titleColor + clip: true + font.letterSpacing: fontSpacing + font.pointSize: fontSize + font.family: fontFamily + } + + //number + Text { + anchors {bottom: realCell.bottom; left: realCell.left; margins: 4} + text: number?"#"+number:"" + color: textColor + font.letterSpacing: fontSpacing + font.pointSize: fontSize + font.family: fontFamily + } + + //page icon + Image { + id: pageImage + anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 5; rightMargin: 4; leftMargin: 4} + source: "page.png" + width: 8 + height: 10 + } + + //numPages + Text { + id: pages + anchors {bottom: realCell.bottom; right: pageImage.left; margins: 4} + text: has_been_opened?current_page+"/"+num_pages:num_pages + color: textColor + font.letterSpacing: fontSpacing + font.pointSize: fontSize + font.family: fontFamily + } + + //rating icon + RatingContextMenu { + id: ratingContextMenu + } + + //comic rating + Text { + id: comicRating + anchors {bottom: realCell.bottom; right: ratingContextMenu.left; margins: 4} + text: rating>0?rating:"-" + color: textColor + } + } + } + + ScrollView { + __wheelAreaScrollSpeed: grid.cellHeight * 0.40 + id: scrollView + objectName: "topScrollView" + anchors.fill: parent + anchors.margins: 0 + + function scrollToOrigin() { + flickableItem.contentY = showCurrentComic ? -270 : -20 + flickableItem.contentX = 0 + } + + style: YACReaderScrollViewStyle { + transientScrollBars: false + incrementControl: Item {} + decrementControl: Item {} + handle: Item { + implicitWidth: 16 + implicitHeight: 26 + Rectangle { + color: "#88424242" + anchors.fill: parent + anchors.topMargin: 6 + anchors.leftMargin: 4 + anchors.rightMargin: 4 + anchors.bottomMargin: 6 + border.color: "#AA313131" + border.width: 1 + radius: 8 + } + } + scrollBarBackground: Item { + implicitWidth: 16 + implicitHeight: 26 + } + } + + DropArea { + anchors.fill: parent + + onEntered: { + if(drag.hasUrls) + { + if(dropManager.canDropUrls(drag.urls, drag.action)) + { + drag.accepted = true; + }else + drag.accepted = false; + } + else if (dropManager.canDropFormats(drag.formats)) { + drag.accepted = true; + } else + drag.accepted = false; + } + + onDropped: { + if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action)) + { + dropManager.droppedFiles(drop.urls, drop.action); + } + else{ + if (dropManager.canDropFormats(drop.formats)) + { + var destItem = grid.itemAt(drop.x,drop.y + grid.contentY); + var destLocalX = grid.mapToItem(destItem,drop.x,drop.y + grid.contentY).x + var realIndex = grid.indexAt(drop.x,drop.y + grid.contentY); + + if(realIndex === -1) + realIndex = grid.count - 1; + + var destIndex = destLocalX < (grid.cellWidth / 2) ? realIndex : realIndex + 1; + dropManager.droppedComicsForResortingAt(drop.getDataAsString(), destIndex); + } + } + } + } + + Component { + id: currentComicView + Rectangle { + id: currentComicViewTopView + color: "#00000000" + + height: showCurrentComic ? 270 : 20 + + Rectangle { + color: (Qt.platform.os === "osx") ? "#88FFFFFF" : "#88000000" + + id: currentComicVisualView + + width: main.width + height: 250 + + visible: showCurrentComic + + //cover + Image { + id: currentCoverElement + anchors.fill: parent + + anchors.leftMargin: 15 + anchors.topMargin: 15 + anchors.bottomMargin: 15 + anchors.rightMargin: 15 + horizontalAlignment: Image.AlignLeft + anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0} + source: comicsList.getCoverUrlPathForComicHash(currentComicInfo.hash.toString()) + fillMode: Image.PreserveAspectFit + smooth: true + mipmap: true + asynchronous : true + cache: false //TODO clear cache only when it is needed + } + + DropShadow { + anchors.fill: currentCoverElement + horizontalOffset: 0 + verticalOffset: 0 + radius: 8.0 + samples: 17 + color: "#FF000000" + source: currentCoverElement + visible: (Qt.platform.os === "osx") ? false : true; + } + + ColumnLayout + { + id: currentComicInfoView + + x: currentCoverElement.anchors.rightMargin + currentCoverElement.paintedWidth + currentCoverElement.anchors.rightMargin + //y: currentCoverElement.anchors.topMargin + + anchors.top: currentCoverElement.top + anchors.right: parent.right + anchors.left: readButton.left + + spacing: 9 + + Text { + Layout.topMargin: 7 + Layout.fillWidth: true + Layout.rightMargin: 20 + + Layout.alignment: Qt.AlignTop | Qt.AlignLeft + + id: currentComicInfoTitleView + + color: infoTitleColor + font.family: "Arial" + font.bold: true + font.pixelSize: 21 + wrapMode: Text.WordWrap + + text: currentComic.getTitleIncludingNumber() + } + + Flow { + spacing: 0 + Layout.alignment: Qt.AlignTop | Qt.AlignLeft + Layout.fillWidth: true + Layout.fillHeight: false + + id: currentComicDetailsFlowView + property font infoFont: Qt.font({ + family: "Arial", + pixelSize: 14 + }); + property string infoFlowTextColor: infoTextColor + + Text { + id: currentComicInfoVolume + color: currentComicDetailsFlowView.infoFlowTextColor + font: currentComicDetailsFlowView.infoFont + text: currentComicInfo.volume ? currentComicInfo.volume : "" + rightPadding: 20 + visible: currentComicInfo.volume ? true : false + } + + Text { + id: currentComicInfoNumbering + color: currentComicDetailsFlowView.infoFlowTextColor + font: currentComicDetailsFlowView.infoFont + text: currentComicInfo.number + "/" + currentComicInfo.count + rightPadding: 20 + visible : currentComicInfo.number ? true : false + } + + Text { + id: currentComicInfoGenre + color: currentComicDetailsFlowView.infoFlowTextColor + font: currentComicDetailsFlowView.infoFont + text: currentComicInfo.genere ? currentComicInfo.genere : "" + rightPadding: 20 + visible: currentComicInfo.genere ? true : false + } + + Text { + id: currentComicInfoDate + color: currentComicDetailsFlowView.infoFlowTextColor + font: currentComicDetailsFlowView.infoFont + text: currentComicInfo.date ? currentComicInfo.date : "" + rightPadding: 20 + visible: currentComicInfo.date ? true : false + } + + Text { + id: currentComicInfoPages + color: currentComicDetailsFlowView.infoFlowTextColor + font: currentComicDetailsFlowView.infoFont + text: (currentComicInfo.numPages ? currentComicInfo.numPages : "") + " pages" + rightPadding: 20 + visible: currentComicInfo.numPages ? true : false + } + + Text { + id: currentComicInfoShowInComicVine + font: currentComicDetailsFlowView.infoFont + color: "#ffcc00" + text: "Show in Comic Vine" + visible: currentComicInfo.comicVineID ? true : false + MouseArea { + anchors.fill: parent + onClicked: { + Qt.openUrlExternally("http://www.comicvine.com/comic/4000-%1/".arg(comicInfo.comicVineID)); + } + } + } + } + + Text { + Layout.topMargin: 6 + Layout.rightMargin: 30 + Layout.bottomMargin: 5 + Layout.fillWidth: true + Layout.maximumHeight: (currentComicVisualView.height * 0.32) + Layout.maximumWidth: 960 + + id: currentComicInfoSinopsis + color: infoTitleColor + font.family: "Arial" + font.pixelSize: 14 + wrapMode: Text.WordWrap + elide: Text.ElideRight + horizontalAlignment: Text.AlignJustify + text: currentComicInfo.synopsis ? currentComicInfo.synopsis : "" + visible: currentComicInfo.synopsis ? true : false + } + } + + Button { + text: "Read" + id: readButton + x: currentCoverElement.anchors.rightMargin + currentCoverElement.paintedWidth + currentCoverElement.anchors.rightMargin + anchors.bottom: currentCoverElement.bottom + anchors.bottomMargin: 15 + + onClicked: comicOpener.triggerOpenCurrentComic() + + style: ButtonStyle { + background: Rectangle { + implicitWidth: 100 + implicitHeight: 30 + border.width: control.activeFocus ? 2 : 1 + border.color: "#FFCC00" + radius: height / 2 + color: "#FFCC00" + + } + label: Text { + renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + font.family: "Arial" + font.pointSize: 12 + font.bold: true + color: "white" + text: control.text + } + } + } + + + DropShadow { + anchors.fill: readButton + horizontalOffset: 0 + verticalOffset: 0 + radius: 8.0 + samples: 17 + color: "#AA000000" + source: readButton + visible: ((Qt.platform.os === "osx") ? false : true) && !readButton.pressed + } + } + } + } + + GridView { + id:grid + objectName: "grid" + anchors.fill: parent + cellHeight: cellCustomHeight + header: currentComicView + //highlight: appHighlight + focus: true + model: comicsList + delegate: appDelegate + anchors.topMargin: 0 //showCurrentComic ? 0 : 20 + anchors.bottomMargin: 20 + anchors.leftMargin: 0 + anchors.rightMargin: 0 + pixelAligned: true + //flickDeceleration: -2000 + + + currentIndex: 0 + cacheBuffer: 0 + + footer: Rectangle { //fix for the scroll issue, TODO find what causes the issue (some times the bottoms cells are hidden for the toolbar, no full scroll) + height : 25 + width : parent.width + color : "#00000000" + } + + move: Transition { + NumberAnimation { properties: "x,y"; duration: 250 } + } + + moveDisplaced: Transition { + NumberAnimation { properties: "x,y"; duration: 250 } + } + + remove: Transition { + ParallelAnimation { + NumberAnimation { property: "opacity"; to: 0; duration: 250 } + + } + } + + removeDisplaced: Transition { + NumberAnimation { properties: "x,y"; duration: 250 } + } + + + + displaced: Transition { + NumberAnimation { properties: "x,y"; duration: 250 } + } + + function numCellsPerRow() { + return Math.floor(width / cellCustomWidth); + } + + onWidthChanged: { + calculateCellWidths(cellCustomWidth); + } + + function calculateCellWidths(cWidth) { + + var wholeCells = Math.floor(width / cWidth); + var rest = width - (cWidth * wholeCells) + + grid.cellWidth = cWidth + Math.floor(rest / wholeCells); + //console.log("cWidth",cWidth,"wholeCells=",wholeCells,"rest=",rest,"cellWidth=",cellWidth,"width=",width); + } + } + + focus: true + Keys.onPressed: { + if (event.modifiers & Qt.ControlModifier || event.modifiers & Qt.ShiftModifier) + return; + var numCells = grid.numCellsPerRow(); + var ci + if (event.key === Qt.Key_Right) { + ci = Math.min(grid.currentIndex+1,grid.count - 1); + } + else if (event.key === Qt.Key_Left) { + ci = Math.max(0,grid.currentIndex-1); + } + else if (event.key === Qt.Key_Up) { + ci = Math.max(0,grid.currentIndex-numCells); + } + else if (event.key === Qt.Key_Down) { + ci = Math.min(grid.currentIndex+numCells,grid.count - 1); + } + + event.accepted = true; + //var ci = grid.currentIndex; + grid.currentIndex = -1 + comicsSelectionHelper.clear(); + currentIndexHelper.setCurrentIndex(ci); + grid.currentIndex = ci; + } + //} + + /*MouseArea { + anchors.fill: parent + onClicked: { + clicked.accepted = false; + console.log("xx"); + } + + onWheel: { + var newValue = Math.max(0,scrollView.flickableItem.contentY - wheel.angleDelta.y) + scrollView.flickableItem.contentY = newValue + + } + }*/ + /*ScrollBar { + flickable: grid; + } + + PerformanceMeter { + anchors {top: parent.top; left: parent.left; margins: 4} + id: performanceMeter + width: 128 + height: 64 + enabled: (dummyValue || !dummyValue) + }*/ + + } +} +Rectangle { + id: info_container + objectName: "infoContainer" + Layout.preferredWidth: 350 + Layout.minimumWidth: 350 + Layout.maximumWidth: 960 + height: parent.height + + color: infoBackgroundColor + + visible: showInfo + + ScrollView { + __wheelAreaScrollSpeed: 75 + anchors.fill: parent + anchors.margins: 0 + + horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff + + style: ScrollViewStyle { + transientScrollBars: false + incrementControl: Item {} + decrementControl: Item {} + handle: Item { + implicitWidth: 10 + implicitHeight: 26 + Rectangle { + color: "#424246" + anchors.fill: parent + anchors.topMargin: 6 + anchors.leftMargin: 4 + anchors.rightMargin: 4 + anchors.bottomMargin: 6 + } + } + scrollBarBackground: Item { + implicitWidth: 14 + implicitHeight: 26 + } + } + + ComicInfoView { + width: info_container.width + } + } +} +} + + diff --git a/YACReaderLibrary/qml/InfoComicsView.qml b/YACReaderLibrary/qml/InfoComicsView.qml index 35bfe7c5..99552df3 100644 --- a/YACReaderLibrary/qml/InfoComicsView.qml +++ b/YACReaderLibrary/qml/InfoComicsView.qml @@ -1,121 +1,121 @@ -import QtQuick 2.5 - -import QtQuick.Controls 1.2 -import QtGraphicalEffects 1.0 -import QtQuick.Controls.Styles 1.4 - -import com.yacreader.ComicModel 1.0 - -Rectangle { - id: main - - color: infoBackgroundColor - - width: parent.width - height: parent.height - anchors.margins: 0 - - FlowView { - id: flow - objectName: "flow" - height: 256 //TODO dynamic size? - - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - - additionalBottomSpace: indicator.height - } - - Image { - id: top_shadow - source: topShadow - width: parent.width - fillMode: Image.TileHorizontally - } - - Rectangle { - id: indicator_container - width: parent.width - y: 250 - - Image { - id: indicator - source: infoIndicator - } - - Image { - id: bottom_shadow - x: indicator.width - width: parent.width - indicator.width - source: infoShadow - fillMode: Image.TileHorizontally - } - } - - Rectangle { - id: info_container - width: parent.width - y: flow.height + flow.additionalBottomSpace - 6 - height: parent.height - y - - color: infoBackgroundColor - - ScrollView { - __wheelAreaScrollSpeed: 75 - anchors.fill: parent - anchors.margins: 0 - - horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff - - style: ScrollViewStyle { - transientScrollBars: false - incrementControl: Item {} - decrementControl: Item {} - handle: Item { - implicitWidth: 10 - implicitHeight: 26 - Rectangle { - color: "#424246" - anchors.fill: parent - anchors.topMargin: 6 - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.bottomMargin: 6 - } - } - - scrollBarBackground: Item { - implicitWidth: 14 - implicitHeight: 26 - } - } - - ComicInfoView { - width: info_container.width - 14 - } - } - } - - DropArea { - anchors.fill: parent - - onEntered: { - if(drag.hasUrls) - { - if(dropManager.canDropUrls(drag.urls, drag.action)) - { - drag.accepted = true; - }else - drag.accepted = false; - } - } - - onDropped: { - if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action)) - { - dropManager.droppedFiles(drop.urls, drop.action); - } - } - } -} +import QtQuick 2.5 + +import QtQuick.Controls 1.2 +import QtGraphicalEffects 1.0 +import QtQuick.Controls.Styles 1.4 + +import com.yacreader.ComicModel 1.0 + +Rectangle { + id: main + + color: infoBackgroundColor + + width: parent.width + height: parent.height + anchors.margins: 0 + + FlowView { + id: flow + objectName: "flow" + height: 256 //TODO dynamic size? + + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + + additionalBottomSpace: indicator.height + } + + Image { + id: top_shadow + source: topShadow + width: parent.width + fillMode: Image.TileHorizontally + } + + Rectangle { + id: indicator_container + width: parent.width + y: 250 + + Image { + id: indicator + source: infoIndicator + } + + Image { + id: bottom_shadow + x: indicator.width + width: parent.width - indicator.width + source: infoShadow + fillMode: Image.TileHorizontally + } + } + + Rectangle { + id: info_container + width: parent.width + y: flow.height + flow.additionalBottomSpace - 6 + height: parent.height - y + + color: infoBackgroundColor + + ScrollView { + __wheelAreaScrollSpeed: 75 + anchors.fill: parent + anchors.margins: 0 + + horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff + + style: ScrollViewStyle { + transientScrollBars: false + incrementControl: Item {} + decrementControl: Item {} + handle: Item { + implicitWidth: 10 + implicitHeight: 26 + Rectangle { + color: "#424246" + anchors.fill: parent + anchors.topMargin: 6 + anchors.leftMargin: 4 + anchors.rightMargin: 4 + anchors.bottomMargin: 6 + } + } + + scrollBarBackground: Item { + implicitWidth: 14 + implicitHeight: 26 + } + } + + ComicInfoView { + width: info_container.width - 14 + } + } + } + + DropArea { + anchors.fill: parent + + onEntered: { + if(drag.hasUrls) + { + if(dropManager.canDropUrls(drag.urls, drag.action)) + { + drag.accepted = true; + }else + drag.accepted = false; + } + } + + onDropped: { + if(drop.hasUrls && dropManager.canDropUrls(drop.urls, drop.action)) + { + dropManager.droppedFiles(drop.urls, drop.action); + } + } + } +} diff --git a/YACReaderLibrary/qml/InfoFavorites.qml b/YACReaderLibrary/qml/InfoFavorites.qml index d490ab17..4b6c436d 100644 --- a/YACReaderLibrary/qml/InfoFavorites.qml +++ b/YACReaderLibrary/qml/InfoFavorites.qml @@ -1,32 +1,32 @@ -import QtQuick 2.6 - -import QtGraphicalEffects 1.0 - -Item { - width: 20 - height: 20 - - property bool active - - signal activeChangedByUser(bool active) - - MouseArea { - anchors.fill: favorites_button_compact - onClicked: { - activeChangedByUser(!active); - } - } - - Image { - anchors.centerIn: parent - id: favorites_button_compact - source: "info-favorites.png" - } - - ColorOverlay { - anchors.fill: favorites_button_compact - source: favorites_button_compact - color: active ? favCheckedColor : favUncheckedColor - } -} - +import QtQuick 2.6 + +import QtGraphicalEffects 1.0 + +Item { + width: 20 + height: 20 + + property bool active + + signal activeChangedByUser(bool active) + + MouseArea { + anchors.fill: favorites_button_compact + onClicked: { + activeChangedByUser(!active); + } + } + + Image { + anchors.centerIn: parent + id: favorites_button_compact + source: "info-favorites.png" + } + + ColorOverlay { + anchors.fill: favorites_button_compact + source: favorites_button_compact + color: active ? favCheckedColor : favUncheckedColor + } +} + diff --git a/YACReaderLibrary/qml/InfoRating.qml b/YACReaderLibrary/qml/InfoRating.qml index d865358b..124ccc8e 100644 --- a/YACReaderLibrary/qml/InfoRating.qml +++ b/YACReaderLibrary/qml/InfoRating.qml @@ -1,50 +1,50 @@ -import QtQuick 2.6 - -import QtGraphicalEffects 1.0 - -Row { - spacing: 0 - property int rating : 0 - property int mouseIndex : 0 - - signal ratingChangedByUser(int rating) - - Repeater { - id: rating_compact - model: 5 - Item { - width: 25 - height: 20 - - Image { - id: star - source: "info-rating.png" - } - - ColorOverlay { - anchors.fill: star - source: star - color: index < (mouseIndex > 0 ? mouseIndex : rating) ? ratingSelectedColor : ratingUnselectedColor - } - - MouseArea { - anchors.fill: parent - hoverEnabled: true - - onPositionChanged: { - mouseIndex = index + 1; - } - - onClicked: { - ratingChangedByUser(mouseIndex); - } - - onExited: { - mouseIndex = 0; - } - } - } - } - - -} +import QtQuick 2.6 + +import QtGraphicalEffects 1.0 + +Row { + spacing: 0 + property int rating : 0 + property int mouseIndex : 0 + + signal ratingChangedByUser(int rating) + + Repeater { + id: rating_compact + model: 5 + Item { + width: 25 + height: 20 + + Image { + id: star + source: "info-rating.png" + } + + ColorOverlay { + anchors.fill: star + source: star + color: index < (mouseIndex > 0 ? mouseIndex : rating) ? ratingSelectedColor : ratingUnselectedColor + } + + MouseArea { + anchors.fill: parent + hoverEnabled: true + + onPositionChanged: { + mouseIndex = index + 1; + } + + onClicked: { + ratingChangedByUser(mouseIndex); + } + + onExited: { + mouseIndex = 0; + } + } + } + } + + +} diff --git a/YACReaderLibrary/qml/InfoTick.qml b/YACReaderLibrary/qml/InfoTick.qml index f91d65a8..f7b5f1e1 100644 --- a/YACReaderLibrary/qml/InfoTick.qml +++ b/YACReaderLibrary/qml/InfoTick.qml @@ -1,29 +1,29 @@ -import QtQuick 2.6 - -import QtGraphicalEffects 1.0 - -Item { - - property bool read - - signal readChangedByUser(bool read) - - MouseArea { - anchors.fill: read_compact - onClicked: { - readChangedByUser(!read); - } - } - - Image { - id: read_compact - source: "info-tick.png" - } - - ColorOverlay { - anchors.fill: read_compact - source: read_compact - color: read ? readTickCheckedColor : readTickUncheckedColor - } -} - +import QtQuick 2.6 + +import QtGraphicalEffects 1.0 + +Item { + + property bool read + + signal readChangedByUser(bool read) + + MouseArea { + anchors.fill: read_compact + onClicked: { + readChangedByUser(!read); + } + } + + Image { + id: read_compact + source: "info-tick.png" + } + + ColorOverlay { + anchors.fill: read_compact + source: read_compact + color: read ? readTickCheckedColor : readTickUncheckedColor + } +} + diff --git a/YACReaderLibrary/qml/RatingContextMenu-osx.qml b/YACReaderLibrary/qml/RatingContextMenu-osx.qml index 6f6bb515..17593550 100644 --- a/YACReaderLibrary/qml/RatingContextMenu-osx.qml +++ b/YACReaderLibrary/qml/RatingContextMenu-osx.qml @@ -1,32 +1,32 @@ -import QtQuick 2.9 - -import QtQuick.Controls 1.4 - -Image { - id: ratingImage - anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12} - source: "star.png" - width: 13 - height: 11 - - MouseArea { - anchors.fill: parent - onPressed: { - console.log("rating"); - comicsSelectionHelper.clear(); - comicsSelectionHelper.selectIndex(index); - grid.currentIndex = index; - ratingConextMenu.popup(); - } - } - - Menu { - id: ratingConextMenu - MenuItem { text: "1"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,1) } - MenuItem { text: "2"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,2) } - MenuItem { text: "3"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,3) } - MenuItem { text: "4"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,4) } - MenuItem { text: "5"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,5) } - } -} - +import QtQuick 2.9 + +import QtQuick.Controls 1.4 + +Image { + id: ratingImage + anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12} + source: "star.png" + width: 13 + height: 11 + + MouseArea { + anchors.fill: parent + onPressed: { + console.log("rating"); + comicsSelectionHelper.clear(); + comicsSelectionHelper.selectIndex(index); + grid.currentIndex = index; + ratingConextMenu.popup(); + } + } + + Menu { + id: ratingConextMenu + MenuItem { text: "1"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,1) } + MenuItem { text: "2"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,2) } + MenuItem { text: "3"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,3) } + MenuItem { text: "4"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,4) } + MenuItem { text: "5"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,5) } + } +} + diff --git a/YACReaderLibrary/qml/RatingContextMenu-win.qml b/YACReaderLibrary/qml/RatingContextMenu-win.qml index 4fb75186..4b5e03b4 100644 --- a/YACReaderLibrary/qml/RatingContextMenu-win.qml +++ b/YACReaderLibrary/qml/RatingContextMenu-win.qml @@ -1,36 +1,36 @@ -import QtQuick 2.9 - -import QtQuick.Controls 1.4 - -Image { - id: ratingImage - anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12} - source: "star.png" - width: 13 - height: 11 - - MouseArea { - anchors.fill: parent - onPressed: { - console.log("rating"); - comicsSelectionHelper.clear(); - comicsSelectionHelper.selectIndex(index); - grid.currentIndex = index; - ratingConextMenu.popup(); - } - } - - MenuBar - { - Menu { - id: ratingConextMenu - MenuItem { text: "1"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,1) } - MenuItem { text: "2"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,2) } - MenuItem { text: "3"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,3) } - MenuItem { text: "4"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,4) } - MenuItem { text: "5"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,5) } - - } - } -} - +import QtQuick 2.9 + +import QtQuick.Controls 1.4 + +Image { + id: ratingImage + anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12} + source: "star.png" + width: 13 + height: 11 + + MouseArea { + anchors.fill: parent + onPressed: { + console.log("rating"); + comicsSelectionHelper.clear(); + comicsSelectionHelper.selectIndex(index); + grid.currentIndex = index; + ratingConextMenu.popup(); + } + } + + MenuBar + { + Menu { + id: ratingConextMenu + MenuItem { text: "1"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,1) } + MenuItem { text: "2"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,2) } + MenuItem { text: "3"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,3) } + MenuItem { text: "4"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,4) } + MenuItem { text: "5"; enabled: true; iconSource:"star_menu.png"; onTriggered: comicRatingHelper.rate(index,5) } + + } + } +} + diff --git a/YACReaderLibrary/qml/YACReaderScrollView.qml b/YACReaderLibrary/qml/YACReaderScrollView.qml index ad26d4b3..363d26ec 100644 --- a/YACReaderLibrary/qml/YACReaderScrollView.qml +++ b/YACReaderLibrary/qml/YACReaderScrollView.qml @@ -1,357 +1,357 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.1 - -/*! - \qmltype ScrollView - \inqmlmodule QtQuick.Controls - \since 5.1 - \ingroup views - \ingroup controls - \brief Provides a scrolling view within another Item. - - \image scrollview.png - - A ScrollView can be used either to replace a \l Flickable or decorate an - existing \l Flickable. Depending on the platform, it will add scroll bars and - a content frame. - - Only one Item can be a direct child of the ScrollView and the child is implicitly anchored - to fill the scroll view. - - Example: - \code - ScrollView { - Image { source: "largeImage.png" } - } - \endcode - - In the previous example the Image item will implicitly get scroll behavior as if it was - used within a \l Flickable. The width and height of the child item will be used to - define the size of the content area. - - Example: - \code - ScrollView { - ListView { - ... - } - } - \endcode - - In this case the content size of the ScrollView will simply mirror that of its contained - \l flickableItem. - - You can create a custom appearance for a ScrollView by - assigning a \l {ScrollViewStyle}. -*/ - -FocusScope { - id: root - - implicitWidth: 240 - implicitHeight: 150 - - /*! - This property tells the ScrollView if it should render - a frame around its content. - - The default value is \c false. - */ - property bool frameVisible: false - - /*! \qmlproperty enumeration ScrollView::horizontalScrollBarPolicy - \since QtQuick.Controls 1.3 - - This property holds the policy for showing the horizontal scrollbar. - It can be any of the following values: - \list - \li Qt.ScrollBarAsNeeded - \li Qt.ScrollBarAlwaysOff - \li Qt.ScrollBarAlwaysOn - \endlist - - The default policy is \c Qt.ScrollBarAsNeeded. - */ - property alias horizontalScrollBarPolicy: scroller.horizontalScrollBarPolicy - - /*! \qmlproperty enumeration ScrollView::verticalScrollBarPolicy - \since QtQuick.Controls 1.3 - - This property holds the policy for showing the vertical scrollbar. - It can be any of the following values: - \list - \li Qt.ScrollBarAsNeeded - \li Qt.ScrollBarAlwaysOff - \li Qt.ScrollBarAlwaysOn - \endlist - - The default policy is \c Qt.ScrollBarAsNeeded. - */ - property alias verticalScrollBarPolicy: scroller.verticalScrollBarPolicy - - /*! - This property controls if there should be a highlight - around the frame when the ScrollView has input focus. - - The default value is \c false. - - \note This property is only applicable on some platforms, such - as Mac OS. - */ - property bool highlightOnFocus: false - - /*! - \qmlproperty Item ScrollView::viewport - - The viewport determines the current "window" on the contentItem. - In other words, it clips it and the size of the viewport tells you - how much of the content area is visible. - */ - property alias viewport: viewportItem - - /*! - \qmlproperty Item ScrollView::flickableItem - - The flickableItem of the ScrollView. If the contentItem provided - to the ScrollView is a Flickable, it will be the \l contentItem. - */ - readonly property alias flickableItem: internal.flickableItem - - /*! - The contentItem of the ScrollView. This is set by the user. - - Note that the definition of contentItem is somewhat different to that - of a Flickable, where the contentItem is implicitly created. - */ - default property Item contentItem - - /*! \internal */ - property alias __scroller: scroller - /*! \internal */ - property alias __verticalScrollbarOffset: scroller.verticalScrollbarOffset - /*! \internal */ - property alias __wheelAreaScrollSpeed: wheelArea.scrollSpeed - /*! \internal */ - property int __scrollBarTopMargin: 0 - /*! \internal */ - property int __viewTopMargin: 0 - /*! \internal */ - property alias __horizontalScrollBar: scroller.horizontalScrollBar - /*! \internal */ - property alias __verticalScrollBar: scroller.verticalScrollBar - /*! \qmlproperty Component ScrollView::style - - The style Component for this control. - \sa {Qt Quick Controls Styles QML Types} - - */ - property Component style: Settings.styleComponent(Settings.style, "ScrollViewStyle.qml", root) - - /*! \internal */ - property Style __style: styleLoader.item - - activeFocusOnTab: true - - onContentItemChanged: { - - if (contentItem.hasOwnProperty("contentY") && // Check if flickable - contentItem.hasOwnProperty("contentHeight")) { - internal.flickableItem = contentItem // "Use content if it is a flickable - internal.flickableItem.parent = viewportItem - } else { - internal.flickableItem = flickableComponent.createObject(viewportItem) - contentItem.parent = internal.flickableItem.contentItem - } - internal.flickableItem.anchors.fill = viewportItem - if (!Settings.hasTouchScreen) - internal.flickableItem.interactive = false - } - - - children: Item { - id: internal - - property Flickable flickableItem - - Loader { - id: styleLoader - sourceComponent: style - onStatusChanged: { - if (status === Loader.Error) - console.error("Failed to load Style for", root) - } - property alias __control: root - } - - Binding { - target: flickableItem - property: "contentHeight" - when: contentItem !== flickableItem - value: contentItem ? contentItem.height : 0 - } - - Binding { - target: flickableItem - when: contentItem !== flickableItem - property: "contentWidth" - value: contentItem ? contentItem.width : 0 - } - - Connections { - target: flickableItem - - onContentYChanged: { - scroller.blockUpdates = true - scroller.verticalScrollBar.value = flickableItem.contentY - flickableItem.originY - scroller.blockUpdates = false - } - - onContentXChanged: { - scroller.blockUpdates = true - scroller.horizontalScrollBar.value = flickableItem.contentX - flickableItem.originX - scroller.blockUpdates = false - } - - } - - anchors.fill: parent - - Component { - id: flickableComponent - Flickable {} - } - - WheelArea { - id: wheelArea - parent: flickableItem - z: -1 - // ### Note this is needed due to broken mousewheel behavior in Flickable. - - anchors.fill: parent - - property int acceleration: 40 - property int flickThreshold: Settings.dragThreshold - property real speedThreshold: 3 - property real ignored: 0.001 // ## flick() does not work with 0 yVelocity - property int maxFlick: 400 - - property bool horizontalRecursionGuard: false - property bool verticalRecursionGuard: false - - horizontalMinimumValue: 0 - horizontalMaximumValue: flickableItem ? flickableItem.contentWidth - viewport.width : 0 - - verticalMinimumValue: 0 - verticalMaximumValue: flickableItem ? flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 - - // The default scroll speed for typical angle-based mouse wheels. The value - // comes originally from QTextEdit, which sets 20px steps by default, as well as - // QQuickWheelArea. - // TODO: centralize somewhere, QPlatformTheme? - scrollSpeed: 20 * (__style && __style.__wheelScrollLines || 1) - - Connections { - target: flickableItem - - onContentYChanged: { - wheelArea.verticalRecursionGuard = true - wheelArea.verticalValue = flickableItem.contentY - flickableItem.originY - wheelArea.verticalRecursionGuard = false - } - onContentXChanged: { - wheelArea.horizontalRecursionGuard = true - wheelArea.horizontalValue = flickableItem.contentX - flickableItem.originX - wheelArea.horizontalRecursionGuard = false - } - } - - onVerticalValueChanged: { - if (!verticalRecursionGuard) { - var effectiveContentY = flickableItem.contentY - flickableItem.originY - if (effectiveContentY < flickThreshold && verticalDelta > speedThreshold) { - flickableItem.flick(ignored, Math.min(maxFlick, acceleration * verticalDelta)) - } else if (effectiveContentY > flickableItem.contentHeight - flickThreshold - viewport.height - && verticalDelta < -speedThreshold) { - flickableItem.flick(ignored, Math.max(-maxFlick, acceleration * verticalDelta)) - } else { - flickableItem.contentY = verticalValue + flickableItem.originY - } - flickableItem.contentY = Math.min(verticalMaximumValue, Math.max(0, flickableItem.contentY)); - } - } - - onHorizontalValueChanged: { - if (!horizontalRecursionGuard) - flickableItem.contentX = horizontalValue + flickableItem.originX - } - } - - ScrollViewHelper { - id: scroller - anchors.fill: parent - active: wheelArea.active - property bool outerFrame: !frameVisible || !(__style ? __style.__externalScrollBars : 0) - property int scrollBarSpacing: outerFrame ? 0 : (__style ? __style.__scrollBarSpacing : 0) - property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ? - verticalScrollBar.width + scrollBarSpacing : 0 - property int horizontalScrollbarOffset: horizontalScrollBar.visible && !horizontalScrollBar.isTransient ? - horizontalScrollBar.height + scrollBarSpacing : 0 - Loader { - id: frameLoader - sourceComponent: __style ? __style.frame : null - anchors.fill: parent - anchors.rightMargin: scroller.outerFrame ? 0 : scroller.verticalScrollbarOffset - anchors.bottomMargin: scroller.outerFrame ? 0 : scroller.horizontalScrollbarOffset - } - - Item { - id: viewportItem - anchors.fill: frameLoader - anchors.topMargin: frameVisible ? __style.padding.top : 0 - anchors.leftMargin: frameVisible ? __style.padding.left : 0 - anchors.rightMargin: (frameVisible ? __style.padding.right : 0) + (scroller.outerFrame ? scroller.verticalScrollbarOffset : 0) - anchors.bottomMargin: (frameVisible ? __style.padding.bottom : 0) + (scroller.outerFrame ? scroller.horizontalScrollbarOffset : 0) - clip: true - } - } - FocusFrame { visible: highlightOnFocus && root.activeFocus } - } -} +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Controls.Private 1.0 +import QtQuick.Controls.Styles 1.1 + +/*! + \qmltype ScrollView + \inqmlmodule QtQuick.Controls + \since 5.1 + \ingroup views + \ingroup controls + \brief Provides a scrolling view within another Item. + + \image scrollview.png + + A ScrollView can be used either to replace a \l Flickable or decorate an + existing \l Flickable. Depending on the platform, it will add scroll bars and + a content frame. + + Only one Item can be a direct child of the ScrollView and the child is implicitly anchored + to fill the scroll view. + + Example: + \code + ScrollView { + Image { source: "largeImage.png" } + } + \endcode + + In the previous example the Image item will implicitly get scroll behavior as if it was + used within a \l Flickable. The width and height of the child item will be used to + define the size of the content area. + + Example: + \code + ScrollView { + ListView { + ... + } + } + \endcode + + In this case the content size of the ScrollView will simply mirror that of its contained + \l flickableItem. + + You can create a custom appearance for a ScrollView by + assigning a \l {ScrollViewStyle}. +*/ + +FocusScope { + id: root + + implicitWidth: 240 + implicitHeight: 150 + + /*! + This property tells the ScrollView if it should render + a frame around its content. + + The default value is \c false. + */ + property bool frameVisible: false + + /*! \qmlproperty enumeration ScrollView::horizontalScrollBarPolicy + \since QtQuick.Controls 1.3 + + This property holds the policy for showing the horizontal scrollbar. + It can be any of the following values: + \list + \li Qt.ScrollBarAsNeeded + \li Qt.ScrollBarAlwaysOff + \li Qt.ScrollBarAlwaysOn + \endlist + + The default policy is \c Qt.ScrollBarAsNeeded. + */ + property alias horizontalScrollBarPolicy: scroller.horizontalScrollBarPolicy + + /*! \qmlproperty enumeration ScrollView::verticalScrollBarPolicy + \since QtQuick.Controls 1.3 + + This property holds the policy for showing the vertical scrollbar. + It can be any of the following values: + \list + \li Qt.ScrollBarAsNeeded + \li Qt.ScrollBarAlwaysOff + \li Qt.ScrollBarAlwaysOn + \endlist + + The default policy is \c Qt.ScrollBarAsNeeded. + */ + property alias verticalScrollBarPolicy: scroller.verticalScrollBarPolicy + + /*! + This property controls if there should be a highlight + around the frame when the ScrollView has input focus. + + The default value is \c false. + + \note This property is only applicable on some platforms, such + as Mac OS. + */ + property bool highlightOnFocus: false + + /*! + \qmlproperty Item ScrollView::viewport + + The viewport determines the current "window" on the contentItem. + In other words, it clips it and the size of the viewport tells you + how much of the content area is visible. + */ + property alias viewport: viewportItem + + /*! + \qmlproperty Item ScrollView::flickableItem + + The flickableItem of the ScrollView. If the contentItem provided + to the ScrollView is a Flickable, it will be the \l contentItem. + */ + readonly property alias flickableItem: internal.flickableItem + + /*! + The contentItem of the ScrollView. This is set by the user. + + Note that the definition of contentItem is somewhat different to that + of a Flickable, where the contentItem is implicitly created. + */ + default property Item contentItem + + /*! \internal */ + property alias __scroller: scroller + /*! \internal */ + property alias __verticalScrollbarOffset: scroller.verticalScrollbarOffset + /*! \internal */ + property alias __wheelAreaScrollSpeed: wheelArea.scrollSpeed + /*! \internal */ + property int __scrollBarTopMargin: 0 + /*! \internal */ + property int __viewTopMargin: 0 + /*! \internal */ + property alias __horizontalScrollBar: scroller.horizontalScrollBar + /*! \internal */ + property alias __verticalScrollBar: scroller.verticalScrollBar + /*! \qmlproperty Component ScrollView::style + + The style Component for this control. + \sa {Qt Quick Controls Styles QML Types} + + */ + property Component style: Settings.styleComponent(Settings.style, "ScrollViewStyle.qml", root) + + /*! \internal */ + property Style __style: styleLoader.item + + activeFocusOnTab: true + + onContentItemChanged: { + + if (contentItem.hasOwnProperty("contentY") && // Check if flickable + contentItem.hasOwnProperty("contentHeight")) { + internal.flickableItem = contentItem // "Use content if it is a flickable + internal.flickableItem.parent = viewportItem + } else { + internal.flickableItem = flickableComponent.createObject(viewportItem) + contentItem.parent = internal.flickableItem.contentItem + } + internal.flickableItem.anchors.fill = viewportItem + if (!Settings.hasTouchScreen) + internal.flickableItem.interactive = false + } + + + children: Item { + id: internal + + property Flickable flickableItem + + Loader { + id: styleLoader + sourceComponent: style + onStatusChanged: { + if (status === Loader.Error) + console.error("Failed to load Style for", root) + } + property alias __control: root + } + + Binding { + target: flickableItem + property: "contentHeight" + when: contentItem !== flickableItem + value: contentItem ? contentItem.height : 0 + } + + Binding { + target: flickableItem + when: contentItem !== flickableItem + property: "contentWidth" + value: contentItem ? contentItem.width : 0 + } + + Connections { + target: flickableItem + + onContentYChanged: { + scroller.blockUpdates = true + scroller.verticalScrollBar.value = flickableItem.contentY - flickableItem.originY + scroller.blockUpdates = false + } + + onContentXChanged: { + scroller.blockUpdates = true + scroller.horizontalScrollBar.value = flickableItem.contentX - flickableItem.originX + scroller.blockUpdates = false + } + + } + + anchors.fill: parent + + Component { + id: flickableComponent + Flickable {} + } + + WheelArea { + id: wheelArea + parent: flickableItem + z: -1 + // ### Note this is needed due to broken mousewheel behavior in Flickable. + + anchors.fill: parent + + property int acceleration: 40 + property int flickThreshold: Settings.dragThreshold + property real speedThreshold: 3 + property real ignored: 0.001 // ## flick() does not work with 0 yVelocity + property int maxFlick: 400 + + property bool horizontalRecursionGuard: false + property bool verticalRecursionGuard: false + + horizontalMinimumValue: 0 + horizontalMaximumValue: flickableItem ? flickableItem.contentWidth - viewport.width : 0 + + verticalMinimumValue: 0 + verticalMaximumValue: flickableItem ? flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 + + // The default scroll speed for typical angle-based mouse wheels. The value + // comes originally from QTextEdit, which sets 20px steps by default, as well as + // QQuickWheelArea. + // TODO: centralize somewhere, QPlatformTheme? + scrollSpeed: 20 * (__style && __style.__wheelScrollLines || 1) + + Connections { + target: flickableItem + + onContentYChanged: { + wheelArea.verticalRecursionGuard = true + wheelArea.verticalValue = flickableItem.contentY - flickableItem.originY + wheelArea.verticalRecursionGuard = false + } + onContentXChanged: { + wheelArea.horizontalRecursionGuard = true + wheelArea.horizontalValue = flickableItem.contentX - flickableItem.originX + wheelArea.horizontalRecursionGuard = false + } + } + + onVerticalValueChanged: { + if (!verticalRecursionGuard) { + var effectiveContentY = flickableItem.contentY - flickableItem.originY + if (effectiveContentY < flickThreshold && verticalDelta > speedThreshold) { + flickableItem.flick(ignored, Math.min(maxFlick, acceleration * verticalDelta)) + } else if (effectiveContentY > flickableItem.contentHeight - flickThreshold - viewport.height + && verticalDelta < -speedThreshold) { + flickableItem.flick(ignored, Math.max(-maxFlick, acceleration * verticalDelta)) + } else { + flickableItem.contentY = verticalValue + flickableItem.originY + } + flickableItem.contentY = Math.min(verticalMaximumValue, Math.max(0, flickableItem.contentY)); + } + } + + onHorizontalValueChanged: { + if (!horizontalRecursionGuard) + flickableItem.contentX = horizontalValue + flickableItem.originX + } + } + + ScrollViewHelper { + id: scroller + anchors.fill: parent + active: wheelArea.active + property bool outerFrame: !frameVisible || !(__style ? __style.__externalScrollBars : 0) + property int scrollBarSpacing: outerFrame ? 0 : (__style ? __style.__scrollBarSpacing : 0) + property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ? + verticalScrollBar.width + scrollBarSpacing : 0 + property int horizontalScrollbarOffset: horizontalScrollBar.visible && !horizontalScrollBar.isTransient ? + horizontalScrollBar.height + scrollBarSpacing : 0 + Loader { + id: frameLoader + sourceComponent: __style ? __style.frame : null + anchors.fill: parent + anchors.rightMargin: scroller.outerFrame ? 0 : scroller.verticalScrollbarOffset + anchors.bottomMargin: scroller.outerFrame ? 0 : scroller.horizontalScrollbarOffset + } + + Item { + id: viewportItem + anchors.fill: frameLoader + anchors.topMargin: frameVisible ? __style.padding.top : 0 + anchors.leftMargin: frameVisible ? __style.padding.left : 0 + anchors.rightMargin: (frameVisible ? __style.padding.right : 0) + (scroller.outerFrame ? scroller.verticalScrollbarOffset : 0) + anchors.bottomMargin: (frameVisible ? __style.padding.bottom : 0) + (scroller.outerFrame ? scroller.horizontalScrollbarOffset : 0) + clip: true + } + } + FocusFrame { visible: highlightOnFocus && root.activeFocus } + } +} diff --git a/YACReaderLibrary/qml/YACReaderScrollViewStyle.qml b/YACReaderLibrary/qml/YACReaderScrollViewStyle.qml index e756431e..09bc7da3 100644 --- a/YACReaderLibrary/qml/YACReaderScrollViewStyle.qml +++ b/YACReaderLibrary/qml/YACReaderScrollViewStyle.qml @@ -1,403 +1,403 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.2 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Private 1.0 - -/*! - \qmltype ScrollViewStyle - \inqmlmodule QtQuick.Controls.Styles - \since 5.1 - \ingroup viewsstyling - \ingroup controlsstyling - \brief Provides custom styling for ScrollView -*/ -Style { - id: root - - /*! The \l ScrollView this style is attached to. */ - readonly property ScrollView control: __control - - /*! This property controls the frame border padding of the scrollView. */ - padding {left: 1; top: 1; right: 1; bottom: 1} - - /*! This Component paints the corner area between scroll bars */ - property Component corner: Rectangle { color: "#ccc" } - - /*! This component determines if the flickable should reposition itself at the - mouse location when clicked. */ - property bool scrollToClickedPosition: true - - /*! This property holds whether the scroll bars are transient. Transient scroll bars - appear when the content is scrolled and disappear when they are no longer needed. - - The default value is platform dependent. */ - property bool transientScrollBars: Settings.isMobile && Settings.hasTouchScreen - - /*! This Component paints the frame around scroll bars. */ - property Component frame: Rectangle { - color: control["backgroundVisible"] ? "white": "transparent" - border.color: "#999" - border.width: 1 - radius: 1 - visible: control.frameVisible - } - - /*! This is the minimum extent of the scroll bar handle. - - The default value is \c 30. - */ - - property int minimumHandleLength: 30 - - /*! This property controls the edge overlap - between the handle and the increment/decrement buttons. - - The default value is \c 30. - */ - - property int handleOverlap: 1 - - /*! This component controls the appearance of the - scroll bar background. - - You can access the following state properties: - - \table - \row \li property bool \b styleData.hovered - \row \li property bool \b styleData.horizontal - \endtable - */ - - property Component scrollBarBackground: Item { - property bool sticky: false - property bool hovered: styleData.hovered - implicitWidth: Math.round(TextSingleton.implicitHeight) - implicitHeight: Math.round(TextSingleton.implicitHeight) - clip: true - opacity: transientScrollBars ? 0.5 : 1.0 - visible: !Settings.hasTouchScreen && (!transientScrollBars || sticky) - Rectangle { - anchors.fill: parent - color: "#ddd" - border.color: "#aaa" - anchors.rightMargin: styleData.horizontal ? -2 : -1 - anchors.leftMargin: styleData.horizontal ? -2 : 0 - anchors.topMargin: styleData.horizontal ? 0 : -2 - anchors.bottomMargin: styleData.horizontal ? -1 : -2 - } - onHoveredChanged: if (hovered) sticky = true - onVisibleChanged: if (!visible) sticky = false - } - - /*! This component controls the appearance of the - scroll bar handle. - - You can access the following state properties: - - \table - \row \li property bool \b styleData.hovered - \row \li property bool \b styleData.pressed - \row \li property bool \b styleData.horizontal - \endtable - */ - - property Component handle: Item { - property bool sticky: false - property bool hovered: __activeControl !== "none" - implicitWidth: Math.round(TextSingleton.implicitHeight) + 1 - implicitHeight: Math.round(TextSingleton.implicitHeight) + 1 - BorderImage { - id: img - opacity: styleData.pressed && !transientScrollBars ? 0.5 : styleData.hovered ? 1 : 0.8 - source: "images/scrollbar-handle-" + (transientScrollBars ? "transient" : styleData.horizontal ? "horizontal" : "vertical") + ".png" - border.left: transientScrollBars ? 5 : 2 - border.top: transientScrollBars ? 5 : 2 - border.right: transientScrollBars ? 5 : 2 - border.bottom: transientScrollBars ? 5 : 2 - anchors.top: !styleData.horizontal ? parent.top : undefined - anchors.margins: transientScrollBars ? 2 : 0 - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.left: styleData.horizontal ? parent.left : undefined - width: !styleData.horizontal && transientScrollBars ? sticky ? 13 : 10 : parent.width - height: styleData.horizontal && transientScrollBars ? sticky ? 13 : 10 : parent.height - Behavior on width { enabled: !styleData.horizontal && transientScrollBars; NumberAnimation { duration: 100 } } - Behavior on height { enabled: styleData.horizontal && transientScrollBars; NumberAnimation { duration: 100 } } - } - onHoveredChanged: if (hovered) sticky = true - onVisibleChanged: if (!visible) sticky = false - } - - /*! This component controls the appearance of the - scroll bar increment button. - - You can access the following state properties: - - \table - \row \li property bool \b styleData.hovered - \row \li property bool \b styleData.pressed - \row \li property bool \b styleData.horizontal - \endtable - */ - property Component incrementControl: Rectangle { - visible: !transientScrollBars - implicitWidth: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) - implicitHeight: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) - Rectangle { - anchors.fill: parent - anchors.bottomMargin: -1 - anchors.rightMargin: -1 - border.color: "#aaa" - Rectangle { - anchors.fill: parent - anchors.margins: 1 - color: "transparent" - border.color: "#44ffffff" - } - Image { - source: styleData.horizontal ? "images/arrow-right.png" : "images/arrow-down.png" - anchors.centerIn: parent - opacity: control.enabled ? 0.6 : 0.5 - } - gradient: Gradient { - GradientStop {color: styleData.pressed ? "lightgray" : "white" ; position: 0} - GradientStop {color: styleData.pressed ? "lightgray" : "lightgray" ; position: 1} - } - } - } - - /*! This component controls the appearance of the - scroll bar decrement button. - - You can access the following state properties: - - \table - \row \li property bool \b styleData.hovered - \row \li property bool \b styleData.pressed - \row \li property bool \b styleData.horizontal - \endtable - */ - property Component decrementControl: Rectangle { - visible: !transientScrollBars - implicitWidth: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) - implicitHeight: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) - Rectangle { - anchors.fill: parent - anchors.topMargin: styleData.horizontal ? 0 : -1 - anchors.leftMargin: styleData.horizontal ? -1 : 0 - anchors.bottomMargin: styleData.horizontal ? -1 : 0 - anchors.rightMargin: styleData.horizontal ? 0 : -1 - color: "lightgray" - Rectangle { - anchors.fill: parent - anchors.margins: 1 - color: "transparent" - border.color: "#44ffffff" - } - Image { - source: styleData.horizontal ? "images/arrow-left.png" : "images/arrow-up.png" - anchors.centerIn: parent - anchors.verticalCenterOffset: styleData.horizontal ? 0 : -1 - anchors.horizontalCenterOffset: styleData.horizontal ? -1 : 0 - opacity: control.enabled ? 0.6 : 0.5 - } - gradient: Gradient { - GradientStop {color: styleData.pressed ? "lightgray" : "white" ; position: 0} - GradientStop {color: styleData.pressed ? "lightgray" : "lightgray" ; position: 1} - } - border.color: "#aaa" - } - } - - /*! \internal */ - property Component __scrollbar: Item { - id: panel - property string activeControl: "none" - property bool scrollToClickPosition: true - property bool isTransient: transientScrollBars - - property bool on: false - property bool raised: false - property bool sunken: __styleData.upPressed | __styleData.downPressed | __styleData.handlePressed - - states: State { - name: "out" - when: isTransient - && (!__stickyScrollbars || !flickableItem.moving) - && panel.activeControl === "none" - && !panel.on - && !panel.raised - PropertyChanges { target: panel; opacity: 0 } - } - - transitions: Transition { - to: "out" - SequentialAnimation { - PauseAnimation { duration: root.__scrollBarFadeDelay } - NumberAnimation { properties: "opacity"; duration: root.__scrollBarFadeDuration } - PropertyAction { target: panel; property: "visible"; value: false } - } - } - - implicitWidth: __styleData.horizontal ? 200 : bg.implicitWidth - implicitHeight: __styleData.horizontal ? bg.implicitHeight : 200 - - function pixelMetric(arg) { - if (arg === "scrollbarExtent") - return (__styleData.horizontal ? bg.height : bg.width); - return 0; - } - - function styleHint(arg) { - return false; - } - - function hitTest(argX, argY) { - if (itemIsHit(handleControl, argX, argY)) - return "handle" - else if (itemIsHit(incrementLoader, argX, argY)) - return "up"; - else if (itemIsHit(decrementLoader, argX, argY)) - return "down"; - else if (itemIsHit(bg, argX, argY)) { - if (__styleData.horizontal && argX < handleControl.x || !__styleData.horizontal && argY < handleControl.y) - return "upPage" - else - return "downPage" - } - - return "none"; - } - - function subControlRect(arg) { - if (arg === "handle") { - return Qt.rect(handleControl.x, handleControl.y, handleControl.width, handleControl.height); - } else if (arg === "groove") { - if (__styleData.horizontal) { - return Qt.rect(incrementLoader.width - handleOverlap, - 0, - __control.width - (incrementLoader.width + decrementLoader.width - handleOverlap * 2), - __control.height); - } else { - return Qt.rect(0, - incrementLoader.height - handleOverlap, - __control.width, - __control.height - (incrementLoader.height + decrementLoader.height - handleOverlap * 2)); - } - } - return Qt.rect(0,0,0,0); - } - - function itemIsHit(argItem, argX, argY) { - var pos = argItem.mapFromItem(__control, argX, argY); - return (pos.x >= 0 && pos.x <= argItem.width && pos.y >= 0 && pos.y <= argItem.height); - } - - Loader { - id: incrementLoader - anchors.top: parent.top - anchors.left: parent.left - sourceComponent: decrementControl - property QtObject styleData: QtObject { - readonly property bool hovered: activeControl === "up" - readonly property bool pressed: __styleData.upPressed - readonly property bool horizontal: __styleData.horizontal - } - } - - Loader { - id: bg - anchors.top: __styleData.horizontal ? undefined : incrementLoader.bottom - anchors.bottom: __styleData.horizontal ? undefined : decrementLoader.top - anchors.left: __styleData.horizontal ? incrementLoader.right : undefined - anchors.right: __styleData.horizontal ? decrementLoader.left : undefined - sourceComponent: scrollBarBackground - property QtObject styleData: QtObject { - readonly property bool horizontal: __styleData.horizontal - readonly property bool hovered: activeControl !== "none" - } - } - - Loader { - id: decrementLoader - anchors.bottom: __styleData.horizontal ? undefined : parent.bottom - anchors.right: __styleData.horizontal ? parent.right : undefined - sourceComponent: incrementControl - property QtObject styleData: QtObject { - readonly property bool hovered: activeControl === "down" - readonly property bool pressed: __styleData.downPressed - readonly property bool horizontal: __styleData.horizontal - } - } - - property var flickableItem: control.flickableItem - property int extent: Math.max(minimumHandleLength, __styleData.horizontal ? - (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0 ) * bg.width : - (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0) * bg.height) - readonly property real range: __control.maximumValue - __control.minimumValue - readonly property real begin: __control.value - __control.minimumValue - - Loader { - id: handleControl - height: __styleData.horizontal ? implicitHeight : extent - width: __styleData.horizontal ? extent : implicitWidth - anchors.top: bg.top - anchors.left: bg.left - anchors.topMargin: __styleData.horizontal || range === 0 ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) - anchors.leftMargin: __styleData.horizontal && range !== 0 ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 - sourceComponent: handle - property QtObject styleData: QtObject { - readonly property bool hovered: activeControl === "handle" - readonly property bool pressed: __styleData.handlePressed - readonly property bool horizontal: __styleData.horizontal - } - readonly property alias __activeControl: panel.activeControl - } - } - - /*! \internal */ - property bool __externalScrollBars: false - /*! \internal */ - property int __scrollBarSpacing: 4 - /*! \internal */ - property int __scrollBarFadeDelay: 450 - /*! \internal */ - property int __scrollBarFadeDuration: 200 - /*! \internal */ - property bool __stickyScrollbars: false -} +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Controls.Private 1.0 + +/*! + \qmltype ScrollViewStyle + \inqmlmodule QtQuick.Controls.Styles + \since 5.1 + \ingroup viewsstyling + \ingroup controlsstyling + \brief Provides custom styling for ScrollView +*/ +Style { + id: root + + /*! The \l ScrollView this style is attached to. */ + readonly property ScrollView control: __control + + /*! This property controls the frame border padding of the scrollView. */ + padding {left: 1; top: 1; right: 1; bottom: 1} + + /*! This Component paints the corner area between scroll bars */ + property Component corner: Rectangle { color: "#ccc" } + + /*! This component determines if the flickable should reposition itself at the + mouse location when clicked. */ + property bool scrollToClickedPosition: true + + /*! This property holds whether the scroll bars are transient. Transient scroll bars + appear when the content is scrolled and disappear when they are no longer needed. + + The default value is platform dependent. */ + property bool transientScrollBars: Settings.isMobile && Settings.hasTouchScreen + + /*! This Component paints the frame around scroll bars. */ + property Component frame: Rectangle { + color: control["backgroundVisible"] ? "white": "transparent" + border.color: "#999" + border.width: 1 + radius: 1 + visible: control.frameVisible + } + + /*! This is the minimum extent of the scroll bar handle. + + The default value is \c 30. + */ + + property int minimumHandleLength: 30 + + /*! This property controls the edge overlap + between the handle and the increment/decrement buttons. + + The default value is \c 30. + */ + + property int handleOverlap: 1 + + /*! This component controls the appearance of the + scroll bar background. + + You can access the following state properties: + + \table + \row \li property bool \b styleData.hovered + \row \li property bool \b styleData.horizontal + \endtable + */ + + property Component scrollBarBackground: Item { + property bool sticky: false + property bool hovered: styleData.hovered + implicitWidth: Math.round(TextSingleton.implicitHeight) + implicitHeight: Math.round(TextSingleton.implicitHeight) + clip: true + opacity: transientScrollBars ? 0.5 : 1.0 + visible: !Settings.hasTouchScreen && (!transientScrollBars || sticky) + Rectangle { + anchors.fill: parent + color: "#ddd" + border.color: "#aaa" + anchors.rightMargin: styleData.horizontal ? -2 : -1 + anchors.leftMargin: styleData.horizontal ? -2 : 0 + anchors.topMargin: styleData.horizontal ? 0 : -2 + anchors.bottomMargin: styleData.horizontal ? -1 : -2 + } + onHoveredChanged: if (hovered) sticky = true + onVisibleChanged: if (!visible) sticky = false + } + + /*! This component controls the appearance of the + scroll bar handle. + + You can access the following state properties: + + \table + \row \li property bool \b styleData.hovered + \row \li property bool \b styleData.pressed + \row \li property bool \b styleData.horizontal + \endtable + */ + + property Component handle: Item { + property bool sticky: false + property bool hovered: __activeControl !== "none" + implicitWidth: Math.round(TextSingleton.implicitHeight) + 1 + implicitHeight: Math.round(TextSingleton.implicitHeight) + 1 + BorderImage { + id: img + opacity: styleData.pressed && !transientScrollBars ? 0.5 : styleData.hovered ? 1 : 0.8 + source: "images/scrollbar-handle-" + (transientScrollBars ? "transient" : styleData.horizontal ? "horizontal" : "vertical") + ".png" + border.left: transientScrollBars ? 5 : 2 + border.top: transientScrollBars ? 5 : 2 + border.right: transientScrollBars ? 5 : 2 + border.bottom: transientScrollBars ? 5 : 2 + anchors.top: !styleData.horizontal ? parent.top : undefined + anchors.margins: transientScrollBars ? 2 : 0 + anchors.bottom: parent.bottom + anchors.right: parent.right + anchors.left: styleData.horizontal ? parent.left : undefined + width: !styleData.horizontal && transientScrollBars ? sticky ? 13 : 10 : parent.width + height: styleData.horizontal && transientScrollBars ? sticky ? 13 : 10 : parent.height + Behavior on width { enabled: !styleData.horizontal && transientScrollBars; NumberAnimation { duration: 100 } } + Behavior on height { enabled: styleData.horizontal && transientScrollBars; NumberAnimation { duration: 100 } } + } + onHoveredChanged: if (hovered) sticky = true + onVisibleChanged: if (!visible) sticky = false + } + + /*! This component controls the appearance of the + scroll bar increment button. + + You can access the following state properties: + + \table + \row \li property bool \b styleData.hovered + \row \li property bool \b styleData.pressed + \row \li property bool \b styleData.horizontal + \endtable + */ + property Component incrementControl: Rectangle { + visible: !transientScrollBars + implicitWidth: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) + implicitHeight: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) + Rectangle { + anchors.fill: parent + anchors.bottomMargin: -1 + anchors.rightMargin: -1 + border.color: "#aaa" + Rectangle { + anchors.fill: parent + anchors.margins: 1 + color: "transparent" + border.color: "#44ffffff" + } + Image { + source: styleData.horizontal ? "images/arrow-right.png" : "images/arrow-down.png" + anchors.centerIn: parent + opacity: control.enabled ? 0.6 : 0.5 + } + gradient: Gradient { + GradientStop {color: styleData.pressed ? "lightgray" : "white" ; position: 0} + GradientStop {color: styleData.pressed ? "lightgray" : "lightgray" ; position: 1} + } + } + } + + /*! This component controls the appearance of the + scroll bar decrement button. + + You can access the following state properties: + + \table + \row \li property bool \b styleData.hovered + \row \li property bool \b styleData.pressed + \row \li property bool \b styleData.horizontal + \endtable + */ + property Component decrementControl: Rectangle { + visible: !transientScrollBars + implicitWidth: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) + implicitHeight: transientScrollBars ? 0 : Math.round(TextSingleton.implicitHeight) + Rectangle { + anchors.fill: parent + anchors.topMargin: styleData.horizontal ? 0 : -1 + anchors.leftMargin: styleData.horizontal ? -1 : 0 + anchors.bottomMargin: styleData.horizontal ? -1 : 0 + anchors.rightMargin: styleData.horizontal ? 0 : -1 + color: "lightgray" + Rectangle { + anchors.fill: parent + anchors.margins: 1 + color: "transparent" + border.color: "#44ffffff" + } + Image { + source: styleData.horizontal ? "images/arrow-left.png" : "images/arrow-up.png" + anchors.centerIn: parent + anchors.verticalCenterOffset: styleData.horizontal ? 0 : -1 + anchors.horizontalCenterOffset: styleData.horizontal ? -1 : 0 + opacity: control.enabled ? 0.6 : 0.5 + } + gradient: Gradient { + GradientStop {color: styleData.pressed ? "lightgray" : "white" ; position: 0} + GradientStop {color: styleData.pressed ? "lightgray" : "lightgray" ; position: 1} + } + border.color: "#aaa" + } + } + + /*! \internal */ + property Component __scrollbar: Item { + id: panel + property string activeControl: "none" + property bool scrollToClickPosition: true + property bool isTransient: transientScrollBars + + property bool on: false + property bool raised: false + property bool sunken: __styleData.upPressed | __styleData.downPressed | __styleData.handlePressed + + states: State { + name: "out" + when: isTransient + && (!__stickyScrollbars || !flickableItem.moving) + && panel.activeControl === "none" + && !panel.on + && !panel.raised + PropertyChanges { target: panel; opacity: 0 } + } + + transitions: Transition { + to: "out" + SequentialAnimation { + PauseAnimation { duration: root.__scrollBarFadeDelay } + NumberAnimation { properties: "opacity"; duration: root.__scrollBarFadeDuration } + PropertyAction { target: panel; property: "visible"; value: false } + } + } + + implicitWidth: __styleData.horizontal ? 200 : bg.implicitWidth + implicitHeight: __styleData.horizontal ? bg.implicitHeight : 200 + + function pixelMetric(arg) { + if (arg === "scrollbarExtent") + return (__styleData.horizontal ? bg.height : bg.width); + return 0; + } + + function styleHint(arg) { + return false; + } + + function hitTest(argX, argY) { + if (itemIsHit(handleControl, argX, argY)) + return "handle" + else if (itemIsHit(incrementLoader, argX, argY)) + return "up"; + else if (itemIsHit(decrementLoader, argX, argY)) + return "down"; + else if (itemIsHit(bg, argX, argY)) { + if (__styleData.horizontal && argX < handleControl.x || !__styleData.horizontal && argY < handleControl.y) + return "upPage" + else + return "downPage" + } + + return "none"; + } + + function subControlRect(arg) { + if (arg === "handle") { + return Qt.rect(handleControl.x, handleControl.y, handleControl.width, handleControl.height); + } else if (arg === "groove") { + if (__styleData.horizontal) { + return Qt.rect(incrementLoader.width - handleOverlap, + 0, + __control.width - (incrementLoader.width + decrementLoader.width - handleOverlap * 2), + __control.height); + } else { + return Qt.rect(0, + incrementLoader.height - handleOverlap, + __control.width, + __control.height - (incrementLoader.height + decrementLoader.height - handleOverlap * 2)); + } + } + return Qt.rect(0,0,0,0); + } + + function itemIsHit(argItem, argX, argY) { + var pos = argItem.mapFromItem(__control, argX, argY); + return (pos.x >= 0 && pos.x <= argItem.width && pos.y >= 0 && pos.y <= argItem.height); + } + + Loader { + id: incrementLoader + anchors.top: parent.top + anchors.left: parent.left + sourceComponent: decrementControl + property QtObject styleData: QtObject { + readonly property bool hovered: activeControl === "up" + readonly property bool pressed: __styleData.upPressed + readonly property bool horizontal: __styleData.horizontal + } + } + + Loader { + id: bg + anchors.top: __styleData.horizontal ? undefined : incrementLoader.bottom + anchors.bottom: __styleData.horizontal ? undefined : decrementLoader.top + anchors.left: __styleData.horizontal ? incrementLoader.right : undefined + anchors.right: __styleData.horizontal ? decrementLoader.left : undefined + sourceComponent: scrollBarBackground + property QtObject styleData: QtObject { + readonly property bool horizontal: __styleData.horizontal + readonly property bool hovered: activeControl !== "none" + } + } + + Loader { + id: decrementLoader + anchors.bottom: __styleData.horizontal ? undefined : parent.bottom + anchors.right: __styleData.horizontal ? parent.right : undefined + sourceComponent: incrementControl + property QtObject styleData: QtObject { + readonly property bool hovered: activeControl === "down" + readonly property bool pressed: __styleData.downPressed + readonly property bool horizontal: __styleData.horizontal + } + } + + property var flickableItem: control.flickableItem + property int extent: Math.max(minimumHandleLength, __styleData.horizontal ? + (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0 ) * bg.width : + (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0) * bg.height) + readonly property real range: __control.maximumValue - __control.minimumValue + readonly property real begin: __control.value - __control.minimumValue + + Loader { + id: handleControl + height: __styleData.horizontal ? implicitHeight : extent + width: __styleData.horizontal ? extent : implicitWidth + anchors.top: bg.top + anchors.left: bg.left + anchors.topMargin: __styleData.horizontal || range === 0 ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) + anchors.leftMargin: __styleData.horizontal && range !== 0 ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 + sourceComponent: handle + property QtObject styleData: QtObject { + readonly property bool hovered: activeControl === "handle" + readonly property bool pressed: __styleData.handlePressed + readonly property bool horizontal: __styleData.horizontal + } + readonly property alias __activeControl: panel.activeControl + } + } + + /*! \internal */ + property bool __externalScrollBars: false + /*! \internal */ + property int __scrollBarSpacing: 4 + /*! \internal */ + property int __scrollBarFadeDelay: 450 + /*! \internal */ + property int __scrollBarFadeDuration: 200 + /*! \internal */ + property bool __stickyScrollbars: false +}