diff --git a/sources/awesome-widget/package/contents/ui/ButtonSelector.qml b/sources/awesome-widget/package/contents/ui/ButtonSelector.qml new file mode 100644 index 0000000..dc244c6 --- /dev/null +++ b/sources/awesome-widget/package/contents/ui/ButtonSelector.qml @@ -0,0 +1,41 @@ +/*************************************************************************** + * This file is part of awesome-widgets * + * * + * awesome-widgets is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * awesome-widgets 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 General Public License * + * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 1.3 as QtControls + + +Row { + height: implicitHeight + width: parent.width + + property alias text: label.text + property alias value: button.text + + signal buttonActivated + + QtControls.Label { + id: label + height: parent.height + width: parent.width * 2 / 5 + } + QtControls.Button { + id: button + width: parent.width * 3 / 5 + onClicked: buttonActivated() + } +} diff --git a/sources/awesome-widget/package/contents/ui/ColorSelector.qml b/sources/awesome-widget/package/contents/ui/ColorSelector.qml new file mode 100644 index 0000000..d74927c --- /dev/null +++ b/sources/awesome-widget/package/contents/ui/ColorSelector.qml @@ -0,0 +1,55 @@ +/*************************************************************************** + * This file is part of awesome-widgets * + * * + * awesome-widgets is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * awesome-widgets 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 General Public License * + * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 1.3 as QtControls +import QtQuick.Controls.Styles 1.3 as QtStyles +import QtQuick.Dialogs 1.1 as QtDialogs + + +Row { + height: implicitHeight + width: parent.width + + property alias text: label.text + property alias value: colorButton.text + + QtControls.Label { + id: label + height: parent.height + width: parent.width * 2 / 5 + horizontalAlignment: Text.AlignRight + verticalAlignment: Text.AlignVCenter + } + QtControls.Button { + id: colorButton + width: parent.width * 3 / 5 + style: QtStyles.ButtonStyle { + background: Rectangle { + color: value + } + } + onClicked: colorDialog.visible = true + } + + QtDialogs.ColorDialog { + id: colorDialog + title: i18n("Select a color") + color: value + onAccepted: value = colorDialog.color + } +} diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml index c231872..41f3707 100644 --- a/sources/awesome-widget/package/contents/ui/advanced.qml +++ b/sources/awesome-widget/package/contents/ui/advanced.qml @@ -193,18 +193,9 @@ Item { value: plasmoid.configuration.acOffline } - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - } - QtControls.Button { - width: parent.width * 3 / 5 - text: i18n("Drop key cache") - onClicked: awActions.dropCache() - } + ButtonSelector { + value: i18n("Drop key cache") + onButtonActivated: awActions.dropCache() } Row { diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml index 66c552e..48f2ec8 100644 --- a/sources/awesome-widget/package/contents/ui/appearance.qml +++ b/sources/awesome-widget/package/contents/ui/appearance.qml @@ -17,7 +17,6 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls -import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs import org.kde.plasma.private.awesomewidget 1.0 @@ -48,8 +47,8 @@ Item { property alias cfg_fontSize: fontSize.value property string cfg_fontWeight: fontWeight.value property string cfg_fontStyle: fontStyle.value - property alias cfg_fontColor: selectColor.text - property alias cfg_textStyleColor: selectStyleColor.text + property alias cfg_fontColor: selectColor.value + property alias cfg_textStyleColor: selectStyleColor.value property string cfg_textStyle: textStyle.value @@ -133,27 +132,10 @@ Item { onValueEdited: cfg_fontStyle = newValue } - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width / 3 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Font color") - } - QtControls.Button { - id: selectColor - width: parent.width * 2 / 3 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.fontColor - } - } - text: plasmoid.configuration.fontColor - onClicked: colorDialog.visible = true - } + ColorSelector { + id: selectColor + text: i18n("Font color") + value: plasmoid.configuration.fontColor } ComboBoxSelector { @@ -181,44 +163,13 @@ Item { onValueEdited: cfg_textStyle = newValue } - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width / 3 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Style color") - } - QtControls.Button { - id: selectStyleColor - width: parent.width * 2 / 3 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.textStyleColor - } - } - text: plasmoid.configuration.textStyleColor - onClicked: textStyleColorDialog.visible = true - } + ColorSelector { + id: selectStyleColor + text: i18n("Style color") + value: plasmoid.configuration.textStyleColor } } - QtDialogs.ColorDialog { - id: colorDialog - title: i18n("Select a color") - color: selectColor.text - onAccepted: selectColor.text = colorDialog.color - } - - QtDialogs.ColorDialog { - id: textStyleColorDialog - title: i18n("Select a color") - color: selectStyleColor.text - onAccepted: selectStyleColor.text = textStyleColorDialog.color - } - QtDialogs.FontDialog { id: fontDialog title: i18n("Select a font") diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir index e339c79..47d9e93 100644 --- a/sources/awesome-widget/package/contents/ui/qmldir +++ b/sources/awesome-widget/package/contents/ui/qmldir @@ -1,6 +1,8 @@ singleton general 1.0 general.qml BugReport ./BugReport.qml +ButtonSelector ./ButtonSelector.qml CheckBoxSelector ./CheckBoxSelector.qml +ColorSelector ./ColorSelector.qml ComboBoxSelector ./ComboBoxSelector.qml IntegerSelector ./IntegerSelector.qml LineSelector ./LineSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/tooltip.qml b/sources/awesome-widget/package/contents/ui/tooltip.qml index de9ae40..e6758da 100644 --- a/sources/awesome-widget/package/contents/ui/tooltip.qml +++ b/sources/awesome-widget/package/contents/ui/tooltip.qml @@ -39,21 +39,21 @@ Item { property alias cfg_tooltipNumber: tooltipNumber.value property alias cfg_useTooltipBackground: useTooltipBackground.checked - property alias cfg_tooltipBackground: tooltipBackground.text + property alias cfg_tooltipBackground: tooltipBackground.value property alias cfg_cpuTooltip: cpuTooltip.checked - property alias cfg_cpuTooltipColor: cpuTooltipColor.text + property alias cfg_cpuTooltipColor: cpuTooltipColor.value property alias cfg_cpuclTooltip: cpuclTooltip.checked - property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text + property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value property alias cfg_memTooltip: memTooltip.checked - property alias cfg_memTooltipColor: memTooltipColor.text + property alias cfg_memTooltipColor: memTooltipColor.value property alias cfg_swapTooltip: swapTooltip.checked - property alias cfg_swapTooltipColor: swapTooltipColor.text + property alias cfg_swapTooltipColor: swapTooltipColor.value property alias cfg_downkbTooltip: downkbTooltip.checked - property alias cfg_downkbTooltipColor: downkbTooltipColor.text - property alias cfg_upkbTooltipColor: upkbTooltipColor.text + property alias cfg_downkbTooltipColor: downkbTooltipColor.value + property alias cfg_upkbTooltipColor: upkbTooltipColor.value property alias cfg_batTooltip: batTooltip.checked - property alias cfg_batTooltipColor: batTooltipColor.text - property alias cfg_batInTooltipColor: batInTooltipColor.text + property alias cfg_batTooltipColor: batTooltipColor.value + property alias cfg_batInTooltipColor: batInTooltipColor.value Column { @@ -82,34 +82,10 @@ Item { width: parent.width checkable: true title: i18n("Background") - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Background color") - } - QtControls.Button { - id: tooltipBackground - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.tooltipBackground - } - } - text: plasmoid.configuration.tooltipBackground - onClicked: tooltipBackgroundDialog.visible = true - } - - QtDialogs.ColorDialog { - id: tooltipBackgroundDialog - title: i18n("Select a color") - color: tooltipBackground.text - onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color - } + ColorSelector { + id: tooltipBackground + text: i18n("Background color") + value: plasmoid.configuration.tooltipBackground } } @@ -119,34 +95,10 @@ Item { width: parent.width checkable: true title: i18n("CPU") - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("CPU color") - } - QtControls.Button { - id: cpuTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.cpuTooltipColor - } - } - text: plasmoid.configuration.cpuTooltipColor - onClicked: cpuTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: cpuTooltipColorDialog - title: i18n("Select a color") - color: cpuTooltipColor.text - onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color - } + ColorSelector { + id: cpuTooltipColor + text: i18n("CPU color") + value: plasmoid.configuration.cpuTooltipColor } } @@ -156,34 +108,10 @@ Item { width: parent.width checkable: true title: i18n("CPU clock") - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("CPU clock color") - } - QtControls.Button { - id: cpuclTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.cpuclTooltipColor - } - } - text: plasmoid.configuration.cpuclTooltipColor - onClicked: cpuclTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: cpuclTooltipColorDialog - title: i18n("Select a color") - color: cpuclTooltipColor.text - onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color - } + ColorSelector { + id: cpuclTooltipColor + text: i18n("CPU clock color") + value: plasmoid.configuration.cpuclTooltipColor } } @@ -193,34 +121,10 @@ Item { width: parent.width checkable: true title: i18n("Memory") - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Memory color") - } - QtControls.Button { - id: memTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.memTooltipColor - } - } - text: plasmoid.configuration.memTooltipColor - onClicked: memTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: memTooltipColorDialog - title: i18n("Select a color") - color: memTooltipColor.text - onAccepted: memTooltipColor.text = memTooltipColorDialog.color - } + ColorSelector { + id: memTooltipColor + text: i18n("Memory color") + value: plasmoid.configuration.memTooltipColor } } @@ -230,34 +134,10 @@ Item { width: parent.width checkable: true title: i18n("Swap") - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Swap color") - } - QtControls.Button { - id: swapTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.swapTooltipColor - } - } - text: plasmoid.configuration.swapTooltipColor - onClicked: swapTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: swapTooltipColorDialog - title: i18n("Select a color") - color: swapTooltipColor.text - onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color - } + ColorSelector { + id: swapTooltipColor + text: i18n("Swap color") + value: plasmoid.configuration.swapTooltipColor } } @@ -270,63 +150,15 @@ Item { Column { height: implicitHeight width: parent.width - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Download speed color") - } - QtControls.Button { - id: downkbTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.downkbTooltipColor - } - } - text: plasmoid.configuration.downkbTooltipColor - onClicked: downkbTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: downkbTooltipColorDialog - title: i18n("Select a color") - color: downkbTooltipColor.text - onAccepted: downkbTooltipColor.text = downkbTooltipColorDialog.color - } + ColorSelector { + id: downkbTooltipColor + text: i18n("Download speed color") + value: plasmoid.configuration.downkbTooltipColor } - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Upload speed color") - } - QtControls.Button { - id: upkbTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.upkbTooltipColor - } - } - text: plasmoid.configuration.upkbTooltipColor - onClicked: upkbTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: upkbTooltipColorDialog - title: i18n("Select a color") - color: upkbTooltipColor.text - onAccepted: upkbTooltipColor.text = upkbTooltipColorDialog.color - } + ColorSelector { + id: upkbTooltipColor + text: i18n("Upload speed color") + value: plasmoid.configuration.upkbTooltipColor } } } @@ -340,63 +172,15 @@ Item { Column { height: implicitHeight width: parent.width - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Battery active color") - } - QtControls.Button { - id: batTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.batTooltipColor - } - } - text: plasmoid.configuration.batTooltipColor - onClicked: batTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: batTooltipColorDialog - title: i18n("Select a color") - color: batTooltipColor.text - onAccepted: batTooltipColor.text = batTooltipColorDialog.color - } + ColorSelector { + id: batTooltipColor + text: i18n("Battery active color") + value: plasmoid.configuration.batTooltipColor } - Row { - height: implicitHeight - width: parent.width - QtControls.Label { - height: parent.height - width: parent.width * 2 / 5 - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignVCenter - text: i18n("Battery inactive color") - } - QtControls.Button { - id: batInTooltipColor - width: parent.width * 3 / 5 - style: QtStyles.ButtonStyle { - background: Rectangle { - color: plasmoid.configuration.batInTooltipColor - } - } - text: plasmoid.configuration.batInTooltipColor - onClicked: batInTooltipColorDialog.visible = true - } - - QtDialogs.ColorDialog { - id: batInTooltipColorDialog - title: i18n("Select a color") - color: batInTooltipColor.text - onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color - } + ColorSelector { + id: batInTooltipColor + text: i18n("Battery inactive color") + value: plasmoid.configuration.batInTooltipColor } } }