arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-25 16:07:19 +00:00
Code Issues Projects Releases Wiki Activity

fix time and uptime

Browse Source
This commit is contained in:
arcan1s 2014-09-02 21:55:23 +04:00
parent b61d514cb2
commit 6c6cfe9a04
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,9 +260,9 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
// tooltip // tooltip
uiTooltipConfig.spinBox_tooltipNum->setValue(configuration[QString("tooltipNumber")].toInt()); uiTooltipConfig.spinBox_tooltipNum->setValue(configuration[QString("tooltipNumber")].toInt());
if (configuration[QString("useTooltipBackground")].toInt() == 0) if (configuration[QString("useTooltipBackground")].toInt() == 0)
uiAdvancedConfig.checkBox_background->setCheckState(Qt::Unchecked); uiTooltipConfig.checkBox_background->setCheckState(Qt::Unchecked);
else else
uiAdvancedConfig.checkBox_background->setCheckState(Qt::Checked); uiTooltipConfig.checkBox_background->setCheckState(Qt::Checked);
uiTooltipConfig.kcolorcombo_background->setColor(QColor(configuration[QString("tooltipBackground")])); uiTooltipConfig.kcolorcombo_background->setColor(QColor(configuration[QString("tooltipBackground")]));
if (configuration[QString("cpuTooltip")].toInt() == 0) if (configuration[QString("cpuTooltip")].toInt() == 0)
uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Unchecked); uiTooltipConfig.checkBox_cpu->setCheckState(Qt::Unchecked);

25
sources/awesome-widget/deinteraction.cpp
View File

@ -346,28 +346,29 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
break; break;
} }
} else if (sourceName == QString("Local")) { } else if (sourceName == QString("Local")) {
values[QString("time")] = data[QString("value")].toDateTime().toString(Qt::TextDate); values[QString("time")] = data[QString("DateTime")].toDateTime().toString(Qt::TextDate);
values[QString("isotime")] = data[QString("value")].toDateTime().toString(Qt::ISODate); values[QString("isotime")] = data[QString("DateTime")].toDateTime().toString(Qt::ISODate);
values[QString("shorttime")] = data[QString("value")].toDateTime().toString(Qt::SystemLocaleShortDate); values[QString("shorttime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleShortDate);
values[QString("longtime")] = data[QString("value")].toDateTime().toString(Qt::SystemLocaleLongDate); values[QString("longtime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleLongDate);
QStringList timeKeys = getTimeKeys(); QStringList timeKeys = getTimeKeys();
values[QString("ctime")] = configuration[QString("customTime")]; values[QString("ctime")] = configuration[QString("customTime")];
for (int i=0; i<timeKeys.count(); i++) for (int i=0; i<timeKeys.count(); i++)
values[QString("ctime")].replace(QString("$") + timeKeys[i] + QString("$"), values[QString("ctime")].replace(QString("$") + timeKeys[i] + QString("$"),
data[QString("value")].toDateTime().toString(timeKeys[i])); data[QString("DateTime")].toDateTime().toString(timeKeys[i]));
} else if (sourceName == QString("system/uptime")) { } else if (sourceName == QString("system/uptime")) {
int seconds = data[QString("value")].toInt() - data[QString("value")].toInt() % 60; int uptime = data[QString("value")].toFloat();
int seconds = uptime - uptime % 60;
int minutes = seconds / 60 % 60; int minutes = seconds / 60 % 60;
int hours = ((seconds / 60) - minutes) / 60 % 24; int hours = ((seconds / 60) - minutes) / 60 % 24;
int days = (((seconds / 60) - minutes) / 60 - hours) / 24; int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
values[QString("uptime")] = QString("%1d%2h%3m").arg(days, 3).arg(hours, 2).arg(minutes, 2); values[QString("uptime")] = QString("%1d%2h%3m").arg(days, 3).arg(hours, 2).arg(minutes, 2);
values[QString("cuptime")] = configuration[QString("customUptime")]; values[QString("cuptime")] = configuration[QString("customUptime")];
values[QString("cuptime")].replace(QString("$d$"), QString("%i").arg(days)); values[QString("cuptime")].replace(QString("$d$"), QString("%1").arg(days));
values[QString("cuptime")].replace(QString("$dd$"), QString("%03i").arg(days)); values[QString("cuptime")].replace(QString("$dd$"), QString("%1").arg(days, 3, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$h$"), QString("%i").arg(hours)); values[QString("cuptime")].replace(QString("$h$"), QString("%1").arg(hours));
values[QString("cuptime")].replace(QString("$hh$"), QString("%2i").arg(hours)); values[QString("cuptime")].replace(QString("$hh$"), QString("%1").arg(hours, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$m$"), QString("%2i").arg(minutes)); values[QString("cuptime")].replace(QString("$m$"), QString("%1").arg(minutes));
values[QString("cuptime")].replace(QString("$mm$"), QString("%02i").arg(minutes)); values[QString("cuptime")].replace(QString("$mm$"), QString("%1").arg(minutes, 2, 10, QChar('0')));
} }
} }

1
sources/awesome-widget/reinit.cpp
View File

@ -121,6 +121,7 @@ void AwesomeWidget::updateTooltip()
for (int i=0; i<tooltipValues[QString("up")].count(); i++) for (int i=0; i<tooltipValues[QString("up")].count(); i++)
if (boundaries[QString("down")] < tooltipValues[QString("up")][i]) if (boundaries[QString("down")] < tooltipValues[QString("up")][i])
boundaries[QString("down")] = tooltipValues[QString("up")][i]; boundaries[QString("down")] = tooltipValues[QString("up")][i];
boundaries[QString("down")] *= 1.2;
} }
boundaries[QString("up")] = boundaries[QString("down")]; boundaries[QString("up")] = boundaries[QString("down")];