diff --git a/applets/notes/package/contents/ui/main.qml b/applets/notes/package/contents/ui/main.qml --- a/applets/notes/package/contents/ui/main.qml +++ b/applets/notes/package/contents/ui/main.qml @@ -18,7 +18,7 @@ */ import QtQuick 2.1 -import QtQuick.Controls 1.3 as QtControls +import QtQuick.Controls 2.5 as QQC2 import QtQuick.Layouts 1.1 import org.kde.draganddrop 2.0 as DragDrop @@ -247,47 +247,63 @@ enabled: opacity > 0 visible: fontButtons.showFormatButtons - PlasmaComponents.ToolButton { - tooltip: i18nc("@info:tooltip", "Bold") - iconSource: "format-text-bold" + QQC2.ToolButton { + icon.name: "format-text-bold" + icon.color: (plasmoid.configuration.color === "black" || plasmoid.configuration.color === "translucent-light") ? "#dfdfdf" : "#202020" checked: documentHandler.bold onClicked: documentHandler.bold = !documentHandler.bold - Accessible.name: tooltip + QQC2.ToolTip { + text: i18nc("@info:tooltip", "Bold") + Accessible.name: text + } } - PlasmaComponents.ToolButton { - tooltip: i18nc("@info:tooltip", "Italic") - iconSource: "format-text-italic" + QQC2.ToolButton { + icon.name: "format-text-italic" + icon.color: (plasmoid.configuration.color === "black" || plasmoid.configuration.color === "translucent-light") ? "#dfdfdf" : "#202020" checked: documentHandler.italic onClicked: documentHandler.italic = !documentHandler.italic - Accessible.name: tooltip + QQC2.ToolTip { + text: i18nc("@info:tooltip", "Italic") + Accessible.name: text + + } } - PlasmaComponents.ToolButton { - tooltip: i18nc("@info:tooltip", "Underline") - iconSource: "format-text-underline" + QQC2.ToolButton { + icon.name: "format-text-underline" + icon.color: (plasmoid.configuration.color === "black" || plasmoid.configuration.color === "translucent-light") ? "#dfdfdf" : "#202020" checked: documentHandler.underline onClicked: documentHandler.underline = !documentHandler.underline - Accessible.name: tooltip + QQC2.ToolTip { + text: i18nc("@info:tooltip", "Underline") + Accessible.name: text + } } - PlasmaComponents.ToolButton { - tooltip: i18nc("@info:tooltip", "Strikethrough") - iconSource: "format-text-strikethrough" + QQC2.ToolButton { + icon.name: "format-text-strikethrough" + icon.color: (plasmoid.configuration.color === "black" || plasmoid.configuration.color === "translucent-light") ? "#dfdfdf" : "#202020" checked: documentHandler.strikeOut onClicked: documentHandler.strikeOut = !documentHandler.strikeOut - Accessible.name: tooltip + QQC2.ToolTip { + text: i18nc("@info:tooltip", "Strikethrough") + Accessible.name: text + } } } Item { // spacer Layout.fillWidth: true Layout.fillHeight: true } - PlasmaComponents.ToolButton { + QQC2.ToolButton { id: settingsButton - tooltip: plasmoid.action("configure").text - iconSource: "configure" + icon.name: "configure" + icon.color: (plasmoid.configuration.color === "black" || plasmoid.configuration.color === "translucent-light") ? "#dfdfdf" : "#202020" onClicked: plasmoid.action("configure").trigger() - Accessible.name: tooltip + QQC2.ToolTip { + text: plasmoid.action("configure").text + Accessible.name: text + } } } }