diff --git a/sidebar/package/contents/ui/CategoriesPage.qml b/sidebar/package/contents/ui/CategoriesPage.qml index 1c40e5ec..87e9438c 100644 --- a/sidebar/package/contents/ui/CategoriesPage.qml +++ b/sidebar/package/contents/ui/CategoriesPage.qml @@ -1,181 +1,180 @@ /* Copyright (c) 2017 Marco Martin This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import QtQuick 2.3 import QtQuick.Layouts 1.1 import QtQuick.Controls 1.0 as QtControls import QtQuick.Controls 2.0 as QtControls2 import org.kde.kirigami 2.1 as Kirigami Kirigami.ScrollablePage { id: mainColumn Component.onCompleted: searchField.forceActiveFocus() header: Rectangle { color: Kirigami.Theme.backgroundColor width: mainColumn.width height: Kirigami.Units.gridUnit * 2.5 RowLayout { id: searchLayout spacing: Kirigami.Units.smallSpacing anchors { fill: parent margins: Kirigami.Units.smallSpacing } QtControls.ToolButton { id: menuButton iconName: "application-menu" Layout.maximumWidth: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 Layout.maximumHeight: width Keys.onBacktabPressed: { root.focusPreviousRequest() } menu: ActionMenu { actions: ["configure", "help_contents", "help_about_app", "help_about_kde"] } } QtControls.TextField { id: searchField focus: true Layout.minimumHeight: Layout.maximumHeight Layout.maximumHeight: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 Layout.fillWidth: true placeholderText: i18n("Search...") onTextChanged: { systemsettings.categoryModel.filterRegExp = text; } MouseArea { anchors { right: parent.right verticalCenter: parent.verticalCenter rightMargin: y } opacity: searchField.text.length > 0 ? 1 : 0 width: Kirigami.Units.iconSizes.small height: width onClicked: searchField.text = "" Kirigami.Icon { anchors.fill: parent source: LayoutMirroring.enabled ? "edit-clear-rtl" : "edit-clear" } Behavior on opacity { OpacityAnimator { duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } } } } } Kirigami.Separator { - visible: !categoryView.atYBeginning anchors { left: parent.left right: parent.right top: parent.bottom } } } background: Rectangle { color: Kirigami.Theme.viewBackgroundColor } Kirigami.Heading { anchors.centerIn: parent width: parent.width * 0.7 wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter text: i18nc("A search yelded no results", "No items matching your search") opacity: categoryView.count == 0 ? 0.3 : 0 Behavior on opacity { OpacityAnimator { duration: Kirigami.Units.longDuration easing.type: Easing.InOutQuad } } } ListView { id: categoryView anchors.fill: parent model: systemsettings.categoryModel currentIndex: systemsettings.activeCategory onContentYChanged: systemsettings.hideToolTip(); activeFocusOnTab: true keyNavigationWraps: true Accessible.role: Accessible.List Keys.onTabPressed: { if (applicationWindow().wideScreen) { subCategoryColumn.focus = true; } else { root.focusNextRequest(); } } section { property: "categoryDisplayRole" delegate: Kirigami.AbstractListItem { separatorVisible: false supportsMouseEvents: false RowLayout { anchors { left: parent.left right: parent.right leftMargin: Kirigami.Units.smallSpacing } QtControls2.Label { id: sectionLabel text: section Layout.minimumHeight: Math.max(implicitHeight, Kirigami.Units.iconSizes.smallMedium) elide: Text.ElideRight font.weight: Font.Bold } } } } delegate: Kirigami.BasicListItem { id: delegate icon: model.decoration label: model.display separatorVisible: false highlighted: focus Accessible.role: Accessible.ListItem Accessible.name: model.display onClicked: { if (systemsettings.activeCategory == index) { root.pageStack.currentIndex = 1; } else { systemsettings.activeCategory = index; subCategoryColumn.title = model.display; } } onHoveredChanged: { if (hovered) { systemsettings.requestToolTip(index, delegate.mapToItem(root, 0, 0, width, height)); } else { systemsettings.hideToolTip(); } } onFocusChanged: { if (focus) { onCurrentIndexChanged: categoryView.positionViewAtIndex(index, ListView.Contain); } } checked: systemsettings.activeCategory == index } } } diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml index 941d0342..a04e1a5a 100644 --- a/sidebar/package/contents/ui/SubCategoryPage.qml +++ b/sidebar/package/contents/ui/SubCategoryPage.qml @@ -1,143 +1,134 @@ /* Copyright (c) 2017 Marco Martin This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation. 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import QtQuick 2.1 import QtQuick.Layouts 1.1 import QtQuick.Controls 1.0 as QtControls import QtQuick.Controls 2.0 as QtControls2 -import org.kde.kirigami 2.1 as Kirigami +import org.kde.kirigami 2.3 as Kirigami Kirigami.ScrollablePage { id: subCategoryColumn - header: MouseArea { + header: Rectangle { + id: headerRect + Kirigami.Theme.colorSet: Kirigami.Theme.Window + Kirigami.Theme.inherit: false + color: Kirigami.Theme.backgroundColor width: subCategoryColumn.width height: Kirigami.Units.gridUnit * 2.5 - enabled: !applicationWindow().wideScreen - onClicked: root.pageStack.currentIndex = 0; - Accessible.role: Accessible.Button - Accessible.name: i18n("Back") - Item { + MouseArea { id: headerControls - + Kirigami.Theme.colorSet: Kirigami.Theme.Button + Kirigami.Theme.inherit: false anchors.fill: parent - - QtControls.ToolButton { - id: backButton + enabled: !applicationWindow().wideScreen + hoverEnabled: true + onEntered: headerRect.color = Kirigami.Theme.hoverColor + onPressed: headerRect.color = Kirigami.Theme.visitedLinkColor + onClicked: root.pageStack.currentIndex = 0 + onExited: headerRect.color = Kirigami.Theme.backgroundColor + Accessible.role: Accessible.Button + Accessible.name: i18n("Back") + + RowLayout { anchors.fill: parent - visible: !applicationWindow().wideScreen - onClicked: root.pageStack.currentIndex = 0; - - RowLayout { - anchors.fill: parent + anchors.leftMargin: Kirigami.Units.largeSpacing - Kirigami.Icon { - id: toolButtonIcon - Layout.alignment: Qt.AlignVCenter - Layout.preferredHeight: Kirigami.Units.iconSizes.small - Layout.preferredWidth: Layout.preferredHeight + Kirigami.Icon { + id: toolButtonIcon + visible: !applicationWindow().wideScreen + Layout.alignment: Qt.AlignVCenter + Layout.preferredHeight: Kirigami.Units.iconSizes.small + Layout.preferredWidth: Layout.preferredHeight - source: LayoutMirroring.enabled ? "go-next" : "go-previous" - } + source: LayoutMirroring.enabled ? "go-next" : "go-previous" + } - QtControls2.Label { - Layout.fillWidth: true - Layout.fillHeight: true + QtControls2.Label { + Layout.fillWidth: true + Layout.fillHeight: true - height: toolButtonIcon.height - text: subCategoryColumn.title - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - //FIXME: QtControls bug, why? - Component.onCompleted: font.bold = true - } + height: toolButtonIcon.height + text: subCategoryColumn.title + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + font.weight: Font.Bold } } - QtControls2.Label { - anchors.verticalCenter: parent.verticalCenter - x: y - - text: subCategoryColumn.title - elide: Text.ElideRight - visible: !backButton.visible - opacity: 0.3 - //FIXME: QtControls bug, why? - Component.onCompleted: font.bold = true - } } Kirigami.Separator { - visible: !subCategoryView.atYBeginning anchors { left: parent.left right: parent.right top: parent.bottom } } } background: Rectangle { color: Kirigami.Theme.viewBackgroundColor } ListView { id: subCategoryView anchors.fill: parent model: systemsettings.subCategoryModel currentIndex: systemsettings.activeSubCategory activeFocusOnTab: true keyNavigationWraps: true Accessible.role: Accessible.List Keys.onTabPressed: root.focusNextRequest(); Keys.onBacktabPressed: { mainColumn.focus = true; } onCountChanged: { if (count > 1) { if (root.pageStack.depth < 2) { root.pageStack.push(subCategoryColumn); } } else { root.pageStack.pop(mainColumn) } } Connections { target: systemsettings onActiveSubCategoryChanged: { root.pageStack.currentIndex = 1; subCategoryView.forceActiveFocus(); } } delegate: Kirigami.BasicListItem { id: delegate icon: model.decoration label: model.display separatorVisible: false highlighted: focus onClicked: systemsettings.activeSubCategory = index onFocusChanged: { if (focus) { onCurrentIndexChanged: subCategoryView.positionViewAtIndex(index, ListView.Contain); } } checked: systemsettings.activeSubCategory == index //checkable: false //FIXME: Qt 5.7 doesn't have checkable, this way fails at runtime but still works correctly on 5.7 Component.onCompleted: delegate.checkable = true; } } }