diff --git a/src/qml/AlbumView.qml b/src/qml/AlbumView.qml index 73b7779..690da2d 100644 --- a/src/qml/AlbumView.qml +++ b/src/qml/AlbumView.qml @@ -1,234 +1,233 @@ /* * Copyright (C) 2017 Atul Sharma * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.7 import QtQuick.Controls 2.1 as Controls import org.kde.kirigami 2.1 as Kirigami import org.kde.koko 0.1 as Koko Kirigami.ScrollablePage { id: page property alias model: gridView.model signal collectionSelected(QtObject selectedModel, string cover) - signal imageSelected(int currentIndex) signal folderSelected(QtObject selectedModel, string cover) keyboardNavigationEnabled: true focus: true states: [ State { name: "browsing" when: !model.hasSelectedImages }, State { name: "selecting" when: model.hasSelectedImages && Kirigami.Settings.tabletMode } ] actions { main: Kirigami.Action { iconName: "edit-select-none" text: i18n("Deselect All") tooltip: i18n("De-selects all the selected images") enabled: model.hasSelectedImages visible: model.hasSelectedImages && Kirigami.Settings.tabletMode onTriggered: model.clearSelections() } contextualActions: [ Kirigami.Action { iconName: "edit-select-all" text: i18n("Select All") tooltip: i18n("Selects all the images in the current view") enabled: model.containImages onTriggered: model.selectAll() }, Kirigami.Action { iconName: "edit-select-none" text: i18n("Deselect All") tooltip: i18n("De-selects all the selected images") enabled: model.hasSelectedImages onTriggered: model.clearSelections() }, Kirigami.Action { iconName: "emblem-shared-symbolic" text: i18n("Share") tooltip: i18n("Share the selected images") enabled: model.hasSelectedImages onTriggered: { shareMenu.open(); shareMenu.inputData = { "urls": model.selectedImages(), "mimeType": "image/" } } }, Kirigami.Action { iconName: "group-delete" text: i18n("Delete Selection") tooltip: i18n("Move selected items to trash") enabled: model.hasSelectedImages onTriggered: model.deleteSelection() } ] } background: Rectangle { color: Kirigami.Theme.viewBackgroundColor } Keys.onPressed: { switch (event.key) { case Qt.Key_Escape: gridView.model.clearSelections() break; default: break; } } ShareDialog { id: shareMenu inputData: { "urls": [], "mimeType": ["image/"] } onFinished: { if (error==0 && output.url !== "") { console.assert(output.url !== undefined); var resultUrl = output.url; console.log("Received", resultUrl) notificationManager.showNotification( true, resultUrl); clipboard.content = resultUrl; } else { notificationManager.showNotification( false); } } } GridView { id: gridView //FIXME: right now if those two objects are out of this, the whole page breaks Koko.SortModel { id: sortedListModel } Koko.ImageFolderModel { id: imageFolderModel } keyNavigationEnabled: true property real widthToApproximate: (applicationWindow().wideScreen ? applicationWindow().pageStack.defaultColumnWidth : page.width) - (1||Kirigami.Settings.tabletMode ? Kirigami.Units.gridUnit : 0) cellWidth: Math.floor(width/Math.floor(width/(kokoConfig.iconSize + Kirigami.Units.largeSpacing * 2))) cellHeight: kokoConfig.iconSize + Kirigami.Units.largeSpacing * 2 topMargin: Kirigami.Units.gridUnit highlightMoveDuration: 0 highlight: Item { Rectangle { anchors.centerIn: parent width: Math.min(parent.width, parent.height) height: width color: Qt.rgba(Kirigami.Theme.highlightColor.r, Kirigami.Theme.highlightColor.g, Kirigami.Theme.highlightColor.b, 0.3) border.color: Kirigami.Theme.highlightColor radius: 2 } } delegate: AlbumDelegate { id: delegate modelData: model onClicked: { if (page.state == "selecting" || (mouse.modifiers & Qt.ControlModifier ) && (model.itemType == Koko.Types.Image)) { gridView.model.toggleSelected(model.index) } else { activated(); } } onPressAndHold: { gridView.model.toggleSelected(model.index) } onActivated: { gridView.model.clearSelections() gridView.currentIndex = model.index; switch( model.itemType) { case Koko.Types.Album: { imageListModel.query = imageListModel.queryForIndex( model.sourceIndex) sortedListModel.sourceModel = imageListModel collectionSelected( sortedListModel, model.display) break; } case Koko.Types.Folder: { imageFolderModel.url = model.imageurl sortedListModel.sourceModel = imageFolderModel folderSelected( sortedListModel, model.display) break; } case Koko.Types.Image: { - imageSelected( model.sourceIndex) + currentImage.model = page.model.sourceModel + currentImage.index = model.index + applicationWindow().pageStack.layers.push(Qt.resolvedUrl("ImageViewer.qml"), { + startIndex: model.index, + imagesModel: page.model + }) break; } default: { console.log("Unknown") break; } } } SelectionButton { id: selectionButton opacity: ( delegate.containsMouse || page.state == "selecting") && !(model.itemType == Koko.Types.Folder || model.itemType == Koko.Types.Album) anchors.top: delegate.top anchors.left: delegate.left Behavior on opacity { OpacityAnimator { duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } } } } Controls.Label { anchors.centerIn: parent text: i18n("No Images Found") visible: gridView.count == 0 font.pixelSize: Kirigami.Units.gridUnit * 1 } } onCollectionSelected: pageStack.push( Qt.resolvedUrl("AlbumView.qml"), { "model": selectedModel, "title": i18n(cover)}) onFolderSelected: pageStack.push( Qt.resolvedUrl("AlbumView.qml"), { "model": selectedModel, "title": i18n(cover)}) - onImageSelected: { - currentImage.model = model.sourceModel - currentImage.index = currentIndex - applicationWindow().pageStack.layers.push(imageViewerComponent); - } } diff --git a/src/qml/ImageViewer.qml b/src/qml/ImageViewer.qml index a59b6af..103ec6d 100644 --- a/src/qml/ImageViewer.qml +++ b/src/qml/ImageViewer.qml @@ -1,491 +1,480 @@ /* * Copyright (C) 2017 Marco Martin * Copyright (C) 2017 Atul Sharma * Copyright (C) 2015 Vishesh Handa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.12 import QtQuick.Window 2.2 import QtQuick.Controls 2.10 as Controls import QtGraphicalEffects 1.0 as Effects import QtQuick.Layouts 1.3 import org.kde.kirigami 2.13 as Kirigami import org.kde.koko 0.1 as Koko import org.kde.kquickcontrolsaddons 2.0 as KQA Kirigami.Page { id: root title: listView.currentItem.display - property alias sourceModel: imagesListModel.sourceModel - property int indexValue - property int imageWidth - property int imageHeight + property int startIndex: 0 + property var imagesModel leftPadding: 0 rightPadding: 0 topPadding: 0 Kirigami.Theme.inherit: false Kirigami.Theme.textColor: imgColors.foreground Kirigami.Theme.backgroundColor: imgColors.background Kirigami.Theme.highlightColor: imgColors.highlight Kirigami.Theme.highlightedTextColor: Kirigami.ColorUtils.brightnessForColor(imgColors.highlight) === Kirigami.ColorUtils.Dark ? imgColors.closestToWhite : imgColors.closestToBlack Kirigami.ImageColors { id: imgColors source: listView.currentItem } KQA.MimeDatabase { id: mimeDB } Kirigami.ContextDrawer { id: contextDrawer title: i18n("Edit image") handleVisible: true } actions { main: Kirigami.Action { id: shareAction iconName: "document-share" tooltip: i18n("Share Image") text: i18nc("verb, share an image", "Share") onTriggered: { shareDialog.open(); shareDialog.inputData = { "urls": [ listView.currentItem.currentImageSource.toString() ], "mimeType": mimeDB.mimeTypeForUrl( listView.currentItem.currentImageSource).name } } } right: Kirigami.Action { id: editingAction iconName: "edit-entry" text: i18nc("verb, edit an image", "Edit") onTriggered: { applicationWindow().pageStack.layers.push(editorComponent) } } } Component.onCompleted: { applicationWindow().controlsVisible = false; listView.forceActiveFocus(); applicationWindow().header.visible = false; applicationWindow().footer.visible = false; applicationWindow().globalDrawer.visible = false; applicationWindow().globalDrawer.enabled = false; } function close() { applicationWindow().controlsVisible = true; if (applicationWindow().footer) { applicationWindow().footer.visible = true; } applicationWindow().globalDrawer.enabled = true; applicationWindow().visibility = Window.Windowed; applicationWindow().pageStack.layers.pop(); } background: Rectangle { color: "black" } Keys.onPressed: { switch(event.key) { case Qt.Key_Escape: root.close(); break; case Qt.Key_F: applicationWindow().visibility = applicationWindow().visibility == Window.FullScreen ? Window.Windowed : Window.FullScreen break; default: break; } } ShareDialog { id: shareDialog inputData: { "urls": [], "mimeType": ["image/"] } onFinished: { if (error==0 && output.url !== "") { console.assert(output.url !== undefined); var resultUrl = output.url; console.log("Received", resultUrl) notificationManager.showNotification( true, resultUrl); clipboard.content = resultUrl; } else { notificationManager.showNotification( false); } } } ListView { id: thumbnailView z: 100 anchors { left: parent.left right: parent.right bottom: parent.bottom } state: applicationWindow().controlsVisible ? "show" : "hidden" states: [ State { name: "show" PropertyChanges { target: thumbnailView; opacity: 1.0 } PropertyChanges { target: thumbnailView; anchors.bottomMargin: 0 } }, State { name: "hidden" PropertyChanges { target: thumbnailView; opacity: 0.0 } PropertyChanges { target: thumbnailView; anchors.bottomMargin: -thumbnailView.height } } ] transitions: [ Transition { from: "*" to: "hidden" SequentialAnimation { PropertyAnimation { properties: "opacity,anchors.bottomMargin"; easing.type: Easing.InCubic duration: Kirigami.Units.longDuration } PropertyAction { target: thumbnailView property: "visible" value: false } } }, Transition { from: "*" to: "show" SequentialAnimation { PropertyAction { target: thumbnailView property: "visible" value: true } PropertyAnimation { properties: "opacity,anchors.bottomMargin"; easing.type: Easing.OutCubic duration: Kirigami.Units.longDuration * 0.75 } } } ] height: kokoConfig.iconSize orientation: Qt.Horizontal snapMode: ListView.SnapOneItem currentIndex: listView.currentIndex highlightRangeMode: ListView.ApplyRange highlightFollowsCurrentItem: true preferredHighlightBegin: height preferredHighlightEnd: width - height highlightMoveVelocity: -1 highlightMoveDuration: Kirigami.Units.longDuration + // Filter out directories model: Koko.SortModel { - sourceModel: root.sourceModel + sourceModel: imagesModel filterRole: Koko.Roles.MimeTypeRole filterRegExp: /image\// } + delegate: AlbumDelegate { width: kokoConfig.iconSize + Kirigami.Units.largeSpacing height: width onClicked: activated() onActivated: listView.currentIndex = index modelData: model Rectangle { z: -1 anchors.centerIn: parent width: Math.min(parent.width, parent.height) height: width color: Qt.rgba(Kirigami.Theme.highlightColor.r, Kirigami.Theme.highlightColor.g, Kirigami.Theme.highlightColor.b, 0.3) border.color: Kirigami.Theme.highlightColor radius: 2 opacity: thumbnailView.currentIndex === index ? 1 : 0 Behavior on opacity { OpacityAnimator { duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } } } } } ListView { id: listView anchors.fill: parent orientation: Qt.Horizontal snapMode: ListView.SnapOneItem - onMovementEnded: currentImage.index = model.sourceIndex(indexAt(contentX+1, 1)) + highlightMoveDuration: 0 interactive: true + // Filter out directories model: Koko.SortModel { - id: imagesListModel + sourceModel: imagesModel filterRole: Koko.Roles.MimeTypeRole filterRegExp: /image\// } - Binding { - target: listView - property: "currentIndex" - value: listView.model.proxyIndex( indexValue) - } - - onCurrentIndexChanged: { - currentImage.index = model.sourceIndex( currentIndex) - listView.positionViewAtIndex(currentIndex, ListView.Beginning) - - shareDialog.close(); - } + currentIndex: model.proxyIndex(root.startIndex) delegate: Flickable { id: flick readonly property string currentImageSource: model.imageurl readonly property string display: model.display property alias image: image - width: imageWidth - height: imageHeight - contentWidth: imageWidth - contentHeight: imageHeight + width: root.width + height: root.height + contentWidth: root.width + contentHeight: root.height boundsBehavior: Flickable.StopAtBounds boundsMovement: Flickable.StopAtBounds interactive: contentWidth > width || contentHeight > height //onInteractiveChanged: listView.interactive = !interactive; clip: true z: index == listView.currentIndex ? 1000 : 0 Controls.ScrollBar.vertical: Controls.ScrollBar { visible: !applicationWindow().controlsVisible } Controls.ScrollBar.horizontal: Controls.ScrollBar { visible: !applicationWindow().controlsVisible } PinchArea { width: Math.max(flick.contentWidth, flick.width) height: Math.max(flick.contentHeight, flick.height) property real initialWidth property real initialHeight onPinchStarted: { initialWidth = flick.contentWidth initialHeight = flick.contentHeight } onPinchUpdated: { // adjust content pos due to drag flick.contentX += pinch.previousCenter.x - pinch.center.x flick.contentY += pinch.previousCenter.y - pinch.center.y // resize content - flick.resizeContent(Math.max(imageWidth*0.7, initialWidth * pinch.scale), Math.max(imageHeight*0.7, initialHeight * pinch.scale), pinch.center) + flick.resizeContent(Math.max(root.width*0.7, initialWidth * pinch.scale), Math.max(root.height*0.7, initialHeight * pinch.scale), pinch.center) } onPinchFinished: { // Move its content within bounds. - if (flick.contentWidth < root.imageWidth || - flick.contentHeight < root.imageHeight) { + if (flick.contentWidth < root.width || + flick.contentHeight < root.height) { zoomAnim.x = 0; zoomAnim.y = 0; - zoomAnim.width = root.imageWidth; - zoomAnim.height = root.imageHeight; + zoomAnim.width = root.width; + zoomAnim.height = root.height; zoomAnim.running = true; } else { flick.returnToBounds(); } } ParallelAnimation { id: zoomAnim property real x: 0 property real y: 0 - property real width: root.imageWidth - property real height: root.imageHeight + property real width: root.width + property real height: root.height NumberAnimation { target: flick property: "contentWidth" from: flick.contentWidth to: zoomAnim.width duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } NumberAnimation { target: flick property: "contentHeight" from: flick.contentHeight to: zoomAnim.height duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } NumberAnimation { target: flick property: "contentY" from: flick.contentY to: zoomAnim.y duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } NumberAnimation { target: flick property: "contentX" from: flick.contentX to: zoomAnim.x duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } } Image { id: image width: flick.contentWidth height: flick.contentHeight fillMode: Image.PreserveAspectFit source: currentImageSource autoTransform: true asynchronous: true onStatusChanged: { if (status === Image.Ready && listView.currentIndex === index) { imgColors.update(); } } Timer { id: doubleClickTimer interval: 150 onTriggered: applicationWindow().controlsVisible = !applicationWindow().controlsVisible } MouseArea { anchors.fill: parent onClicked: { contextDrawer.drawerOpen = false doubleClickTimer.restart(); } onDoubleClicked: { doubleClickTimer.running = false; applicationWindow().controlsVisible = false; if (flick.interactive) { zoomAnim.x = 0; zoomAnim.y = 0; - zoomAnim.width = root.imageWidth; - zoomAnim.height = root.imageHeight; + zoomAnim.width = root.width; + zoomAnim.height = root.height; zoomAnim.running = true; } else { zoomAnim.x = mouse.x * 2; zoomAnim.y = mouse.y *2; - zoomAnim.width = root.imageWidth * 3; - zoomAnim.height = root.imageHeight * 3; + zoomAnim.width = root.width * 3; + zoomAnim.height = root.height * 3; zoomAnim.running = true; } } onWheel: { if (wheel.modifiers & Qt.ControlModifier) { if (wheel.angleDelta.y != 0) { var factor = 1 + wheel.angleDelta.y / 600; zoomAnim.running = false; - zoomAnim.width = Math.min(Math.max(root.imageWidth, zoomAnim.width * factor), root.imageWidth * 4); - zoomAnim.height = Math.min(Math.max(root.imageHeight, zoomAnim.height * factor), root.imageHeight * 4); + zoomAnim.width = Math.min(Math.max(root.width, zoomAnim.width * factor), root.width * 4); + zoomAnim.height = Math.min(Math.max(root.height, zoomAnim.height * factor), root.height * 4); //actual factors, may be less than factor var xFactor = zoomAnim.width / flick.contentWidth; var yFactor = zoomAnim.height / flick.contentHeight; zoomAnim.x = flick.contentX * xFactor + (((wheel.x - flick.contentX) * xFactor) - (wheel.x - flick.contentX)) zoomAnim.y = flick.contentY * yFactor + (((wheel.y - flick.contentY) * yFactor) - (wheel.y - flick.contentY)) zoomAnim.running = true; } else if (wheel.pixelDelta.y != 0) { - flick.resizeContent(Math.min(Math.max(root.imageWidth, flick.contentWidth + wheel.pixelDelta.y), root.imageWidth * 4), - Math.min(Math.max(root.imageHeight, flick.contentHeight + wheel.pixelDelta.y), root.imageHeight * 4), + flick.resizeContent(Math.min(Math.max(root.width, flick.contentWidth + wheel.pixelDelta.y), root.width * 4), + Math.min(Math.max(root.height, flick.contentHeight + wheel.pixelDelta.y), root.height * 4), wheel); } } else { flick.contentX += wheel.pixelDelta.x; flick.contentY += wheel.pixelDelta.y; } } } } } } } Controls.RoundButton { anchors { left: parent.left leftMargin: Kirigami.Units.largeSpacing verticalCenter: parent.verticalCenter } width: Kirigami.Units.gridUnit * 2 height: width icon.name: "arrow-left" visible: !Kirigami.Settings.isMobile && applicationWindow().controlsVisible Keys.forwardTo: [listView] onClicked: { listView.currentIndex -= 1 } } Controls.RoundButton { anchors { right: parent.right rightMargin: Kirigami.Units.largeSpacing verticalCenter: parent.verticalCenter } width: Kirigami.Units.gridUnit * 2 height: width icon.name: "arrow-right" visible: !Kirigami.Settings.isMobile && applicationWindow().controlsVisible Keys.forwardTo: [listView] onClicked: { listView.currentIndex += 1 } } Component { id: editorComponent EditorView { - width: root.imageWidth - height: root.imageHeight + width: root.width + height: root.height imagePath: listView.currentItem.currentImageSource } } - } diff --git a/src/qml/Main.qml b/src/qml/Main.qml index dfb73ff..6556553 100644 --- a/src/qml/Main.qml +++ b/src/qml/Main.qml @@ -1,196 +1,181 @@ /* * Copyright (C) 2017 Atul Sharma * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.1 import QtQuick.Controls 2.0 as Controls import org.kde.kirigami 2.5 as Kirigami import org.kde.kquickcontrolsaddons 2.0 as KQA import org.kde.koko 0.1 as Koko Kirigami.ApplicationWindow { id: root /* * currentImage now stores the information related to the source model */ QtObject { id: currentImage property int index property var model - property GridView view : pageStack.currentItem.flickable - onIndexChanged: { - view.currentIndex = view.model.proxyIndex(currentImage.index) - } } pageStack.initialPage: AlbumView { id: albumView model: imageFolderModel title: i18n("Folders") } pageStack.layers.onDepthChanged: { sideBar.enabled = pageStack.layers.depth < 2; sideBar.drawerOpen = !Kirigami.Settings.isMobile && pageStack.layers.depth < 2; } globalDrawer: Sidebar { id: sideBar onFilterBy: { pageStack.pop(albumView) albumView.title = i18n(value) previouslySelectedAction.checked = false switch( value){ case "Countries": { albumView.model = imageLocationModelCountry; imageListModel.locationGroup = Koko.Types.Country; break; } case "States": { albumView.model = imageLocationModelState; imageListModel.locationGroup = Koko.Types.State; break; } case "Cities": { albumView.model = imageLocationModelCity; imageListModel.locationGroup = Koko.Types.City; break; } case "Years": { albumView.model = imageTimeModelYear; imageListModel.timeGroup = Koko.Types.Year; break; } case "Months": { albumView.model = imageTimeModelMonth; imageListModel.timeGroup = Koko.Types.Month; break; } case "Weeks": { albumView.model = imageTimeModelWeek; imageListModel.timeGroup = Koko.Types.Week; break; } case "Days": { albumView.model = imageTimeModelDay; imageListModel.timeGroup = Koko.Types.Day; break; } case "Folders": { albumView.model = imageFolderModel; imageListModel.locationGroup = -1; imageListModel.timeGroup = -1; break; } } } } Koko.SortModel { id: imageFolderModel sourceModel: Koko.ImageFolderModel { url: "" } /* * filterRole is an Item property exposed by the QSortFilterProxyModel */ filterRole: Koko.Roles.MimeTypeRole } Koko.SortModel { id: imageTimeModelYear sourceModel: Koko.ImageTimeModel { group: Koko.Types.Year } sortRoleName: "date" } Koko.SortModel { id: imageTimeModelMonth sourceModel: Koko.ImageTimeModel { group: Koko.Types.Month } sortRoleName: "date" } Koko.SortModel { id: imageTimeModelWeek sourceModel: Koko.ImageTimeModel { group: Koko.Types.Week } sortRoleName: "date" } Koko.SortModel { id: imageTimeModelDay sourceModel: Koko.ImageTimeModel { group: Koko.Types.Day } sortRoleName: "date" } Koko.SortModel { id: imageLocationModelCountry sourceModel: Koko.ImageLocationModel { group: Koko.Types.Country } } Koko.SortModel { id: imageLocationModelState sourceModel: Koko.ImageLocationModel { group: Koko.Types.State } } Koko.SortModel { id: imageLocationModelCity sourceModel: Koko.ImageLocationModel { group: Koko.Types.City } } Koko.ImageListModel { id: imageListModel } - Component { - id: imageViewerComponent - ImageViewer { - id: imageViewer - indexValue: currentImage.index - sourceModel: currentImage.model - imageWidth: root.width - imageHeight: root.height - } - } Koko.NotificationManager { id: notificationManager } KQA.Clipboard { id: clipboard } - } diff --git a/src/qml/SelectionButton.qml b/src/qml/SelectionButton.qml index 4e780f2..4f50d66 100644 --- a/src/qml/SelectionButton.qml +++ b/src/qml/SelectionButton.qml @@ -1,67 +1,65 @@ /* * Copyright (C) 2017 Atul Sharma * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ import QtQuick 2.7 import org.kde.kirigami 2.1 as Kirigami import org.kde.koko 0.1 as Koko Kirigami.Icon { id: iconArea property QtObject iconMouseArea: iconMouseArea width: Kirigami.Units.iconSizes.smallMedium height: width z: gridView.z + 2 MouseArea { id: iconMouseArea anchors.fill: parent state: "add" onClicked: { if(iconMouseArea.state == "add") { gridView.model.setSelected(model.index) - currentImage.view.currentIndex = model.index } else { gridView.model.toggleSelected(model.index) - currentImage.view.currentIndex = model.index } } states: [ State { name: "add" when: !model.selected PropertyChanges { target: iconArea source: "emblem-added" } }, State { name: "remove" when: model.selected PropertyChanges { target: iconArea source: "emblem-remove" } } ] } }