diff --git a/sddm-theme/BreezeMenuStyle.qml b/sddm-theme/BreezeMenuStyle.qml new file mode 100644 index 000000000..7d56c1499 --- /dev/null +++ b/sddm-theme/BreezeMenuStyle.qml @@ -0,0 +1,25 @@ +import QtQuick 2.2 + +import org.kde.plasma.core 2.0 as PlasmaCore + +import QtQuick.Controls.Styles 1.4 as QQCS +import QtQuick.Controls 1.3 as QQC + +QQCS.MenuStyle { + frame: Rectangle { + color: PlasmaCore.ColorScope.backgroundColor + border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7)) + border.width: 1 + } + itemDelegate.label: QQC.Label { + height: contentHeight * 1.2 + verticalAlignment: Text.AlignVCenter + color: styleData.selected ? PlasmaCore.ColorScope.highlightedTextColor : PlasmaCore.ColorScope.textColor + font.pointSize: config.fontSize + text: styleData.text + } + itemDelegate.background: Rectangle { + visible: styleData.selected + color: PlasmaCore.ColorScope.highlightColor + } +} diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml index 13d66c2c4..9989d93ef 100644 --- a/sddm-theme/KeyboardButton.qml +++ b/sddm-theme/KeyboardButton.qml @@ -1,37 +1,38 @@ import QtQuick 2.2 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import QtQuick.Controls 1.3 as QQC PlasmaComponents.ToolButton { id: keyboardButton property int currentIndex: -1 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) implicitWidth: minimumWidth font.pointSize: config.fontSize visible: menu.items.length > 1 Component.onCompleted: currentIndex = Qt.binding(function() {return keyboard.currentLayout}); menu: QQC.Menu { id: keyboardMenu + style: BreezeMenuStyle {} Instantiator { id: instantiator model: keyboard.layouts onObjectAdded: keyboardMenu.insertItem(index, object) onObjectRemoved: keyboardMenu.removeItem( object ) delegate: QQC.MenuItem { text: modelData.longName property string shortName: modelData.shortName onTriggered: { keyboard.currentLayout = model.index } } } } } diff --git a/sddm-theme/SessionButton.qml b/sddm-theme/SessionButton.qml index 5965af6e0..58590c835 100644 --- a/sddm-theme/SessionButton.qml +++ b/sddm-theme/SessionButton.qml @@ -1,58 +1,59 @@ /* * Copyright 2016 David Edmundson * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 or * (at your option) any later version. * * This program 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 General Public License for more details * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import QtQuick 2.2 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import QtQuick.Controls 1.3 as QQC PlasmaComponents.ToolButton { id: root property int currentIndex: -1 implicitWidth: minimumWidth visible: menu.items.length > 1 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "") font.pointSize: config.fontSize Component.onCompleted: { currentIndex = sessionModel.lastIndex } menu: QQC.Menu { id: menu + style: BreezeMenuStyle {} Instantiator { id: instantiator model: sessionModel onObjectAdded: menu.insertItem(index, object) onObjectRemoved: menu.removeItem( object ) delegate: QQC.MenuItem { text: model.name onTriggered: { root.currentIndex = model.index } } } } }