diff --git a/sources/awesome-widget/advanced.ui b/sources/awesome-widget/advanced.ui index 210d6dc..76f7faa 100644 --- a/sources/awesome-widget/advanced.ui +++ b/sources/awesome-widget/advanced.ui @@ -490,27 +490,6 @@ $m - uptime minutes without zero - - scrollArea_advanced - checkBox_background - checkBox_layout - checkBox_popup - checkBox_leftStretch - checkBox_rightStretch - lineEdit_timeFormat - lineEdit_uptimeFormat - comboBox_tempUnits - listWidget_tempDevice - listWidget_mount - listWidget_hddSpeedDevice - listWidget_hddDevice - checkBox_netdev - comboBox_netdev - lineEdit_batdev - lineEdit_acOnline - lineEdit_acOffline - lineEdit_acdev - diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h index d38152b..b2a02ce 100644 --- a/sources/awesome-widget/awesome-widget.h +++ b/sources/awesome-widget/awesome-widget.h @@ -58,8 +58,6 @@ public slots: private slots: void reinit(); // configuration interface - void setNetworkDevice(); - void setTooltipBackground(); protected: void createConfigurationInterface(KConfigDialog *parent); diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 13ad47f..d0791f5 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -236,7 +236,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) uiAdvancedConfig.comboBox_netdev->setCurrentIndex( uiAdvancedConfig.comboBox_netdev->findText(configuration[QString("customNetdev")], Qt::MatchFixedString)); - setNetworkDevice(); uiAdvancedConfig.lineEdit_batdev->setText(configuration[QString("batteryDevice")]); uiAdvancedConfig.lineEdit_acdev->setText(configuration[QString("acDevice")]); uiAdvancedConfig.lineEdit_acOnline->setText(configuration[QString("acOnline")]); @@ -249,12 +248,35 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) else uiAdvancedConfig.checkBox_background->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_background->setColor(QColor(configuration[QString("tooltipBackground")])); - setTooltipBackground(); + if (configuration[QString("cpuTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_cpu->setColor(QColor(configuration[QString("cpuColor")])); + if (configuration[QString("cpuclockTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_cpuclock->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_cpuclock->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_cpuclock->setColor(QColor(configuration[QString("cpuclockColor")])); + if (configuration[QString("memTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_mem->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_mem->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_mem->setColor(QColor(configuration[QString("memColor")])); + if (configuration[QString("swapTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_swap->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_swap->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_swap->setColor(QColor(configuration[QString("swapColor")])); + if (configuration[QString("downTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_down->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_down->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_down->setColor(QColor(configuration[QString("downColor")])); + if (configuration[QString("upTooltip")].toInt() == 0) + uiTooltipConfig.checkBox_up->setCheckState(Qt::Unchecked); + else + uiTooltipConfig.checkBox_up->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_up->setColor(QColor(configuration[QString("upColor")])); // appearance @@ -378,11 +400,17 @@ void AwesomeWidget::configAccepted() cg.writeEntry("tooltipNumber", QString::number(uiTooltipConfig.spinBox_tooltipNum->value())); cg.writeEntry("useTooltipBackground", QString::number(uiTooltipConfig.checkBox_background->checkState())); cg.writeEntry("tooltipBackground", uiTooltipConfig.kcolorcombo_background->color().name()); + cg.writeEntry("cpuTooltip", QString::number(uiTooltipConfig.checkBox_cpu->checkState())); cg.writeEntry("cpuColor", uiTooltipConfig.kcolorcombo_cpu->color().name()); + cg.writeEntry("cpuclockTooltip", QString::number(uiTooltipConfig.checkBox_cpuclock->checkState())); cg.writeEntry("cpuclockColor", uiTooltipConfig.kcolorcombo_cpuclock->color().name()); + cg.writeEntry("memTooltip", QString::number(uiTooltipConfig.checkBox_mem->checkState())); cg.writeEntry("memColor", uiTooltipConfig.kcolorcombo_mem->color().name()); + cg.writeEntry("swapTooltip", QString::number(uiTooltipConfig.checkBox_swap->checkState())); cg.writeEntry("swapColor", uiTooltipConfig.kcolorcombo_swap->color().name()); + cg.writeEntry("downTooltip", QString::number(uiTooltipConfig.checkBox_down->checkState())); cg.writeEntry("downColor", uiTooltipConfig.kcolorcombo_down->color().name()); + cg.writeEntry("upTooltip", QString::number(uiTooltipConfig.checkBox_up->checkState())); cg.writeEntry("upColor", uiTooltipConfig.kcolorcombo_up->color().name()); // appearance @@ -454,11 +482,17 @@ void AwesomeWidget::configChanged() configuration[QString("tooltipNumber")] = cg.readEntry("tooltipNumber", "100"); configuration[QString("useTooltipBackground")] = cg.readEntry("useTooltipBackground", "2"); configuration[QString("tooltipBackground")] = cg.readEntry("tooltipBackground", "#ffffff"); + configuration[QString("cpuTooltip")] = cg.readEntry("cpuTooltip", "2"); configuration[QString("cpuColor")] = cg.readEntry("cpuColor", "#ff0000"); + configuration[QString("cpuclockTooltip")] = cg.readEntry("cpuclockTooltip", "2"); configuration[QString("cpuclockColor")] = cg.readEntry("cpuclockColor", "#00ff00"); + configuration[QString("memTooltip")] = cg.readEntry("memTooltip", "2"); configuration[QString("memColor")] = cg.readEntry("memColor", "#0000ff"); + configuration[QString("swapTooltip")] = cg.readEntry("swapTooltip", "2"); configuration[QString("swapColor")] = cg.readEntry("swapColor", "#ffff00"); + configuration[QString("downTooltip")] = cg.readEntry("downTooltip", "2"); configuration[QString("downColor")] = cg.readEntry("downColor", "#00ffff"); + configuration[QString("upTooltip")] = cg.readEntry("upTooltip", "2"); configuration[QString("upColor")] = cg.readEntry("upColor", "#ff00ff"); // appearance @@ -480,25 +514,3 @@ void AwesomeWidget::configChanged() reinit(); } - - -void AwesomeWidget::setNetworkDevice() -{ - if (debug) qDebug() << PDEBUG; - - if (uiAdvancedConfig.checkBox_netdev->checkState() == 0) - uiAdvancedConfig.comboBox_netdev->setDisabled(true); - else if (uiAdvancedConfig.checkBox_netdev->checkState() == 2) - uiAdvancedConfig.checkBox_netdev->setEnabled(true); -} - - -void AwesomeWidget::setTooltipBackground() -{ - if (debug) qDebug() << PDEBUG; - - if (uiTooltipConfig.checkBox_background->checkState() == 0) - uiTooltipConfig.kcolorcombo_cpu->setDisabled(true); - else if (uiTooltipConfig.checkBox_background->checkState() == 2) - uiTooltipConfig.kcolorcombo_cpu->setEnabled(true); -} diff --git a/sources/awesome-widget/deconfig.ui b/sources/awesome-widget/deconfig.ui index 30fc080..a087390 100644 --- a/sources/awesome-widget/deconfig.ui +++ b/sources/awesome-widget/deconfig.ui @@ -462,19 +462,6 @@ del - remove item - - scrollArea_dattaengine - tableWidget_customCommand - lineEdit_desktopCmd - comboBox_gpudev - comboBox_hdddev - lineEdit_hddtempCmd - lineEdit_mpdaddress - spinBox_mpdport - comboBox_mpris - comboBox_playerSelect - tableWidget_pkgCommand - diff --git a/sources/awesome-widget/tooltipconfig.ui b/sources/awesome-widget/tooltipconfig.ui index c8f2868..4c6a0c1 100644 --- a/sources/awesome-widget/tooltipconfig.ui +++ b/sources/awesome-widget/tooltipconfig.ui @@ -158,90 +158,10 @@ - - - - - - - 200 - 0 - - - - CPU clock color - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 180 - 0 - - - - - - - - - - - - - 200 - 0 - - - - Swap color - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 180 - 0 - - - - - - - + 200 @@ -251,6 +171,9 @@ CPU color + + true + @@ -279,9 +202,9 @@ - + - + 200 @@ -289,12 +212,15 @@ - Download speed color + CPU clock color + + + true - + Qt::Horizontal @@ -307,7 +233,7 @@ - + 180 @@ -321,7 +247,7 @@ - + 200 @@ -331,6 +257,9 @@ Memory color + + true + @@ -358,10 +287,96 @@ + + + + + + + 200 + 0 + + + + Swap color + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 180 + 0 + + + + + + + + + + + + + 200 + 0 + + + + Download speed color + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 180 + 0 + + + + + + - + 200 @@ -371,6 +386,9 @@ Upload speed color + + true + @@ -424,18 +442,6 @@
kcolorcombo.h
- - scrollArea_tooltip - spinBox_tooltipNum - checkBox_background - kcolorcombo_background - kcolorcombo_cpuclock - kcolorcombo_swap - kcolorcombo_cpu - kcolorcombo_down - kcolorcombo_mem - kcolorcombo_up -