arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

add colorsettings to DP tooltip

Browse Source 
remove deprecated settings from AW
This commit is contained in:
arcan1s 2014-11-10 01:53:27 +03:00
parent bbc9d72606
commit 7069758b73
4 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/awesome-widget/configuration.cpp
View File

@ -40,7 +40,6 @@ QMap<QString, QString> AwesomeWidget::readDataEngineConfiguration()
QMap<QString, QString> rawConfig; QMap<QString, QString> rawConfig;
rawConfig[QString("ACPIPATH")] = QString("/sys/class/power_supply/"); rawConfig[QString("ACPIPATH")] = QString("/sys/class/power_supply/");
rawConfig[QString("DESKTOPCMD")] = QString("qdbus org.kde.kwin /KWin currentDesktop");
rawConfig[QString("GPUDEV")] = QString("auto"); rawConfig[QString("GPUDEV")] = QString("auto");
rawConfig[QString("HDDDEV")] = QString("all"); rawConfig[QString("HDDDEV")] = QString("all");
rawConfig[QString("HDDTEMPCMD")] = QString("sudo hddtemp"); rawConfig[QString("HDDTEMPCMD")] = QString("sudo hddtemp");
@ -105,8 +104,7 @@ QMap<QString, QString> AwesomeWidget::updateDataEngineConfiguration(const QMap<Q
key = rawConfig.keys()[i]; key = rawConfig.keys()[i];
value = rawConfig[key]; value = rawConfig[key];
key.remove(QChar(' ')); key.remove(QChar(' '));
if ((key != QString("DESKTOPCMD")) && if ((key != QString("HDDTEMPCMD")) &&
(key != QString("HDDTEMPCMD")) &&
(key != QString("PKGCMD"))) (key != QString("PKGCMD")))
value.remove(QChar(' ')); value.remove(QChar(' '));
config[key] = value; config[key] = value;
@ -399,7 +397,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
uiDEConfig.tableWidget_customCommand->setCellWidget(i, 4, redirect); uiDEConfig.tableWidget_customCommand->setCellWidget(i, 4, redirect);
} }
externalScripts.clear(); externalScripts.clear();
uiDEConfig.lineEdit_desktopCmd->setText(deSettings[QString("DESKTOPCMD")]);
uiDEConfig.comboBox_gpudev->setCurrentIndex( uiDEConfig.comboBox_gpudev->setCurrentIndex(
uiDEConfig.comboBox_gpudev->findText(deSettings[QString("GPUDEV")], Qt::MatchFixedString)); uiDEConfig.comboBox_gpudev->findText(deSettings[QString("GPUDEV")], Qt::MatchFixedString));
cmd = QString("find /dev -name [hms]d[a-z]"); cmd = QString("find /dev -name [hms]d[a-z]");
@ -597,7 +594,6 @@ void AwesomeWidget::configAccepted()
script->writeConfiguration(); script->writeConfiguration();
delete script; delete script;
} }
deSettings[QString("DESKTOPCMD")] = uiDEConfig.lineEdit_desktopCmd->text();
deSettings[QString("GPUDEV")] = uiDEConfig.comboBox_gpudev->currentText(); deSettings[QString("GPUDEV")] = uiDEConfig.comboBox_gpudev->currentText();
deSettings[QString("HDDDEV")] = uiDEConfig.comboBox_hdddev->currentText(); deSettings[QString("HDDDEV")] = uiDEConfig.comboBox_hdddev->currentText();
deSettings[QString("HDDTEMPCMD")] = uiDEConfig.lineEdit_hddtempCmd->text(); deSettings[QString("HDDTEMPCMD")] = uiDEConfig.lineEdit_hddtempCmd->text();

46
sources/awesome-widget/deconfig.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>700</width> <width>700</width>
<height>586</height> <height>584</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -43,11 +43,11 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>684</width> <width>684</width>
<height>570</height> <height>568</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="5" column="0"> <item row="4" column="0">
<layout class="QHBoxLayout" name="layout_hddtempCmd"> <layout class="QHBoxLayout" name="layout_hddtempCmd">
<item> <item>
<widget class="QLabel" name="label_hddtempCmd"> <widget class="QLabel" name="label_hddtempCmd">
@ -71,7 +71,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<layout class="QHBoxLayout" name="layout_gpudev"> <layout class="QHBoxLayout" name="layout_gpudev">
<item> <item>
<widget class="QLabel" name="label_gpudev"> <widget class="QLabel" name="label_gpudev">
@ -124,7 +124,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<layout class="QHBoxLayout" name="layout_hdddev"> <layout class="QHBoxLayout" name="layout_hdddev">
<item> <item>
<widget class="QLabel" name="label_hdddev"> <widget class="QLabel" name="label_hdddev">
@ -157,7 +157,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0"> <item row="8" column="0">
<layout class="QHBoxLayout" name="layout_playerSelect"> <layout class="QHBoxLayout" name="layout_playerSelect">
<item> <item>
<widget class="QLabel" name="label_playerSelect"> <widget class="QLabel" name="label_playerSelect">
@ -200,7 +200,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<layout class="QHBoxLayout" name="layout_mpdport"> <layout class="QHBoxLayout" name="layout_mpdport">
<item> <item>
<widget class="QLabel" name="label_mpdport"> <widget class="QLabel" name="label_mpdport">
@ -255,31 +255,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="5" column="0">
<layout class="QHBoxLayout" name="layout_desktopCmd">
<item>
<widget class="QLabel" name="label_desktopCmd">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Desktop check cmd</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_desktopCmd">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="0">
<layout class="QHBoxLayout" name="layout_mpdaddress"> <layout class="QHBoxLayout" name="layout_mpdaddress">
<item> <item>
<widget class="QLabel" name="label_mpdaddress"> <widget class="QLabel" name="label_mpdaddress">
@ -303,7 +279,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="11" column="0"> <item row="10" column="0">
<spacer name="spacer_dataengine"> <spacer name="spacer_dataengine">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -381,7 +357,7 @@
</column> </column>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="7" column="0">
<layout class="QVBoxLayout" name="layout_mpris"> <layout class="QVBoxLayout" name="layout_mpris">
<item> <item>
<widget class="QLabel" name="label_mprisInfo"> <widget class="QLabel" name="label_mprisInfo">
@ -471,7 +447,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<layout class="QVBoxLayout" name="layout_pkgCommand"> <layout class="QVBoxLayout" name="layout_pkgCommand">
<item> <item>
<widget class="QTableWidget" name="tableWidget_pkgCommand"> <widget class="QTableWidget" name="tableWidget_pkgCommand">

4
sources/desktop-panel/desktop-panel.cpp
View File

@ -318,6 +318,7 @@ void DesktopPanel::paintTooltip(const int active)
QPen pen = QPen(); QPen pen = QPen();
pen.setWidthF(2.0 * info.desktop.width() / 400.0); pen.setWidthF(2.0 * info.desktop.width() / 400.0);
pen.setColor(QColor(configuration[QString("tooltipColor")]));
for (int i=0; i<info.windows.count(); i++) { for (int i=0; i<info.windows.count(); i++) {
toolTipScene->addLine(info.windows[i].left() + margin, info.windows[i].bottom() + margin, toolTipScene->addLine(info.windows[i].left() + margin, info.windows[i].bottom() + margin,
info.windows[i].left() + margin, info.windows[i].top() + margin, pen); info.windows[i].left() + margin, info.windows[i].top() + margin, pen);
@ -394,6 +395,7 @@ void DesktopPanel::createConfigurationInterface(KConfigDialog *parent)
else else
uiWidConfig.checkBox_tooltip->setCheckState(Qt::Checked); uiWidConfig.checkBox_tooltip->setCheckState(Qt::Checked);
uiWidConfig.spinBox_tooltip->setValue(configuration[QString("tooltipWidth")].toInt()); uiWidConfig.spinBox_tooltip->setValue(configuration[QString("tooltipWidth")].toInt());
uiWidConfig.kcolorcombo_tooltipColor->setColor(QColor(configuration[QString("tooltipColor")]));
if (configuration[QString("background")].toInt() == 0) if (configuration[QString("background")].toInt() == 0)
uiWidConfig.checkBox_background->setCheckState(Qt::Unchecked); uiWidConfig.checkBox_background->setCheckState(Qt::Unchecked);
else else
@ -477,6 +479,7 @@ void DesktopPanel::configAccepted()
cg.writeEntry("pattern", uiWidConfig.textEdit_elements->toPlainText()); cg.writeEntry("pattern", uiWidConfig.textEdit_elements->toPlainText());
cg.writeEntry("tooltip", QString::number(uiWidConfig.checkBox_tooltip->checkState())); cg.writeEntry("tooltip", QString::number(uiWidConfig.checkBox_tooltip->checkState()));
cg.writeEntry("tooltipWidth", QString::number(uiWidConfig.spinBox_tooltip->value())); cg.writeEntry("tooltipWidth", QString::number(uiWidConfig.spinBox_tooltip->value()));
cg.writeEntry("tooltipColor", uiWidConfig.kcolorcombo_tooltipColor->color().name());
cg.writeEntry("background", QString::number(uiWidConfig.checkBox_background->checkState())); cg.writeEntry("background", QString::number(uiWidConfig.checkBox_background->checkState()));
cg.writeEntry("layout", QString::number(uiWidConfig.checkBox_layout->checkState())); cg.writeEntry("layout", QString::number(uiWidConfig.checkBox_layout->checkState()));
cg.writeEntry("mark", uiWidConfig.comboBox_mark->currentText()); cg.writeEntry("mark", uiWidConfig.comboBox_mark->currentText());
@ -513,6 +516,7 @@ void DesktopPanel::configChanged()
configuration[QString("pattern")] = cg.readEntry("pattern", "[$fullmark$number/$total: $name]"); configuration[QString("pattern")] = cg.readEntry("pattern", "[$fullmark$number/$total: $name]");
configuration[QString("tooltip")] = cg.readEntry("tooltip", "2"); configuration[QString("tooltip")] = cg.readEntry("tooltip", "2");
configuration[QString("tooltipWidth")] = cg.readEntry("tooltipWidth", "200"); configuration[QString("tooltipWidth")] = cg.readEntry("tooltipWidth", "200");
configuration[QString("tooltipColor")] = cg.readEntry("tooltipColor", "#ffffff");
configuration[QString("background")] = cg.readEntry("background", "2"); configuration[QString("background")] = cg.readEntry("background", "2");
configuration[QString("layout")] = cg.readEntry("layout", "0"); configuration[QString("layout")] = cg.readEntry("layout", "0");
configuration[QString("mark")] = cg.readEntry("mark", "¤"); configuration[QString("mark")] = cg.readEntry("mark", "¤");

47
sources/desktop-panel/widget.ui
View File

@ -20,14 +20,14 @@
<string notr="true">Widget</string> <string notr="true">Widget</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="6" column="0"> <item row="7" column="0">
<widget class="QCheckBox" name="checkBox_layout"> <widget class="QCheckBox" name="checkBox_layout">
<property name="text"> <property name="text">
<string>Vertical layout</string> <string>Vertical layout</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="9" column="0">
<layout class="QHBoxLayout" name="layout_mark"> <layout class="QHBoxLayout" name="layout_mark">
<item> <item>
<widget class="QLabel" name="label_mark"> <widget class="QLabel" name="label_mark">
@ -372,15 +372,56 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="checkBox_background"> <widget class="QCheckBox" name="checkBox_background">
<property name="text"> <property name="text">
<string>Enable background</string> <string>Enable background</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<layout class="QHBoxLayout" name="layout_tooltipColor">
<item>
<widget class="QLabel" name="label_tooltipColor">
<property name="text">
<string>Tooltip border color</string>
</property>
</widget>
</item>
<item>
<spacer name="spacer_tooltipColor">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="KColorCombo" name="kcolorcombo_tooltipColor">
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KColorCombo</class>
<extends>QComboBox</extends>
<header>kcolorcombo.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>