diff --git a/src/main.qml b/src/main.qml index eca8d7103152bb69a4fa0845141c3fea6ac91990..fe943ed24c38ef2d9b76ccfcb0e980352ba5b325 100644 --- a/src/main.qml +++ b/src/main.qml @@ -18,11 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ***/ - import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 -import QtQuick.Controls.Material 2.1 import org.kde.kirigami 2.6 as Kirigami import org.kde.mauikit 1.0 as Maui @@ -54,8 +52,6 @@ import TagsList 1.0 import SyncingModel 1.0 import SyncingList 1.0 - -import FMList 1.0 import StoreList 1.0 Maui.ApplicationWindow @@ -110,7 +106,7 @@ Maui.ApplicationWindow /*************************************************/ onSearchButtonClicked: currentView = views.search - rightIcon.iconColor: currentView === views.search ? highlightColor : headBarFGColor +// rightIcon.icon.color: currentView === views.search ? highlightColor : headBarFGColor // rightIcon.showIndicator: currentView === views.search // menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png" @@ -134,27 +130,27 @@ Maui.ApplicationWindow - Maui.MenuItem + MenuItem { text: "Sources" icon.name: "folder-add" onTriggered: { - // dialogLoader.sourceComponent = sourcesDialogComponent; - // dialog.open() + dialogLoader.sourceComponent = sourcesDialogComponent; + dialog.open() - dialogLoader.sourceComponent= fmDialogComponent - dialog.mode= dialog.modes.OPEN - dialog.onlyDirs= true - dialog.show(function(paths) - { - pix.addSources(paths) - }) +// dialogLoader.sourceComponent= fmDialogComponent +// dialog.mode= dialog.modes.OPEN +// dialog.onlyDirs= true +// dialog.show(function(paths) +// { +// pix.addSources(paths) +// }) } }, - Maui.MenuItem + MenuItem { text: "Open..." icon.name: "folder-open" @@ -162,14 +158,12 @@ Maui.ApplicationWindow { dialogLoader.sourceComponent= fmDialogComponent dialog.mode = dialog.modes.OPEN - dialog.filterType= FMList.IMAGE + dialog.filterType= Maui.FMList.IMAGE dialog.onlyDirs= false dialog.show(function(paths) { console.log("OPEN THIS PATHS", paths) - pix.openPics(paths) - }); } } @@ -380,7 +374,7 @@ Maui.ApplicationWindow { onlyDirs: false mode: modes.SAVE - filterType: FMList.IMAGE + filterType: Maui.FMList.IMAGE } } @@ -395,14 +389,14 @@ Maui.ApplicationWindow headBarTitle: qsTr("Sources") headBar.rightContent: [ - Maui.ToolButton + ToolButton { - iconName: "list-add" + icon.name: "list-add" }, - Maui.ToolButton + ToolButton { - iconName: "list-remove" + icon.name: "list-remove" } ] diff --git a/src/view_models/PixGrid.qml b/src/view_models/PixGrid.qml index f30989834740da097a846cc7ab0c3304daf62c3d..0bebb9e9b0f91d7c652eb2ebcf3e1f49d6312afa 100644 --- a/src/view_models/PixGrid.qml +++ b/src/view_models/PixGrid.qml @@ -6,7 +6,6 @@ import org.kde.kirigami 2.6 as Kirigami import org.kde.mauikit 1.0 as Maui import PixModel 1.0 import GalleryList 1.0 -import FMList 1.0 import "../widgets/views/Viewer/Viewer.js" as VIEWER import "../widgets/views/Pix.js" as PIX @@ -107,14 +106,6 @@ Maui.Page onTriggered: pixList.sortBy = GalleryList.DATE } - // Maui.MenuItem - // { - // text: qsTr("Place") - // checkable: true - // checked: pixList.sortBy === FMList.PLACE - // onTriggered: pixList.sortBy = FMList.PLACE - // } - Kirigami.Action { text: qsTr("Format") diff --git a/src/view_models/PixMenu.qml b/src/view_models/PixMenu.qml index c11acf144dc58bc7b58e48464f6e84e55ce10170..9c8c75e8cc63ce2458af5092efa12b11a2da37f0 100644 --- a/src/view_models/PixMenu.qml +++ b/src/view_models/PixMenu.qml @@ -2,10 +2,12 @@ import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import org.kde.mauikit 1.0 as Maui +import org.kde.kirigami 2.6 as Kirigami + import "../db/Query.js" as Q import "../widgets/views/Pix.js" as PIX -Maui.Menu +Menu { id: control @@ -14,7 +16,7 @@ Maui.Menu onOpened: isFav = dba.isFav(list.get(index).url) - Maui.MenuItem + MenuItem { text: qsTr("Select") onTriggered: PIX.selectItem(list.get(index)) @@ -22,13 +24,13 @@ Maui.Menu MenuSeparator{} - Maui.MenuItem + MenuItem { text: qsTr(isFav ? "UnFav it": "Fav it") onTriggered: list.fav(index, !isFav) } - Maui.MenuItem + MenuItem { text: qsTr("Add to...") onTriggered: @@ -38,7 +40,7 @@ Maui.Menu } } - Maui.MenuItem + MenuItem { text: qsTr("Tags...") onTriggered: @@ -48,7 +50,7 @@ Maui.Menu } } - Maui.MenuItem + MenuItem { text: qsTr("Share...") onTriggered: @@ -63,7 +65,7 @@ Maui.Menu } } - Maui.MenuItem + MenuItem { text: qsTr("Save to...") onTriggered: @@ -88,7 +90,7 @@ Maui.Menu } } - Maui.MenuItem + MenuItem { visible: !isAndroid text: qsTr("Show in folder...") @@ -112,10 +114,10 @@ Maui.Menu MenuSeparator{} - Maui.MenuItem + MenuItem { text: qsTr("Remove...") - colorScheme.textColor: dangerColor + Kirigami.Theme.textColor: dangerColor onTriggered: { removeDialog.open() diff --git a/src/widgets/SelectionBar.qml b/src/widgets/SelectionBar.qml index 2fed2f3dc136f90a3d3ef438ae88a9143c7712a5..21672cb74a14581477610de397e2f1c40c1d8154 100644 --- a/src/widgets/SelectionBar.qml +++ b/src/widgets/SelectionBar.qml @@ -2,6 +2,8 @@ import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import org.kde.mauikit 1.0 as Maui +import org.kde.kirigami 2.6 as Kirigami + import "../widgets/views/Pix.js" as PIX import "../widgets/views/Viewer/Viewer.js" as VIEWER @@ -18,17 +20,17 @@ Maui.SelectionBar onExitClicked: clear() colorScheme.backgroundColor: "#212121" - Maui.Menu + Menu { id: _menu - Maui.MenuItem + MenuItem { text: qsTr("Un/Fav them") onTriggered: VIEWER.fav(selectedPaths) } - Maui.MenuItem + MenuItem { text: qsTr("Add to...") onTriggered: @@ -38,7 +40,7 @@ Maui.SelectionBar } } - Maui.MenuItem + MenuItem { text: qsTr("Tags...") onTriggered: @@ -48,7 +50,7 @@ Maui.SelectionBar } } - Maui.MenuItem + MenuItem { text: qsTr("Share...") onTriggered: @@ -63,7 +65,7 @@ Maui.SelectionBar } } - Maui.MenuItem + MenuItem { text: qsTr("Save to...") onTriggered: @@ -79,7 +81,7 @@ Maui.SelectionBar } } - Maui.MenuItem + MenuItem { text: qsTr("Show in folder...") onTriggered: pix.showInFolder(selectedPaths) @@ -87,10 +89,10 @@ Maui.SelectionBar MenuSeparator{} - Maui.MenuItem + MenuItem { text: qsTr("Remove...") - colorScheme.textColor: dangerColor + Kirigami.Theme.textColor: dangerColor onTriggered: { removeDialog.open() diff --git a/src/widgets/views/Viewer/ViewerMenu.qml b/src/widgets/views/Viewer/ViewerMenu.qml index 60e8ba4b7a88dbe578e5d61e1b269719430f2ec6..a2a8bf03119c93317f637850301f45dd858edb64 100644 --- a/src/widgets/views/Viewer/ViewerMenu.qml +++ b/src/widgets/views/Viewer/ViewerMenu.qml @@ -3,13 +3,12 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import org.kde.kirigami 2.2 as Kirigami import org.kde.mauikit 1.0 as Maui -import FMList 1.0 import "../../../view_models" -Maui.Menu +Menu { - Maui.MenuItem + MenuItem { checkable: true checked: tagBarVisible @@ -17,7 +16,7 @@ Maui.Menu onTriggered: toogleTagbar() } - Maui.MenuItem + MenuItem { checkable: true checked: galleryRoll.visible