diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml index 5e1f77c..79c6ddf 100644 --- a/sources/awesome-widget/package/contents/ui/main.qml +++ b/sources/awesome-widget/package/contents/ui/main.qml @@ -84,7 +84,7 @@ Item { // ui Text { id: text - anchors.fill: Layout + anchors.fill: Plasmoid.Layout renderType: Text.NativeRendering textFormat: Text.RichText wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml index cadc9e7..8b1d35b 100644 --- a/sources/awesome-widget/package/contents/ui/widget.qml +++ b/sources/awesome-widget/package/contents/ui/widget.qml @@ -71,7 +71,9 @@ Item { title: i18n("Select a color") onAccepted: { var text = textPattern.text - textPattern.text = "" + text + "" + textPattern.text = "" + + text + "" } } } @@ -292,10 +294,9 @@ Item { onClicked: { if (!tags.currentText) return if (debug) console.debug("Add tag button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, selected + "$" + tags.currentText) + textPattern.insert(textPattern.cursorPosition, selected + "$" + tags.currentText) } } QtControls.Button { diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp index cf2347b..11fdcd4 100644 --- a/sources/awesome-widget/plugin/awkeycache.cpp +++ b/sources/awesome-widget/plugin/awkeycache.cpp @@ -138,10 +138,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, if (used.contains(QString("swaptotgb"))) used << QString("swapgb") << QString("swapfreegb"); // network keys - QStringList netKeys(QStringList() << QString("up") << QString("upkb") - << QString("upunits") << QString("down") - << QString("downkb") - << QString("downunits")); + QStringList netKeys(QStringList() + << QString("up") << QString("upkb") + << QString("uptotal") << QString("uptotalkb") + << QString("upunits") << QString("down") + << QString("downkb") << QString("downtotal") + << QString("downtotalkb") << QString("downunits")); for (auto key : netKeys) { if (!used.contains(key)) continue; diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index e9e0d4c..9441aba 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -124,8 +124,12 @@ QStringList AWKeyOperations::dictKeys() const for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) { allKeys.append(QString("downunits%1").arg(i)); allKeys.append(QString("upunits%1").arg(i)); + allKeys.append(QString("downtotalkb%1").arg(i)); + allKeys.append(QString("downtotal%1").arg(i)); allKeys.append(QString("downkb%1").arg(i)); allKeys.append(QString("down%1").arg(i)); + allKeys.append(QString("uptotalkb%1").arg(i)); + allKeys.append(QString("uptotal%1").arg(i)); allKeys.append(QString("upkb%1").arg(i)); allKeys.append(QString("up%1").arg(i)); } diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 033d850..5667b76 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "awdataaggregator.h" #include "awdataengineaggregator.h" @@ -49,13 +50,16 @@ AWKeys::AWKeys(QObject *parent) dataEngineAggregator = new AWDataEngineAggregator(this); keyOperator = new AWKeyOperations(this); + m_timer = new QTimer(this); + m_timer->setSingleShot(false); + // update key data if required connect(keyOperator, SIGNAL(updateKeys(QStringList)), this, SLOT(reinitKeys(QStringList))); + connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData())); // transfer signal from AWDataAggregator object to QML ui connect(dataAggregator, SIGNAL(toolTipPainted(const QString)), this, SIGNAL(needToolTipToBeUpdated(const QString))); - connect(this, SIGNAL(needToBeUpdated()), this, SLOT(updateTextData())); connect(this, SIGNAL(dropSourceFromDataengine(QString)), dataEngineAggregator, SLOT(dropSource(QString))); // transfer signal from dataengine to update source list @@ -68,6 +72,9 @@ AWKeys::~AWKeys() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; + m_timer->stop(); + delete m_timer; + // core delete dataEngineAggregator; delete m_threadPool; @@ -103,7 +110,11 @@ void AWKeys::initKeys(const QString currentPattern, const int interval, keyOperator->updateCache(); dataEngineAggregator->clear(); - return dataEngineAggregator->initDataEngines(interval); + dataEngineAggregator->initDataEngines(interval); + + // timer + m_timer->setInterval(interval); + m_timer->start(); } @@ -183,12 +194,6 @@ void AWKeys::editItem(const QString type) void AWKeys::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data) { - // do not log these parameters - if (sourceName == QString("update")) { - qCInfo(LOG_AW) << "Update data"; - return emit(needToBeUpdated()); - } - // run concurrent data update QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName, data); @@ -268,9 +273,14 @@ void AWKeys::calculateValues() .indexOf(values[QString("netdev")].toString()); values[QString("down")] = values[QString("down%1").arg(netIndex)]; values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)]; + values[QString("downtotal")] = values[QString("downtotal%1").arg(netIndex)]; + values[QString("downtotalkb")] + = values[QString("downtotalkb%1").arg(netIndex)]; values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)]; values[QString("up")] = values[QString("up%1").arg(netIndex)]; values[QString("upkb")] = values[QString("upkb%1").arg(netIndex)]; + values[QString("uptotal")] = values[QString("uptotal%1").arg(netIndex)]; + values[QString("uptotalkb")] = values[QString("uptotalkb%1").arg(netIndex)]; values[QString("upunits")] = values[QString("upunits%1").arg(netIndex)]; // swaptot* diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index ace101f..5fdf556 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -30,6 +30,7 @@ class AWDataEngineAggregator; class AWKeyOperations; class AWKeysAggregator; class QThreadPool; +class QTimer; class AWKeys : public QObject { @@ -67,7 +68,6 @@ signals: void dropSourceFromDataengine(const QString source); void needTextToBeUpdated(const QString newText) const; void needToolTipToBeUpdated(const QString newText) const; - void needToBeUpdated(); private slots: void reinitKeys(const QStringList currentKeys); @@ -83,6 +83,7 @@ private: AWDataEngineAggregator *dataEngineAggregator = nullptr; AWKeysAggregator *aggregator = nullptr; AWKeyOperations *keyOperator = nullptr; + QTimer *m_timer = nullptr; // variables QVariantMap m_tooltipParams; QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys; diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index 791968f..608f417 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -247,6 +247,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source, QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace")); QRegExp netRegExp = QRegExp( QString("network/interfaces/.*/(receiver|transmitter)/data$")); + QRegExp netTotalRegExp = QRegExp( + QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$")); if (source == QString("battery/ac")) { // AC @@ -435,6 +437,22 @@ QStringList AWKeysAggregator::registerSource(const QString &source, m_map.insertMulti(source, key); m_formater[key] = FormaterType::NetSmartUnits; } + } else if (source.contains(netTotalRegExp)) { + // network data total + QString type = source.contains(QString("receiver")) ? QString("down") + : QString("up"); + int index + = m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]); + if (index > -1) { + // kb + QString key = QString("%1totalkb%2").arg(type).arg(index); + m_map[source] = key; + m_formater[key] = FormaterType::Integer; + // mb + key = QString("%1total%2").arg(type).arg(index); + m_map.insertMulti(source, key); + m_formater[key] = FormaterType::MemMBFormat; + } } else if (source.startsWith(QString("upgrade"))) { // package manager QString key = source; diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 7d033b2..0caae81 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -641,8 +641,8 @@ void GraphicalItem::translate() ui->label_customValue->setText(i18n("Value")); ui->label_max->setText(i18n("Max value")); ui->label_min->setText(i18n("Min value")); - ui->label_activeImageType->setText(i18n("Active image type")); - ui->label_inactiveImageType->setText(i18n("Inctive image type")); + ui->label_activeImageType->setText(i18n("Active filling type")); + ui->label_inactiveImageType->setText(i18n("Inctive filling type")); ui->label_type->setText(i18n("Type")); ui->label_count->setText(i18n("Points count")); ui->label_direction->setText(i18n("Direction")); diff --git a/sources/awesomewidgets/graphicalitem.ui b/sources/awesomewidgets/graphicalitem.ui index 3d80311..d98f907 100644 --- a/sources/awesomewidgets/graphicalitem.ui +++ b/sources/awesomewidgets/graphicalitem.ui @@ -226,7 +226,7 @@ - Active image type + Active filling type Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -261,7 +261,7 @@ - Inactive image type + Inactive filling type Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp index 7aea398..3faa0c4 100644 --- a/sources/awesomewidgets/graphicalitemhelper.cpp +++ b/sources/awesomewidgets/graphicalitemhelper.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -54,9 +55,9 @@ void GraphicalItemHelper::setParameters(const QString active, m_activePen.setBrush(QBrush(stringToColor(active))); } else { qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << active; - QPixmap pixmap = QPixmap(active); + QPixmap pixmap = QPixmap(QUrl(active).toLocalFile()); if (pixmap.isNull()) { - qCInfo(LOG_LIB) << "Invalid pixmap found" << active; + qCWarning(LOG_LIB) << "Invalid pixmap found" << active; m_activePen.setBrush(QBrush(QColor(0, 0, 0, 130))); } else { m_activePen.setBrush(QBrush(pixmap.scaled(width, height))); @@ -66,9 +67,9 @@ void GraphicalItemHelper::setParameters(const QString active, m_inactivePen.setBrush(QBrush(stringToColor(inactive))); } else { qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << inactive; - QPixmap pixmap = QPixmap(inactive); + QPixmap pixmap = QPixmap(QUrl(inactive).toLocalFile()); if (pixmap.isNull()) { - qCInfo(LOG_LIB) << "Invalid pixmap found" << inactive; + qCWarning(LOG_LIB) << "Invalid pixmap found" << inactive; m_inactivePen.setBrush(QBrush(QColor(255, 255, 255, 130))); } else { m_inactivePen.setBrush(QBrush(pixmap.scaled(width, height))); diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index 20f8732..5a1e9b6 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -57,7 +57,7 @@ Item { // ui GridLayout { - anchors.fill: parent + anchors.fill: Plasmoid.Layout columns: plasmoid.configuration.verticalLayout ? 1 : dpAdds.numberOfDesktops() rows: plasmoid.configuration.verticalLayout ? dpAdds.numberOfDesktops() : 1 diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml index cafccbf..77cd05c 100644 --- a/sources/desktop-panel/package/contents/ui/widget.qml +++ b/sources/desktop-panel/package/contents/ui/widget.qml @@ -17,6 +17,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls +import QtQuick.Dialogs 1.2 as QtDialogs import org.kde.plasma.private.desktoppanel 1.0 @@ -54,7 +55,24 @@ Item { height: implicitHeight width: parent.width QtControls.Button { - width: parent.width * 3 / 12 + width: parent.width * 3 / 15 + text: i18n("Bgcolor") + + onClicked: backgroundDialog.visible = true + + QtDialogs.ColorDialog { + id: backgroundDialog + title: i18n("Select a color") + onAccepted: { + var text = textPattern.text + textPattern.text = "" + + text + "" + } + } + } + QtControls.Button { + width: parent.width * 3 / 15 text: i18n("Font") iconName: "font" @@ -66,123 +84,119 @@ Item { "size": plasmoid.configuration.fontSize } var font = dpAdds.getFont(defaultFont) - var pos = textPattern.cursorPosition + if (font.applied != 1) { + if (debug) console.debug("No font selected") + return + } + var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "" + - selected + "") + textPattern.insert(textPattern.cursorPosition, + "" + + selected + "") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-indent-more" onClicked: { if (debug) console.debug("Indent button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, selected + "
\n") + textPattern.insert(textPattern.cursorPosition, selected + "
\n") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-text-bold" onClicked: { if (debug) console.debug("Bold button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "" + selected + "") + textPattern.insert(textPattern.cursorPosition, "" + selected + "") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-text-italic" onClicked: { if (debug) console.debug("Italic button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "" + selected + "") + textPattern.insert(textPattern.cursorPosition, "" + selected + "") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-text-underline" onClicked: { if (debug) console.debug("Underline button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "" + selected + "") + textPattern.insert(textPattern.cursorPosition, "" + selected + "") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-text-strikethrough" onClicked: { if (debug) console.debug("Strike button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "" + selected + "") + textPattern.insert(textPattern.cursorPosition, "" + selected + "") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-justify-left" onClicked: { if (debug) console.debug("Left button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "

" + selected + "

") + textPattern.insert(textPattern.cursorPosition, "

" + selected + "

") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-justify-center" onClicked: { if (debug) console.debug("Center button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "

" + selected + "

") + textPattern.insert(textPattern.cursorPosition, "

" + selected + "

") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-justify-right" onClicked: { if (debug) console.debug("Right button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "

" + selected + "

") + textPattern.insert(textPattern.cursorPosition, "

" + selected + "

") } } QtControls.Button { - width: parent.width / 12 + width: parent.width / 15 iconName: "format-justify-fill" onClicked: { if (debug) console.debug("Justify button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, "

" + selected + "

") + textPattern.insert(textPattern.cursorPosition, "

" + selected + "

") } } } @@ -201,10 +215,9 @@ Item { onClicked: { if (debug) console.debug("Add tag button") - var pos = textPattern.cursorPosition var selected = textPattern.selectedText textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) - textPattern.insert(pos, selected + "$" + tags.currentText) + textPattern.insert(textPattern.cursorPosition, selected + "$" + tags.currentText) } } QtControls.Button { diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 2c48887..f1e345c 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -318,11 +318,14 @@ QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const qCDebug(LOG_DP) << "Default font is" << defaultFont; QVariantMap fontMap; + int ret = 0; CFont defaultCFont = CFont(defaultFont[QString("family")].toString(), defaultFont[QString("size")].toInt(), 400, false, defaultFont[QString("color")].toString()); - CFont font - = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false); + CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, + false, &ret); + + fontMap[QString("applied")] = ret; fontMap[QString("color")] = font.color().name(); fontMap[QString("family")] = font.family(); fontMap[QString("size")] = font.pointSize(); diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp index 7a43d7e..de0419d 100644 --- a/sources/extsysmon/extsysmonaggregator.cpp +++ b/sources/extsysmon/extsysmonaggregator.cpp @@ -29,7 +29,6 @@ #include "sources/playersource.h" #include "sources/processessource.h" #include "sources/quotessource.h" -#include "sources/updatesource.h" #include "sources/upgradesource.h" #include "sources/weathersource.h" #include "version.h" @@ -140,10 +139,6 @@ void ExtSysMonAggregator::init(const QHash config) AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList()); for (auto source : quotesItem->sources()) m_map[source] = quotesItem; - // update - AbstractExtSysMonSource *updateItem = new UpdateSource(this, QStringList()); - for (auto source : updateItem->sources()) - m_map[source] = updateItem; // upgrade AbstractExtSysMonSource *upgradeItem = new UpgradeSource(this, QStringList()); diff --git a/sources/extsysmon/sources/updatesource.cpp b/sources/extsysmon/sources/updatesource.cpp deleted file mode 100644 index 709cc8c..0000000 --- a/sources/extsysmon/sources/updatesource.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/*************************************************************************** - * This file is part of awesome-widgets * - * * - * awesome-widgets is free software: you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation, either version 3 of the * - * License, or (at your option) any later version. * - * * - * awesome-widgets is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * - ***************************************************************************/ - - -#include "updatesource.h" - -#include "awdebug.h" - - -UpdateSource::UpdateSource(QObject *parent, const QStringList args) - : AbstractExtSysMonSource(parent, args) -{ - Q_ASSERT(args.count() == 0); - qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; -} - - -UpdateSource::~UpdateSource() -{ - qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; -} - - -QVariant UpdateSource::data(QString source) -{ - qCDebug(LOG_ESM) << "Source" << source; - - return true; -} - - -QVariantMap UpdateSource::initialData(QString source) const -{ - qCDebug(LOG_ESM) << "Source" << source; - - QVariantMap data; - if (source == QString("update")) { - data[QString("min")] = true; - data[QString("max")] = true; - data[QString("name")] = QString("Simple value which is always true"); - data[QString("type")] = QString("bool"); - data[QString("units")] = QString(""); - } - - return data; -} - - -QStringList UpdateSource::sources() const -{ - QStringList sources; - sources.append(QString("update")); - - return sources; -} diff --git a/sources/extsysmon/sources/updatesource.h b/sources/extsysmon/sources/updatesource.h deleted file mode 100644 index 521534d..0000000 --- a/sources/extsysmon/sources/updatesource.h +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** - * This file is part of awesome-widgets * - * * - * awesome-widgets is free software: you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation, either version 3 of the * - * License, or (at your option) any later version. * - * * - * awesome-widgets is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * - ***************************************************************************/ - -#ifndef UPDATESOURCE_H -#define UPDATESOURCE_H - -#include - -#include "abstractextsysmonsource.h" - - -class UpdateSource : public AbstractExtSysMonSource -{ -public: - explicit UpdateSource(QObject *parent, const QStringList args); - virtual ~UpdateSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; - void run(){}; - QStringList sources() const; -}; - - -#endif /* UPDATESOURCE_H */ diff --git a/sources/translations/awesome-widgets.pot b/sources/translations/awesome-widgets.pot index e7aa868..fb8cc48 100644 --- a/sources/translations/awesome-widgets.pot +++ b/sources/translations/awesome-widgets.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -330,6 +330,9 @@ msgid "" "awesome-widgets/\">project homepage" msgstr "" +msgid "Bgcolor" +msgstr "" + msgid "AC" msgstr "" @@ -547,9 +550,6 @@ msgstr "" msgid "Use images" msgstr "" -msgid "Points count" -msgstr "" - msgid "Use custom formula" msgstr "" @@ -562,27 +562,18 @@ msgstr "" msgid "Min value" msgstr "" -msgid "Use image for active" +msgid "Active filling type" msgstr "" -msgid "Active color" -msgstr "" - -msgid "Active image" -msgstr "" - -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "" - -msgid "Inactive image" +msgid "Inctive filling type" msgstr "" msgid "Type" msgstr "" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "" @@ -592,6 +583,12 @@ msgstr "" msgid "Width" msgstr "" +msgid "color" +msgstr "" + +msgid "image" +msgstr "" + msgid "Active desktop" msgstr "" diff --git a/sources/translations/en.po b/sources/translations/en.po index ca7507e..6b43fff 100644 --- a/sources/translations/en.po +++ b/sources/translations/en.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" -"PO-Revision-Date: 2016-04-06 14:40+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" +"PO-Revision-Date: 2016-04-29 12:21+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: English \n" "Language: ru\n" @@ -335,6 +335,9 @@ msgstr "" "Detailed information may be found on project homepage" +msgid "Bgcolor" +msgstr "Bgcolor" + msgid "AC" msgstr "AC" @@ -556,9 +559,6 @@ msgstr "Timestamp" msgid "Use images" msgstr "Use images" -msgid "Points count" -msgstr "Points count" - msgid "Use custom formula" msgstr "Use custom formula" @@ -571,27 +571,18 @@ msgstr "Max value" msgid "Min value" msgstr "Min value" -msgid "Use image for active" -msgstr "Use image for active" +msgid "Active filling type" +msgstr "Active filling type" -msgid "Active color" -msgstr "Active color" - -msgid "Active image" -msgstr "Active image" - -msgid "Use image for inactive" -msgstr "Use image for inactive" - -msgid "Inactive color" -msgstr "Inactive color" - -msgid "Inactive image" -msgstr "Inactive image" +msgid "Inctive filling type" +msgstr "Inctive filling type" msgid "Type" msgstr "Type" +msgid "Points count" +msgstr "Points count" + msgid "Direction" msgstr "Direction" @@ -601,6 +592,12 @@ msgstr "Height" msgid "Width" msgstr "Width" +msgid "color" +msgstr "color" + +msgid "image" +msgstr "image" + msgid "Active desktop" msgstr "Active desktop" @@ -642,6 +639,18 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" +#~ msgid "Use image for active" +#~ msgstr "Use image for active" + +#~ msgid "Active color" +#~ msgstr "Active color" + +#~ msgid "Use image for inactive" +#~ msgstr "Use image for inactive" + +#~ msgid "Inactive color" +#~ msgstr "Inactive color" + #~ msgid "Add lambda" #~ msgstr "Add lambda" diff --git a/sources/translations/es.po b/sources/translations/es.po index aac7c37..69729aa 100644 --- a/sources/translations/es.po +++ b/sources/translations/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Awesome widgets\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-09-26 22:07+0000\n" "Last-Translator: Ernesto Avilés Vázquez \n" "Language-Team: Spanish (http://www.transifex.com/arcanis/awesome-widgets/" @@ -340,6 +340,10 @@ msgstr "" "Puedes encontrar información detallada en el sitio del proyecto" +#, fuzzy +msgid "Bgcolor" +msgstr "Color de la CPU" + msgid "AC" msgstr "CA" @@ -561,9 +565,6 @@ msgstr "Marca de tiempo" msgid "Use images" msgstr "Usar imágenes" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Formato personalizado de hora" @@ -580,29 +581,19 @@ msgid "Min value" msgstr "Mostrar valor" #, fuzzy -msgid "Use image for active" -msgstr "Usar imágenes" - -msgid "Active color" -msgstr "Color de activo" - -#, fuzzy -msgid "Active image" +msgid "Active filling type" msgstr "Activo" -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "Color de inactivo" - #, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Escritorio inactivo" msgid "Type" msgstr "Tipo" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "Dirección" @@ -612,6 +603,14 @@ msgstr "Alto" msgid "Width" msgstr "Ancho" +#, fuzzy +msgid "color" +msgstr "Color de la CPU" + +#, fuzzy +msgid "image" +msgstr "Usar imágenes" + msgid "Active desktop" msgstr "Escritorio activo" @@ -653,5 +652,15 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "Tu correo electrónico" +#, fuzzy +#~ msgid "Use image for active" +#~ msgstr "Usar imágenes" + +#~ msgid "Active color" +#~ msgstr "Color de activo" + +#~ msgid "Inactive color" +#~ msgstr "Color de inactivo" + #~ msgid "Add lambda" #~ msgstr "Añadir lambda" diff --git a/sources/translations/fr.po b/sources/translations/fr.po index f90fad9..4652220 100644 --- a/sources/translations/fr.po +++ b/sources/translations/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-07-31 22:16+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: French \n" @@ -346,6 +346,10 @@ msgstr "" "D'avantage d'informations se trouvent sur la page du projet" +#, fuzzy +msgid "Bgcolor" +msgstr "Couleur processeur" + msgid "AC" msgstr "" @@ -579,9 +583,6 @@ msgstr "Durée" msgid "Use images" msgstr "" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Format de l'heure personnalisé" @@ -598,31 +599,20 @@ msgstr "Afficher la valeur" msgid "Min value" msgstr "Afficher la valeur" -msgid "Use image for active" -msgstr "" - #, fuzzy -msgid "Active color" +msgid "Active filling type" msgstr "Batterie" #, fuzzy -msgid "Active image" -msgstr "Batterie" - -msgid "Use image for inactive" -msgstr "" - -#, fuzzy -msgid "Inactive color" -msgstr "Batterie" - -#, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Bureau inactif" msgid "Type" msgstr "" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "" @@ -633,6 +623,13 @@ msgstr "léger" msgid "Width" msgstr "" +#, fuzzy +msgid "color" +msgstr "Couleur processeur" + +msgid "image" +msgstr "" + msgid "Active desktop" msgstr "Bureau actif" @@ -674,6 +671,14 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com mermouy@gmail.com" +#, fuzzy +#~ msgid "Active color" +#~ msgstr "Batterie" + +#, fuzzy +#~ msgid "Inactive color" +#~ msgstr "Batterie" + #~ msgid "Free space on %1 less than 10%" #~ msgstr "Espace libre sur %1 inférieur à 10%" diff --git a/sources/translations/nl.po b/sources/translations/nl.po index ee22e66..60e8781 100644 --- a/sources/translations/nl.po +++ b/sources/translations/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Awesome widgets\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-08-20 22:52+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Dutch \n" @@ -350,6 +350,10 @@ msgstr "" "Gedetailleerde informatie kan worden gevonden op de projectwebsite" +#, fuzzy +msgid "Bgcolor" +msgstr "CPU-kleur" + msgid "AC" msgstr "" @@ -579,9 +583,6 @@ msgstr "" msgid "Use images" msgstr "" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Aangepaste tijdsopmaak" @@ -597,29 +598,20 @@ msgstr "Waarde weergeven" msgid "Min value" msgstr "Waarde weergeven" -msgid "Use image for active" -msgstr "" - -msgid "Active color" +#, fuzzy +msgid "Active filling type" msgstr "Actieve kleur" #, fuzzy -msgid "Active image" -msgstr "Actieve kleur" - -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "Inactieve kleur" - -#, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Inactieve kleur" msgid "Type" msgstr "Type" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "Richting" @@ -629,6 +621,13 @@ msgstr "Hoogte" msgid "Width" msgstr "Breedte" +#, fuzzy +msgid "color" +msgstr "CPU-kleur" + +msgid "image" +msgstr "" + #, fuzzy msgid "Active desktop" msgstr "Actieve kleur" @@ -673,6 +672,12 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "vistausss@outlook.com" +#~ msgid "Active color" +#~ msgstr "Actieve kleur" + +#~ msgid "Inactive color" +#~ msgstr "Inactieve kleur" + #~ msgid "Free space on %1 less than 10%" #~ msgstr "De vrije ruimte op %1 is minder dan 10%" diff --git a/sources/translations/pl.po b/sources/translations/pl.po index 9b11341..8562705 100644 --- a/sources/translations/pl.po +++ b/sources/translations/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -335,6 +335,10 @@ msgstr "" "Szczegóły znajdziesz na stronie projektu" +#, fuzzy +msgid "Bgcolor" +msgstr "Kolor procesora" + msgid "AC" msgstr "Zasialnie zewnętrzne" @@ -555,9 +559,6 @@ msgstr "Znacznik czasu" msgid "Use images" msgstr "Użyj obrazków" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Twój format czasu" @@ -574,29 +575,19 @@ msgid "Min value" msgstr "Pokaż wartość" #, fuzzy -msgid "Use image for active" -msgstr "Użyj obrazków" - -msgid "Active color" -msgstr "Kolor aktywnego" - -#, fuzzy -msgid "Active image" +msgid "Active filling type" msgstr "Aktywny" -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "Kolor nieaktywnego" - #, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Nie aktywny pulpit" msgid "Type" msgstr "Typ" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "Kierunek" @@ -606,6 +597,14 @@ msgstr "Wysokość" msgid "Width" msgstr "Szerokość" +#, fuzzy +msgid "color" +msgstr "Kolor procesora" + +#, fuzzy +msgid "image" +msgstr "Użyj obrazków" + msgid "Active desktop" msgstr "AKtywny pulpit" @@ -647,5 +646,15 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "terminus@linux.pl" +#, fuzzy +#~ msgid "Use image for active" +#~ msgstr "Użyj obrazków" + +#~ msgid "Active color" +#~ msgstr "Kolor aktywnego" + +#~ msgid "Inactive color" +#~ msgstr "Kolor nieaktywnego" + #~ msgid "Add lambda" #~ msgstr "Dodaj różnicę" diff --git a/sources/translations/pt_BR.po b/sources/translations/pt_BR.po index a3ea0f8..61fb011 100644 --- a/sources/translations/pt_BR.po +++ b/sources/translations/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-07-31 22:21+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -347,6 +347,10 @@ msgstr "" "Informações detalhadas podem ser encontradas na página do projeto" +#, fuzzy +msgid "Bgcolor" +msgstr "Cor da CPU" + msgid "AC" msgstr "" @@ -570,9 +574,6 @@ msgstr "Hora" msgid "Use images" msgstr "" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Formato de hora personalizado" @@ -588,29 +589,20 @@ msgstr "Mostrar valor" msgid "Min value" msgstr "Mostrar valor" -msgid "Use image for active" -msgstr "" - -msgid "Active color" +#, fuzzy +msgid "Active filling type" msgstr "Cor ativa" #, fuzzy -msgid "Active image" -msgstr "Cor ativa" - -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "Cor inativa" - -#, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Desktop inativo" msgid "Type" msgstr "Tipo" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "Direção" @@ -620,6 +612,13 @@ msgstr "Altura" msgid "Width" msgstr "Largura" +#, fuzzy +msgid "color" +msgstr "Cor da CPU" + +msgid "image" +msgstr "" + msgid "Active desktop" msgstr "Desktop ativo" @@ -661,6 +660,12 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "under@insicuri.net" +#~ msgid "Active color" +#~ msgstr "Cor ativa" + +#~ msgid "Inactive color" +#~ msgstr "Cor inativa" + #~ msgid "Free space on %1 less than 10%" #~ msgstr "O espaço livre em %1 é menor que 10%" diff --git a/sources/translations/ru.po b/sources/translations/ru.po index 32b7369..d762281 100644 --- a/sources/translations/ru.po +++ b/sources/translations/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" -"PO-Revision-Date: 2016-04-06 14:41+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" +"PO-Revision-Date: 2016-04-29 12:22+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -335,6 +335,9 @@ msgstr "" "Подробная информация может быть найдена на домашней странице проекта" +msgid "Bgcolor" +msgstr "Цвет фона" + msgid "AC" msgstr "Адаптор питания" @@ -556,9 +559,6 @@ msgstr "Таймштамп" msgid "Use images" msgstr "Использовать изображения" -msgid "Points count" -msgstr "Количество точек" - msgid "Use custom formula" msgstr "Использовать свою формулу" @@ -571,27 +571,18 @@ msgstr "Максимальное значение" msgid "Min value" msgstr "Минимальное значение" -msgid "Use image for active" -msgstr "Использовать изображения для активной части" +msgid "Active filling type" +msgstr "Тип активного наполнения" -msgid "Active color" -msgstr "Активный цвет" - -msgid "Active image" -msgstr "Изображение активной части" - -msgid "Use image for inactive" -msgstr "Использовать изображение для неактивной части" - -msgid "Inactive color" -msgstr "Неактивный цвет" - -msgid "Inactive image" -msgstr "Изображение неактивной части" +msgid "Inctive filling type" +msgstr "Тип неактивного наполнения" msgid "Type" msgstr "Тип" +msgid "Points count" +msgstr "Количество точек" + msgid "Direction" msgstr "Направление" @@ -601,6 +592,12 @@ msgstr "Высота" msgid "Width" msgstr "Ширина" +msgid "color" +msgstr "цвет" + +msgid "image" +msgstr "изображение" + msgid "Active desktop" msgstr "Активный рабочий стол" @@ -642,6 +639,18 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" +#~ msgid "Use image for active" +#~ msgstr "Использовать изображения для активной части" + +#~ msgid "Active color" +#~ msgstr "Активный цвет" + +#~ msgid "Use image for inactive" +#~ msgstr "Использовать изображение для неактивной части" + +#~ msgid "Inactive color" +#~ msgstr "Неактивный цвет" + #~ msgid "Add lambda" #~ msgstr "Добавить лямбду" diff --git a/sources/translations/uk.po b/sources/translations/uk.po index 41443ee..0a12193 100644 --- a/sources/translations/uk.po +++ b/sources/translations/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-09-27 12:37+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Ukrainian \n" @@ -349,6 +349,10 @@ msgstr "" "Детальна інформація може бути знайдена на домашній сторінці проекту" +#, fuzzy +msgid "Bgcolor" +msgstr "Колір CPU" + msgid "AC" msgstr "Адаптер живлення" @@ -582,9 +586,6 @@ msgstr "Відмітка часу" msgid "Use images" msgstr "Використовувати зображення" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "Свій формат часу" @@ -601,31 +602,19 @@ msgid "Min value" msgstr "Показати значення" #, fuzzy -msgid "Use image for active" -msgstr "Використовувати зображення" - -#, fuzzy -msgid "Active color" -msgstr "Активний колір" - -#, fuzzy -msgid "Active image" +msgid "Active filling type" msgstr "Активний" -msgid "Use image for inactive" -msgstr "" - #, fuzzy -msgid "Inactive color" -msgstr "Неактивний колір" - -#, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "Неактивний робочий стіл" msgid "Type" msgstr "Тип" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "Напрямок" @@ -635,6 +624,14 @@ msgstr "Висота" msgid "Width" msgstr "Ширина" +#, fuzzy +msgid "color" +msgstr "Колір CPU" + +#, fuzzy +msgid "image" +msgstr "Використовувати зображення" + msgid "Active desktop" msgstr "Активний робочий стіл" @@ -676,6 +673,18 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "sarumyan@i.ua" +#, fuzzy +#~ msgid "Use image for active" +#~ msgstr "Використовувати зображення" + +#, fuzzy +#~ msgid "Active color" +#~ msgstr "Активний колір" + +#, fuzzy +#~ msgid "Inactive color" +#~ msgstr "Неактивний колір" + #~ msgid "Add lambda" #~ msgstr "Додати лямбду" diff --git a/sources/translations/zh.po b/sources/translations/zh.po index af74108..5d0e961 100644 --- a/sources/translations/zh.po +++ b/sources/translations/zh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" -"POT-Creation-Date: 2016-04-06 14:39+0300\n" +"POT-Creation-Date: 2016-04-29 12:21+0300\n" "PO-Revision-Date: 2015-07-31 22:24+0300\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" @@ -336,6 +336,10 @@ msgstr "" "详情请参照 项目主" "页" +#, fuzzy +msgid "Bgcolor" +msgstr "CPU 颜色" + msgid "AC" msgstr "电源" @@ -557,9 +561,6 @@ msgstr "时间" msgid "Use images" msgstr "使用图片" -msgid "Points count" -msgstr "" - #, fuzzy msgid "Use custom formula" msgstr "自定义时间格式" @@ -576,29 +577,19 @@ msgid "Min value" msgstr "显示值" #, fuzzy -msgid "Use image for active" -msgstr "使用图片" - -msgid "Active color" -msgstr "使用状态提示颜色" - -#, fuzzy -msgid "Active image" +msgid "Active filling type" msgstr "使用" -msgid "Use image for inactive" -msgstr "" - -msgid "Inactive color" -msgstr "未使用状态提示颜色" - #, fuzzy -msgid "Inactive image" +msgid "Inctive filling type" msgstr "未激活桌面" msgid "Type" msgstr "类型" +msgid "Points count" +msgstr "" + msgid "Direction" msgstr "方向" @@ -608,6 +599,14 @@ msgstr "高度" msgid "Width" msgstr "宽度" +#, fuzzy +msgid "color" +msgstr "CPU 颜色" + +#, fuzzy +msgid "image" +msgstr "使用图片" + msgid "Active desktop" msgstr "当前激活桌面" @@ -649,6 +648,16 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "用户邮箱" +#, fuzzy +#~ msgid "Use image for active" +#~ msgstr "使用图片" + +#~ msgid "Active color" +#~ msgstr "使用状态提示颜色" + +#~ msgid "Inactive color" +#~ msgstr "未使用状态提示颜色" + #~ msgid "Add lambda" #~ msgstr "添加 lambda" diff --git a/sources/version.h.in b/sources/version.h.in index b3f6ab9..10fe51b 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -43,9 +43,10 @@ "time,isotime,shorttime,longtime,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,down,upkb,up,netdev,ac,bat,album,artist," \ - "duration,progress,title,dalbum,dartist,dtitle,salbum,sartist,stitle," \ - "pscount,pstotal,ps,desktop,ndesktop,tdesktops,la15,la5,la1" + "swap,downunits,upunits,downkb,downtotalkb,downtotal,down,uptotalkb," \ + "uptotal,upkb,up,netdev,ac,bat,album,artist,duration,progress,title," \ + "dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstotal,ps,desktop," \ + "ndesktop,tdesktops,la15,la5,la1" #cmakedefine BUILD_FUTURE #cmakedefine BUILD_TESTING