start work on desktop panel

This commit is contained in:
arcan1s
2015-02-05 04:26:19 +03:00
parent bb88892125
commit 681fec4cac
27 changed files with 1805 additions and 46 deletions

View File

@ -80,13 +80,13 @@
<entry name="upTooltipColor" type="string">
<default>#ff00ff</default>
</entry>
<entry name="batteryTooltip" type="bool">
<entry name="batTooltip" type="bool">
<default>true</default>
</entry>
<entry name="batteryTooltipColor" type="string">
<entry name="batTooltipColor" type="string">
<default>#008800</default>
</entry>
<entry name="batteryInTooltipColor" type="string">
<entry name="batInTooltipColor" type="string">
<default>#880000</default>
</entry>
</group>

View File

@ -47,15 +47,15 @@ Item {
"swapTooltip": plasmoid.configuration.swapTooltip,
"downTooltip": plasmoid.configuration.downTooltip,
"upTooltip": plasmoid.configuration.downTooltip,
"batteryTooltip": plasmoid.configuration.batteryTooltip,
"batTooltip": plasmoid.configuration.batTooltip,
"cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
"cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
"memTooltipColor": plasmoid.configuration.memTooltipColor,
"swapTooltipColor": plasmoid.configuration.swapTooltipColor,
"downTooltipColor": plasmoid.configuration.downTooltipColor,
"upTooltipColor": plasmoid.configuration.upTooltipColor,
"batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
"batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
"batTooltipColor": plasmoid.configuration.batTooltipColor,
"batInTooltipColor": plasmoid.configuration.batInTooltipColor
}
property alias cfg_background: background.checked

View File

@ -21,7 +21,6 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
import QtQuick.Dialogs 1.1 as QtDialogs
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {

View File

@ -22,7 +22,6 @@ import QtQuick.Layouts 1.0 as QtLayouts
import QtQuick.Controls.Styles 1.3 as QtStyles
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
@ -43,15 +42,15 @@ Item {
"swapTooltip": plasmoid.configuration.swapTooltip,
"downTooltip": plasmoid.configuration.downTooltip,
"upTooltip": plasmoid.configuration.downTooltip,
"batteryTooltip": plasmoid.configuration.batteryTooltip,
"batTooltip": plasmoid.configuration.batTooltip,
"cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
"cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
"memTooltipColor": plasmoid.configuration.memTooltipColor,
"swapTooltipColor": plasmoid.configuration.swapTooltipColor,
"downTooltipColor": plasmoid.configuration.downTooltipColor,
"upTooltipColor": plasmoid.configuration.upTooltipColor,
"batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
"batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
"batTooltipColor": plasmoid.configuration.batTooltipColor,
"batInTooltipColor": plasmoid.configuration.batInTooltipColor
}
property variant cfg_dataengine: AWActions.readDataEngineConfiguration()

View File

@ -47,15 +47,15 @@ Item {
"swapTooltip": plasmoid.configuration.swapTooltip,
"downTooltip": plasmoid.configuration.downTooltip,
"upTooltip": plasmoid.configuration.downTooltip,
"batteryTooltip": plasmoid.configuration.batteryTooltip,
"batTooltip": plasmoid.configuration.batTooltip,
"cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
"cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
"memTooltipColor": plasmoid.configuration.memTooltipColor,
"swapTooltipColor": plasmoid.configuration.swapTooltipColor,
"downTooltipColor": plasmoid.configuration.downTooltipColor,
"upTooltipColor": plasmoid.configuration.upTooltipColor,
"batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
"batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
"batTooltipColor": plasmoid.configuration.batTooltipColor,
"batInTooltipColor": plasmoid.configuration.batInTooltipColor
}
signal needUpdate
@ -111,7 +111,7 @@ Item {
id: timeDE
engine: "time"
connectedSources: ["Local"]
interval: plasmoid.configuration.interval
interval: 1000
onNewData: {
if (debug) console.log("[main::onNewData] : Update source " + sourceName)

View File

@ -21,7 +21,6 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
import QtQuick.Dialogs 1.1 as QtDialogs
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
@ -47,9 +46,9 @@ Item {
property alias cfg_downTooltip: downTooltip.checked
property alias cfg_downTooltipColor: downTooltipColor.text
property alias cfg_upTooltipColor: upTooltipColor.text
property alias cfg_batteryTooltip: batteryTooltip.checked
property alias cfg_batteryTooltipColor: batteryTooltipColor.text
property alias cfg_batteryInTooltipColor: batteryInTooltipColor.text
property alias cfg_batTooltip: batTooltip.checked
property alias cfg_batTooltipColor: batTooltipColor.text
property alias cfg_batInTooltipColor: batInTooltipColor.text
Column {
@ -430,13 +429,13 @@ Item {
width: parent.width
QtControls.Label {
height: parent.height
width: parent.width * 2 / 5 - batteryTooltip.width
width: parent.width * 2 / 5 - batTooltip.width
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
text: i18n("Battery active color")
}
QtControls.CheckBox {
id: batteryTooltip
id: batTooltip
height: parent.height
width: implicitWidth
style: QtStyles.CheckBoxStyle {
@ -458,22 +457,22 @@ Item {
}
}
QtControls.Button {
id: batteryTooltipColor
id: batTooltipColor
width: parent.width * 3 / 5
style: QtStyles.ButtonStyle {
background: Rectangle {
color: plasmoid.configuration.batteryTooltipColor
color: plasmoid.configuration.batTooltipColor
}
}
text: plasmoid.configuration.batteryTooltipColor
onClicked: batteryTooltipColorDialog.visible = true
text: plasmoid.configuration.batTooltipColor
onClicked: batTooltipColorDialog.visible = true
}
QtDialogs.ColorDialog {
id: batteryTooltipColorDialog
id: batTooltipColorDialog
title: i18n("Select a color")
color: batteryTooltipColor.text
onAccepted: batteryTooltipColor.text = batteryTooltipColorDialog.color
color: batTooltipColor.text
onAccepted: batTooltipColor.text = batTooltipColorDialog.color
}
}
@ -488,22 +487,22 @@ Item {
text: i18n("Battery inactive color")
}
QtControls.Button {
id: batteryInTooltipColor
id: batInTooltipColor
width: parent.width * 3 / 5
style: QtStyles.ButtonStyle {
background: Rectangle {
color: plasmoid.configuration.batteryInTooltipColor
color: plasmoid.configuration.batInTooltipColor
}
}
text: plasmoid.configuration.batteryInTooltipColor
onClicked: batteryInTooltipColorDialog.visible = true
text: plasmoid.configuration.batInTooltipColor
onClicked: batInTooltipColorDialog.visible = true
}
QtDialogs.ColorDialog {
id: batteryInTooltipColorDialog
id: batInTooltipColorDialog
title: i18n("Select a color")
color: batteryInTooltipColor.text
onAccepted: batteryInTooltipColor.text = batteryInTooltipColorDialog.color
color: batInTooltipColor.text
onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color
}
}
}

View File

@ -20,7 +20,6 @@ import QtQuick.Controls 1.3 as QtControls
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
@ -48,15 +47,15 @@ Item {
"swapTooltip": plasmoid.configuration.swapTooltip,
"downTooltip": plasmoid.configuration.downTooltip,
"upTooltip": plasmoid.configuration.downTooltip,
"batteryTooltip": plasmoid.configuration.batteryTooltip,
"batTooltip": plasmoid.configuration.batTooltip,
"cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
"cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
"memTooltipColor": plasmoid.configuration.memTooltipColor,
"swapTooltipColor": plasmoid.configuration.swapTooltipColor,
"downTooltipColor": plasmoid.configuration.downTooltipColor,
"upTooltipColor": plasmoid.configuration.upTooltipColor,
"batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
"batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
"batTooltipColor": plasmoid.configuration.batTooltipColor,
"batInTooltipColor": plasmoid.configuration.batInTooltipColor
}
property alias cfg_text: textPattern.text

View File

@ -51,7 +51,7 @@ AWToolTip::AWToolTip(QObject *parent,
counts += configuration[QString("memTooltip")].toInt();
counts += configuration[QString("swapTooltip")].toInt();
counts += configuration[QString("downTooltip")].toInt();
counts += configuration[QString("batteryTooltip")].toInt();
counts += configuration[QString("batTooltip")].toInt();
boundaries[QString("cpuTooltip")] = 100.0;
boundaries[QString("cpuclTooltip")] = 4000.0;
@ -108,10 +108,7 @@ QPixmap AWToolTip::image()
for (int i=0; i<requiredKeys.count(); i++) {
float normX = 100.0 / static_cast<float>(data[requiredKeys[i]].count());
float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]);
if (requiredKeys[i] == QString("batTooltip"))
isBattery = true;
else
isBattery = false;
isBattery = (requiredKeys[i] == QString("batTooltip"));
if (!isBattery) pen.setColor(QColor(configuration[requiredKeys[i] + QString("Color")].toString()));
float shift = i * 100.0;
if (down) shift -= 100.0;
@ -122,9 +119,9 @@ QPixmap AWToolTip::image()
float y2 = - fabs(data[requiredKeys[i]][j+1]) * normY + 5.0;
if (isBattery) {
if (data[requiredKeys[i]][j+1] > 0)
pen.setColor(QColor(configuration[QString("batteryColor")].toString()));
pen.setColor(QColor(configuration[QString("batTooltipColor")].toString()));
else
pen.setColor(QColor(configuration[QString("batteryInColor")].toString()));
pen.setColor(QColor(configuration[QString("batInTooltipColor")].toString()));
}
toolTipScene->addLine(x1, y1, x2, y2, pen);
}