From 378e850c302859983770a3f18982e02260f46a35 Mon Sep 17 00:00:00 2001 From: reionwong Date: Wed, 23 Jun 2021 17:29:47 +0800 Subject: [PATCH] Add Menubar --- images/dark/folder-home.svg | 9 +++-- images/light/folder-download.svg | 11 +++--- images/light/folder-home.svg | 64 +++++++++++++++++++++++++++++--- qml/FolderPage.qml | 46 +++++++++++++++++++++++ qml/SideBar.qml | 13 ++++++- qml/main.qml | 10 ++++- 6 files changed, 136 insertions(+), 17 deletions(-) diff --git a/images/dark/folder-home.svg b/images/dark/folder-home.svg index 05c44fc..1ccafdf 100755 --- a/images/dark/folder-home.svg +++ b/images/dark/folder-home.svg @@ -34,7 +34,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2160" - inkscape:window-height="1221" + inkscape:window-height="1349" id="namedview9" showgrid="false" inkscape:zoom="33.409091" @@ -43,7 +43,8 @@ inkscape:window-x="0" inkscape:window-y="42" inkscape:window-maximized="1" - inkscape:current-layer="svg7" /> + inkscape:current-layer="svg7" + inkscape:document-rotation="0" /> - - + + + + + + image/svg+xml + + + + + + + + + + diff --git a/qml/FolderPage.qml b/qml/FolderPage.qml index ac9083a..019a1db 100644 --- a/qml/FolderPage.qml +++ b/qml/FolderPage.qml @@ -20,6 +20,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 +import Qt.labs.platform 1.0 import Cutefish.FileManager 1.0 as FM import FishUI 1.0 as FishUI @@ -40,6 +41,51 @@ Item { _viewLoader.item.forceActiveFocus() } + // Global Menu + MenuBar { + id: appMenu + + Menu { + title: qsTr("File") + + MenuItem { + text: qsTr("New Folder") + onTriggered: dirModel.newFolder() + } + + MenuSeparator {} + + MenuItem { + text: qsTr("Properties") + onTriggered: dirModel.openPropertiesDialog() + } + + MenuSeparator {} + + MenuItem { + text: qsTr("Quit") + onTriggered: Qt.quit() + } + } + + Menu { + title: qsTr("Edit") + + MenuItem { + text: qsTr("Select All") + onTriggered: dirModel.selectAll() + } + } + + Menu { + title: qsTr("Help") + + MenuItem { + text: qsTr("About") + } + } + } + Rectangle { id: _background anchors.fill: parent diff --git a/qml/SideBar.qml b/qml/SideBar.qml index efb3353..1f6672b 100644 --- a/qml/SideBar.qml +++ b/qml/SideBar.qml @@ -79,8 +79,16 @@ ListView { Rectangle { anchors.fill: parent - radius: FishUI.Theme.smallRadius - color: _mouseArea.containsMouse && !checked ? _item.hoveredColor : "transparent" + radius: FishUI.Theme.mediumRadius + color: _mouseArea.pressed ? Qt.rgba(FishUI.Theme.textColor.r, + FishUI.Theme.textColor.g, + FishUI.Theme.textColor.b, FishUI.Theme.darkMode ? 0.05 : 0.1) : + _mouseArea.containsMouse || checked ? Qt.rgba(FishUI.Theme.textColor.r, + FishUI.Theme.textColor.g, + FishUI.Theme.textColor.b, FishUI.Theme.darkMode ? 0.1 : 0.05) : + "transparent" + + smooth: true } RowLayout { @@ -96,6 +104,7 @@ ListView { // source: model.iconPath ? model.iconPath : "image://icontheme/" + model.iconName source: "qrc:/images/" + (FishUI.Theme.darkMode || _item.checked ? "dark/" : "light/") + model.iconPath Layout.alignment: Qt.AlignVCenter + smooth: true } Label { diff --git a/qml/main.qml b/qml/main.qml index b01ccc8..81785fa 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -34,8 +34,16 @@ FishUI.Window { visible: true title: qsTr("File Manager") - header.height: 35 + FishUI.Units.smallSpacing * 3 + header.height: 36 + FishUI.Units.largeSpacing background.color: FishUI.Theme.darkMode ? "#262626" : "#F3F4F9" + background.opacity: 0.95 + + FishUI.WindowBlur { + view: root + geometry: Qt.rect(root.x, root.y, root.width, root.height) + windowRadius: root.background.radius + enabled: true + } property QtObject settings: GlobalSettings { }