diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index d0281ca..31f15bf 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -28,7 +28,6 @@ #include "awdebug.h" #include "awupdatehelper.h" -#include "version.h" AWActions::AWActions(QObject *parent) diff --git a/sources/awesome-widget/plugin/awfloatformatter.cpp b/sources/awesome-widget/plugin/awfloatformatter.cpp index 6663e99..7a6fe2c 100644 --- a/sources/awesome-widget/plugin/awfloatformatter.cpp +++ b/sources/awesome-widget/plugin/awfloatformatter.cpp @@ -35,7 +35,8 @@ AWFloatFormatter::AWFloatFormatter(QObject *parent, const QString filename, AWFloatFormatter::AWFloatFormatter(QObject *parent, const QChar fillChar, const char format, const double multiplier, - const int precision, const int width) + const int precision, const double summand, + const int width) : AWAbstractFormatter(parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; @@ -44,6 +45,7 @@ AWFloatFormatter::AWFloatFormatter(QObject *parent, const QChar fillChar, setFormat(format); setMultiplier(multiplier); setPrecision(precision); + setSummand(summand); setWidth(width); } @@ -58,8 +60,8 @@ QString AWFloatFormatter::convert(const QVariant &value) const { qCDebug(LOG_AW) << "Convert value" << value; - return QString("%1").arg(value.toDouble() * m_multiplier, m_width, m_format, - m_precision, m_fillChar); + return QString("%1").arg(value.toDouble() * m_multiplier + m_summand, + m_width, m_format, m_precision, m_fillChar); } @@ -87,6 +89,12 @@ int AWFloatFormatter::precision() const } +double AWFloatFormatter::summand() const +{ + return m_summand; +} + + int AWFloatFormatter::width() const { return m_width; @@ -131,6 +139,14 @@ void AWFloatFormatter::setPrecision(const int _precision) } +void AWFloatFormatter::setSummand(const double _summand) +{ + qCDebug(LOG_AW) << "Set summand" << _summand; + + m_summand = _summand; +} + + void AWFloatFormatter::setWidth(const int _width) { qCDebug(LOG_AW) << "Set width" << _width; @@ -154,6 +170,7 @@ void AWFloatFormatter::init(const QString filename, const QString section) .toLatin1()); setMultiplier(settings.value(QString("Multiplier"), 1.0).toDouble()); setPrecision(settings.value(QString("Precision"), -1).toInt()); + setSummand(settings.value(QString("Summand"), 0.0).toDouble()); setWidth(settings.value(QString("Width"), 0).toInt()); settings.endGroup(); } diff --git a/sources/awesome-widget/plugin/awfloatformatter.h b/sources/awesome-widget/plugin/awfloatformatter.h index 1222dd5..2ee36c8 100644 --- a/sources/awesome-widget/plugin/awfloatformatter.h +++ b/sources/awesome-widget/plugin/awfloatformatter.h @@ -28,6 +28,7 @@ class AWFloatFormatter : public AWAbstractFormatter Q_PROPERTY(char format READ format WRITE setFormat) Q_PROPERTY(double multiplier READ multiplier WRITE setMultiplier) Q_PROPERTY(int precision READ precision WRITE setPrecision) + Q_PROPERTY(double summand READ summand WRITE setSummand) Q_PROPERTY(int width READ width WRITE setWidth) public: @@ -35,7 +36,8 @@ public: const QString section); explicit AWFloatFormatter(QObject *parent, const QChar fillChar, const char format, const double multiplier, - const int precision, const int width); + const int precision, const double summand, + const int width); virtual ~AWFloatFormatter(); QString convert(const QVariant &value) const; // properties @@ -43,11 +45,13 @@ public: char format() const; double multiplier() const; int precision() const; + double summand() const; int width() const; void setFillChar(const QChar _fillChar); void setFormat(char _format); void setMultiplier(const double _multiplier); void setPrecision(const int _precision); + void setSummand(const double _summand); void setWidth(const int _width); private: @@ -57,6 +61,7 @@ private: char m_format; double m_multiplier; int m_precision; + double m_summand; int m_width; }; diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index 9441aba..abab46c 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -25,7 +25,6 @@ #include "awdebug.h" #include "awkeycache.h" #include "awpatternfunctions.h" -#include "version.h" // extensions #include "extquotes.h" #include "extscript.h" diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 4ae1cb1..fd1c829 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -31,7 +31,6 @@ #include "awkeysaggregator.h" #include "awpatternfunctions.h" #include "graphicalitem.h" -#include "version.h" AWKeys::AWKeys(QObject *parent) diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index 5b48398..0f5f0c0 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -139,6 +139,10 @@ QString AWKeysAggregator::formatter(const QVariant &data, case FormatterType::TimeShort: output = loc.toString(data.toDateTime(), QLocale::ShortFormat); break; + case FormatterType::Timestamp: + output = QString("%1").arg( + data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0); + break; case FormatterType::Uptime: case FormatterType::UptimeCustom: output = @@ -537,6 +541,9 @@ QStringList AWKeysAggregator::registerSource(const QString &source, // short time m_map.insertMulti(source, QString("shorttime")); m_formatter[QString("shorttime")] = FormatterType::TimeShort; + // timestamp + m_map.insertMulti(source, QString("tstime")); + m_formatter[QString("tstime")] = FormatterType::Timestamp; } else if (source == QString("system/uptime")) { // uptime m_map[source] = QString("uptime"); diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h index 1cedf36..81ad9ca 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h @@ -61,6 +61,7 @@ class AWKeysAggregator : public QObject TimeISO, TimeLong, TimeShort, + Timestamp, Uptime, UptimeCustom }; diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp index b43001b..9ccd636 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.cpp +++ b/sources/awesome-widget/plugin/awupdatehelper.cpp @@ -29,7 +29,6 @@ #include #include "awdebug.h" -#include "version.h" AWUpdateHelper::AWUpdateHelper(QObject *parent) diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index b66f7ca..fc6abde 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -23,7 +23,6 @@ #include #include "awdebug.h" -#include "version.h" #include "abstractextitemaggregator.h" diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 46a69c6..473b2a1 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -31,7 +31,6 @@ #include #include "awdebug.h" -#include "version.h" ExtQuotes::ExtQuotes(QWidget *parent, const QString quotesName, diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index a859d26..a674ff3 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -28,7 +28,6 @@ #include #include "awdebug.h" -#include "version.h" ExtScript::ExtScript(QWidget *parent, const QString scriptName, diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index 33d79df..9c23963 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -26,7 +26,6 @@ #include #include "awdebug.h" -#include "version.h" ExtUpgrade::ExtUpgrade(QWidget *parent, const QString upgradeName, diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index d348a02..63f8c18 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -32,7 +32,6 @@ #include #include "awdebug.h" -#include "version.h" ExtWeather::ExtWeather(QWidget *parent, const QString weatherName, diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 0caae81..4579a06 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -30,7 +30,6 @@ #include "awdebug.h" #include "graphicalitemhelper.h" -#include "version.h" GraphicalItem::GraphicalItem(QWidget *parent, const QString desktopName, diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index f1e345c..21a551c 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -34,7 +34,6 @@ #include #include "awdebug.h" -#include "version.h" DPAdds::DPAdds(QObject *parent) diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp index 818f9a3..8727df8 100644 --- a/sources/extsysmon/extsysmon.cpp +++ b/sources/extsysmon/extsysmon.cpp @@ -25,7 +25,6 @@ #include "awdebug.h" #include "extsysmonaggregator.h" -#include "version.h" ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args) diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp index de0419d..e137548 100644 --- a/sources/extsysmon/extsysmonaggregator.cpp +++ b/sources/extsysmon/extsysmonaggregator.cpp @@ -31,7 +31,6 @@ #include "sources/quotessource.h" #include "sources/upgradesource.h" #include "sources/weathersource.h" -#include "version.h" ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent, diff --git a/sources/version.h.in b/sources/version.h.in index 10fe51b..9ba98f3 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -40,8 +40,8 @@ "dddd,ddd,dd,d,MMMM,MMM,MM,M,yyyy,yy,hh,h,HH,H,mm,m,ss,s,t,ap,a,AP,A" // static keys #define STATIC_KEYS \ - "time,isotime,shorttime,longtime,ctime,uptime,cuptime,cpucl,cpu,gputemp," \ - "gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," \ + "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu," \ + "gputemp,gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," \ "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb," \ "swap,downunits,upunits,downkb,downtotalkb,downtotal,down,uptotalkb," \ "uptotal,upkb,up,netdev,ac,bat,album,artist,duration,progress,title," \