fix test building

.gitignore

@@ -48,6 +48,3 @@ pkg
 # clion settings
 .idea
 cmake-build*
-
-# clang
-.cache

AUTHORS

@@ -13,4 +13,3 @@ Steve Lemuel (Chinese)
 Mariusz Kocoń (Polish)
 Ibnu Daru Aji (Indonesian)
 Antonio Vivace (Italian)
-@daveedmee (German)

CHANGELOG

@@ -1,19 +1,5 @@
-Ver.4.0.3:
-- drop qml definition to avoid compile errors
-
-Ver.4.0.2:
-+ German translation (#172, thanks to daveedmee)
-
-Ver.4.0.1:
-- temporary disable tooltip painting in main widget
-
 Ver.4.0.0:
 * migration to plasma 6
-* dialog windows have been replaced by notifications
-+ $gpuN keys have been added
-+ new key $ssid
-- $cuptime key has been removed in favour of $uptime
-- $gputemp key has been replaced by $gpuN
 
 Ver.3.5.0:
 + wayland support

README.md

@@ -75,5 +75,5 @@ Links
 * [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
 * Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
 * DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
-* Archlinux [AUR](https://aur.archlinux.org/packages/plasma6-applets-awesome-widgets) package
+* Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package
 * [OpenSuse](http://software.opensuse.org/search?q=awesome-widgets) packages, [KF5 OpenSuse](http://software.opensuse.org/package/plasma5-awesome-widgets) package

packages/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=plasma6-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=4.0.5
+pkgver=4.0.0alpha2
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('x86_64')
@@ -27,3 +27,5 @@ build () {
 package() {
       DESTDIR="$pkgdir" cmake --install build
 }
+
+sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

sources/CMakeLists.txt

@@ -19,7 +19,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
 set(PROJECT_VERSION_MAJOR "4")
 set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "5")
+set(PROJECT_VERSION_PATCH "0")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

sources/awdebug.cpp

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif /* NDEBUG */
+
 #include <KI18n/KLocalizedString>
 
 #include "awdebug.h"

sources/awesome-widget/package/contents/ui/main.qml

@@ -130,7 +130,7 @@ PlasmoidItem {
         Plasmoid.userConfiguringChanged(false)
         // connect data
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
-        //awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
+        awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
         // check updates if required
         if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }

sources/awesome-widget/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.awesomewidget",
         "License": "GPLv3",
         "Name": "Awesome Widget",
-        "Version": "4.0.5",
+        "Version": "4.0.0",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -34,7 +34,7 @@ public:
     [[nodiscard]] QStringList sources() const;
     [[nodiscard]] QStringList refinedSources() const;
     // configuration related
-    void editPairs() override {};
+    void editPairs() override{};
     QStringList leftKeys() override;
     QStringList rightKeys() override;
 };

sources/awesome-widget/plugin/awdataaggregator.h

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <QObject>
 #include <QVariant>
 
 

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -95,55 +95,14 @@ void AWDataEngineAggregator::loadSources()
 }
 
 
-void AWDataEngineAggregator::registerClient(QObject *_client)
-{
-    qCDebug(LOG_AW) << "Register client" << _client;
-
-    // register new client
-    m_clients.insert(_client);
-    // (re)connect sources for new client
-    connectSources();
-}
-
-
-void AWDataEngineAggregator::unregisterClient(QObject *_client)
-{
-    qCDebug(LOG_AW) << "Unregister client" << _client;
-
-    m_clients.remove(_client);
-    for (auto [source, clients] : m_droppedBy.asKeyValueRange()) {
-        if (clients.remove(_client)) {
-            if (isSubscriptionUnused(source))
-                dropSource(source);
-        }
-    }
-}
-
-
 void AWDataEngineAggregator::dropSource(const QString &_source)
 {
     qCDebug(LOG_AW) << "Disconnect sensor" << _source;
 
-    if (m_subscribed.remove(_source))
+    if (m_subscribed.contains(_source)) {
         m_interface->unsubscribe({_source}).waitForFinished();
-}
-
-
-void AWDataEngineAggregator::dropSourceForClient(QObject *_client, const QString &_source)
-{
-    qCDebug(LOG_AW) << "Client" << _client << "dropping source" << _source;
-
-    m_droppedBy[_source].insert(_client);
-
-    // only unsubscribe if ALL clients have dropped this source
-    if (isSubscriptionUnused(_source))
-        dropSource(_source);
-}
-
-
-bool AWDataEngineAggregator::isSubscriptionUnused(const QString &_source) const
-{
-    return m_droppedBy.value(_source).size() >= m_clients.size() && !m_clients.isEmpty();
+        m_subscribed.remove(_source);
+    }
 }
 
 

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -23,7 +23,6 @@
 #include <QObject>
 #include <QSet>
 
-#include <memory>
 
 namespace KSysGuard::SystemStats
 {
@@ -35,26 +34,12 @@ class AWDataEngineAggregator : public QObject
     Q_OBJECT
 
 public:
+    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
     ~AWDataEngineAggregator() override;
-
-    AWDataEngineAggregator(AWDataEngineAggregator &) = delete;
-    void operator=(const AWDataEngineAggregator &) = delete;
-
-    [[nodiscard]] static AWDataEngineAggregator *instance(QObject *_client)
-    {
-        static auto instance = loadInstance();
-        instance->registerClient(_client);
-        return instance.get();
-    };
-
     void connectSources();
     void disconnectSources();
-    void dropSourceForClient(QObject *_client, const QString &_source);
-    [[nodiscard]] inline bool isSubscriptionUnused(const QString &_source) const;
     [[nodiscard]] static bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
     void loadSources();
-    void registerClient(QObject *_client);
-    void unregisterClient(QObject *_client);
 
 signals:
     void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
@@ -67,18 +52,7 @@ public slots:
     void updateData(const KSysGuard::SensorDataList &_data);
     void updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors);
 
-protected:
-    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
-
-    [[nodiscard]] static std::unique_ptr<AWDataEngineAggregator> loadInstance()
-    {
-        auto instance = new AWDataEngineAggregator();
-        return std::unique_ptr<AWDataEngineAggregator>(instance);
-    };
-
 private:
-    QSet<QObject *> m_clients;
-    QHash<QString, QSet<QObject *>> m_droppedBy;
     KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
     QHash<QString, KSysGuard::SensorInfo> m_sensors;
     QSet<QString> m_subscribed;

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -43,10 +43,6 @@ AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_cus
     m_formatter["uptot"] = AWPluginFormatterMemoryMB::instance();
     m_formatter["uptotkb"] = AWPluginFormatterMemory::instance();
     m_formatter["upunits"] = AWPluginFormatterNetUnits::instance();
-    // gpu memory
-    m_formatter["gpumem"] = AWPluginFormatterFloat::instance();
-    m_formatter["gpufreemb"] = AWPluginFormatterMemoryMB::instance();
-    m_formatter["gpufreegb"] = AWPluginFormatterMemoryGB::instance();
 }
 
 
@@ -69,7 +65,7 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
 // HACK units required to define should the value be calculated as temperature
 // or fan data
 QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                               const QStringList &_keys, const bool _disconnectUnused)
+                                               const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
@@ -95,7 +91,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 
     // check if keys were actually requested
     qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
-    auto required = !_disconnectUnused
+    auto required = _keys.isEmpty()
                     || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
     if (!required)
         return {};
@@ -113,12 +109,4 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 void AWDataEngineMapper::setDevices(const AWPluginMatcherSettings &_settings)
 {
     m_settings = _settings;
-
-    // update formatters
-    // gpu memory per device
-    for (auto i = 0; i < m_settings.gpu.count(); ++i) {
-        m_formatter[QString("gpumem%1").arg(i)] = AWPluginFormatterFloat::instance();
-        m_formatter[QString("gpufreemb%1").arg(i)] = AWPluginFormatterMemoryMB::instance();
-        m_formatter[QString("gpufreegb%1").arg(i)] = AWPluginFormatterMemoryGB::instance();
-    }
 }

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -39,8 +39,7 @@ public:
     [[nodiscard]] AWPluginFormaterInterface *formatter(const QString &_key) const;
     [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
     // set methods
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys,
-                               const bool _disconnectUnused);
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
     void setDevices(const AWPluginMatcherSettings &_settings);
 
 private:

sources/awesome-widget/plugin/awkeycache.cpp

@@ -70,12 +70,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
     qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
 
     // initial copy
-    QSet used(_keys.cbegin(), _keys.cend());
+    QSet<QString> used(_keys.cbegin(), _keys.cend());
     used.unite(QSet(_bars.cbegin(), _bars.cend()));
     used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
     // insert keys from tooltip
     for (auto [key, value] : _tooltip.asKeyValueRange()) {
-        if (key.endsWith("Tooltip") && value.toBool()) {
+        if ((key.endsWith("Tooltip")) && value.toBool()) {
             auto local = key;
             local.remove("Tooltip");
             used << local;
@@ -84,7 +84,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 
     // insert keys which depend on others, refer to AWKeys::calculateValues()
     // network keys
-    static QStringList netKeys(
+    QStringList netKeys(
         {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
     for (auto &key : netKeys) {
         if (!used.contains(key))
@@ -96,13 +96,11 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
     // netdev key
     if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](auto &key) { return used.contains(key); }))
         used << "netdev";
-    // gpu memory keys
-    static auto gpuMemoryCalculatedRegExp = QRegularExpression("^gpu(mem|freemb|freegb)");
-    for (auto key : _keys.filter(gpuMemoryCalculatedRegExp)) {
-        auto index = key.remove(gpuMemoryCalculatedRegExp);
-        used << QString("gpuusedmb%1").arg(index) << QString("gputotmb%1").arg(index)
-             << QString("gpuusedgb%1").arg(index) << QString("gputotgb%1").arg(index);
-    }
+
+    // HACK append dummy if there are no other keys. This hack is required
+    // because empty list leads to the same behaviour as skip checking
+    if (used.isEmpty())
+        used << "dummy";
 
     return used.values();
 }

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -85,13 +85,6 @@ QStringList AWKeyOperations::dictKeys() const
     // gpu
     for (auto i = 0; i < m_devices.gpu.count(); ++i) {
         allKeys.append(QString("gpu%1").arg(i));
-        allKeys.append(QString("gpumem%1").arg(i));
-        allKeys.append(QString("gpufreemb%1").arg(i));
-        allKeys.append(QString("gpufreegb%1").arg(i));
-        allKeys.append(QString("gputotmb%1").arg(i));
-        allKeys.append(QString("gputotgb%1").arg(i));
-        allKeys.append(QString("gpuusedmb%1").arg(i));
-        allKeys.append(QString("gpuusedgb%1").arg(i));
         allKeys.append(QString("gputemp%1").arg(i));
     }
     // hdd

sources/awesome-widget/plugin/awkeys.cpp

@@ -43,7 +43,7 @@ AWKeys::AWKeys(QObject *_parent)
 
     m_aggregator = new AWKeysAggregator(this);
     m_dataAggregator = new AWDataAggregator(this);
-    m_dataEngineAggregator = AWDataEngineAggregator::instance(this);
+    m_dataEngineAggregator = new AWDataEngineAggregator(this);
     m_keyOperator = new AWKeyOperations(this);
 
     m_timer = new QTimer(this);
@@ -59,8 +59,7 @@ AWKeys::AWKeys(QObject *_parent)
     connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
             [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
 
-    connect(this, &AWKeys::dropSourceFromDataengine, this,
-            [this](const QString &_source) { m_dataEngineAggregator->dropSourceForClient(this, _source); });
+    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
     connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
     connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
@@ -71,8 +70,6 @@ AWKeys::~AWKeys()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_dataEngineAggregator->unregisterClient(this);
-
     m_timer->stop();
     // delete dbus session
     auto id = reinterpret_cast<qlonglong>(this);
@@ -209,8 +206,9 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys = AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
-                                                 m_keyOperator->requiredUserKeys(), _currentKeys);
+    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+                                                              m_keyOperator->requiredUserKeys(), _currentKeys)
+                                : QStringList();
 
     // set key data to m_aggregator
     m_aggregator->setDevices(m_keyOperator->devices());
@@ -248,19 +246,6 @@ void AWKeys::calculateValues()
     m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)];
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
-    // gpu memory keys
-    m_values["gpufreemb"] = m_values["gputotmb"].toLongLong() - m_values["gpuusedmb"].toLongLong();
-    m_values["gpufreegb"] = m_values["gputotgb"].toDouble() - m_values["gpuusedgb"].toDouble();
-    m_values["gpumem"] = 100.0 * m_values["gpuusedmb"].toDouble() / m_values["gputotmb"].toDouble();
-    for (auto i = 0; i < devices.gpu.count(); ++i) {
-        m_values[QString("gpufreemb%1").arg(i)] = m_values[QString("gputotmb%1").arg(i)].toLongLong()
-                                                  - m_values[QString("gpuusedmb%1").arg(i)].toLongLong();
-        m_values[QString("gpufreegb%1").arg(i)]
-            = m_values[QString("gputotgb%1").arg(i)].toDouble() - m_values[QString("gpuusedgb%1").arg(i)].toDouble();
-        m_values[QString("gpumem%1").arg(i)] = 100.0 * m_values[QString("gpuusedmb%1").arg(i)].toDouble()
-                                               / m_values[QString("gputotmb%1").arg(i)].toDouble();
-    }
-
     // user defined keys
     for (auto &key : m_keyOperator->userKeys())
         m_values[key] = m_values[m_keyOperator->userKeySource(key)];
@@ -310,8 +295,8 @@ QString AWKeys::parsePattern(QString _pattern) const
     // bars
     for (auto &bar : m_foundBars) {
         auto item = m_keyOperator->giByKey(bar);
-        auto image = item->isCustom() ? item->image(AWPatternFunctions::expandLambdas(item->bar(), m_aggregator,
-                                                                                      m_values, item->usedKeys()))
+        auto image = item->isCustom() ? item->image(
+                         AWPatternFunctions::expandLambdas(item->bar(), m_aggregator, m_values, item->usedKeys()))
                                       : item->image(m_values[item->bar()]);
         _pattern.replace(QString("$%1").arg(bar), image);
     }
@@ -332,7 +317,7 @@ void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo
     // first list init
     auto tags = m_aggregator->keysFromSource(_source);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys, m_optimize);
+        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -151,9 +151,9 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 
 
 QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                             const QStringList &_keys, const bool _disconnectUnused)
+                                             const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
-    return m_mapper->registerSource(_source, _units, _keys, _disconnectUnused);
+    return m_mapper->registerSource(_source, _units, _keys);
 }

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -61,8 +61,7 @@ public:
     void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys,
-                               const bool _disconnectUnused);
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
 
 private:
     AWPluginFormatSettings m_settings;

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -17,9 +17,6 @@
 
 #include "awupdatehelper.h"
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif /* NDEBUG */
 #include <KI18n/KLocalizedString>
 #include <KNotifications/KNotification>
 

sources/awesome-widget/plugin/formatters/awpluginformatter.h

@@ -32,7 +32,7 @@ public:
     [[nodiscard]] virtual QString format(const QVariant &_value, const QString &_key,
                                          const AWPluginFormatSettings &_settings) const
         = 0;
-    virtual void load() {};
+    virtual void load(){};
 };
 
 

sources/awesome-widget/plugin/formatters/formatters.h

@@ -15,8 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
-
 #include "awpluginformatterac.h"
 #include "awpluginformattercustom.h"
 #include "awpluginformatterdouble.h"

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemorytotal.cpp

@@ -1,36 +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 "awpluginmatchergpumemorytotal.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPUMemoryTotal::keys(const QString &, const KSysGuard::Unit,
-                                                                                const AWPluginMatcherSettings &) const
-{
-    return {
-        {"gputotmb", AWPluginFormatterMemoryMB::instance()},
-        {"gputotgb", AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherGPUMemoryTotal::matches(const QString &_source) const
-{
-    return _source == "gpu/all/totalVram";
-}

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemorytotal.h

@@ -1,29 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherGPUMemoryTotal : public AWPluginMatcher<AWPluginMatcherGPUMemoryTotal>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemorytotalcore.cpp

@@ -1,44 +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 "awpluginmatchergpumemorytotalcore.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *>
-AWPluginMatcherGPUMemoryTotalCore::keys(const QString &_source, const KSysGuard::Unit,
-                                        const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.gpu);
-    if (index == -1)
-        return {};
-
-    return {
-        {QString("gputotmb%1").arg(index), AWPluginFormatterMemoryMB::instance()},
-        {QString("gputotgb%1").arg(index), AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherGPUMemoryTotalCore::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^gpu/gpu.*/totalVram$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemorytotalcore.h

@@ -1,29 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherGPUMemoryTotalCore : public AWPluginMatcher<AWPluginMatcherGPUMemoryTotalCore>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemoryused.cpp

@@ -1,36 +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 "awpluginmatchergpumemoryused.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPUMemoryUsed::keys(const QString &, const KSysGuard::Unit,
-                                                                               const AWPluginMatcherSettings &) const
-{
-    return {
-        {"gpuusedmb", AWPluginFormatterMemoryMB::instance()},
-        {"gpuusedgb", AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherGPUMemoryUsed::matches(const QString &_source) const
-{
-    return _source == "gpu/all/usedVram";
-}

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemoryused.h

@@ -1,29 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherGPUMemoryUsed : public AWPluginMatcher<AWPluginMatcherGPUMemoryUsed>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemoryusedcore.cpp

@@ -1,44 +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 "awpluginmatchergpumemoryusedcore.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *>
-AWPluginMatcherGPUMemoryUsedCore::keys(const QString &_source, const KSysGuard::Unit,
-                                       const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.gpu);
-    if (index == -1)
-        return {};
-
-    return {
-        {QString("gpuusedmb%1").arg(index), AWPluginFormatterMemoryMB::instance()},
-        {QString("gpuusedgb%1").arg(index), AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherGPUMemoryUsedCore::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^gpu/gpu.*/usedVram$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatchergpumemoryusedcore.h

@@ -1,29 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherGPUMemoryUsedCore : public AWPluginMatcher<AWPluginMatcherGPUMemoryUsedCore>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/matchers.h

@@ -15,8 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
-
 #include "awpluginmatcherac.h"
 #include "awpluginmatcherbattery.h"
 #include "awpluginmatcherbrightness.h"
@@ -30,10 +28,6 @@
 #include "awpluginmatcherdesktopnumber.h"
 #include "awpluginmatchergpu.h"
 #include "awpluginmatchergpucore.h"
-#include "awpluginmatchergpumemorytotal.h"
-#include "awpluginmatchergpumemorytotalcore.h"
-#include "awpluginmatchergpumemoryused.h"
-#include "awpluginmatchergpumemoryusedcore.h"
 #include "awpluginmatchergputemperature.h"
 #include "awpluginmatcherhdd.h"
 #include "awpluginmatcherhddfree.h"
@@ -86,10 +80,6 @@ static QList<AWPluginMatcherInterface *> matchers = {
     AWPluginMatcherDesktopNumber::instance(),
     AWPluginMatcherGPU::instance(),
     AWPluginMatcherGPUCore::instance(),
-    AWPluginMatcherGPUMemoryTotal::instance(),
-    AWPluginMatcherGPUMemoryTotalCore::instance(),
-    AWPluginMatcherGPUMemoryUsed::instance(),
-    AWPluginMatcherGPUMemoryUsedCore::instance(),
     AWPluginMatcherGPUTemperature::instance(),
     AWPluginMatcherHDD::instance(),
     AWPluginMatcherHDDFree::instance(),

sources/awesomewidgets/CMakeLists.txt

@@ -30,7 +30,6 @@ configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPR
 
 qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
-set_property(TARGET ${SUBPROJECT} PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
 # install

sources/awesomewidgets/graphicalitem.cpp

@@ -436,7 +436,7 @@ int GraphicalItem::showConfiguration(QWidget *_parent, const QVariant &_args)
     auto ui = new Ui::GraphicalItem();
     ui->setupUi(dialog);
 
-    connect(ui->checkBox_custom, &QCheckBox::checkStateChanged, [ui](const int state) { changeValue(ui, state); });
+    connect(ui->checkBox_custom, &QCheckBox::stateChanged, [ui](const int state) { changeValue(ui, state); });
     connect(ui->comboBox_type, &QComboBox::currentIndexChanged, [ui](const int state) { changeCountState(ui, state); });
     connect(ui->toolButton_activeColor, &QToolButton::clicked, [this, ui]() { changeColor(ui); });
     connect(ui->toolButton_inactiveColor, &QToolButton::clicked, [this, ui]() { changeColor(ui); });
@@ -472,7 +472,7 @@ int GraphicalItem::showConfiguration(QWidget *_parent, const QVariant &_args)
 
     // update UI
     emit(ui->comboBox_type->currentIndexChanged(ui->comboBox_type->currentIndex()));
-    emit(ui->checkBox_custom->checkStateChanged(ui->checkBox_custom->checkState()));
+    emit(ui->checkBox_custom->stateChanged(ui->checkBox_custom->checkState()));
 
     int ret = dialog->exec();
     if (ret == 1) {

sources/awtranslation.h

@@ -21,4 +21,4 @@
 
 #ifndef ui_i18n
 #define ui_i18n(text, parent) i18n(text)
-#endif /* ui_i18n */
+#endif

sources/desktop-panel/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.desktoppanel",
         "License": "GPLv3",
         "Name": "Desktop Panel",
-        "Version": "4.0.5",
+        "Version": "4.0.0",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/extsysmonsources/CMakeLists.txt

@@ -15,5 +15,4 @@ file(GLOB SUBPROJECT_SOURCE *.cpp)
 file(GLOB SUBPROJECT_HEADER *.h)
 
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER})
-set_property(TARGET ${SUBPROJECT} PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})

sources/extsysmonsources/systeminfosource.cpp

@@ -128,8 +128,8 @@ QVariant SystemInfoSource::sendDBusRequest(const QString &_destination, const QS
 
     auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
 
-    if (response.type() != QDBusMessage::ReplyMessage || response.arguments().isEmpty()) {
-        qCWarning(LOG_ESS) << "Error" << response.errorName() << "with message" << response.errorMessage();
+    if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
+        qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
         return {};
     } else {
         return response.arguments().first();

sources/libraries.cmake

@@ -5,7 +5,7 @@ find_package(Gettext REQUIRED)
 find_package(Qt6 6.6.0 REQUIRED COMPONENTS Core Concurrent DBus Network Qml Test Widgets)
 add_definitions(
         ${Qt6Core_DEFINITIONS} ${Qt6DBus_DEFINITIONS} ${Qt6Network_DEFINITIONS}
-        ${Qt6Widgets_DEFINITIONS}
+        ${Qt6Qml_DEFINITIONS} ${Qt6Widgets_DEFINITIONS}
 )
 set(Qt_INCLUDE
         ${Qt6Core_INCLUDE_DIRS} ${Qt6Concurrent_INCLUDE_DIRS} ${Qt6DBus_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS}

sources/qml/ImportDialog.qml

@@ -38,7 +38,6 @@ Item {
 
     Dialog {
         id: importSelection
-        standardButtons: Dialog.Ok | Dialog.Cancel
 
         Column {
             CheckBox {

sources/test/testawbugreporter.cpp

@@ -45,7 +45,7 @@ void TestAWBugReporter::test_generateText()
 
 void TestAWBugReporter::test_sendBugReport()
 {
-    QSignalSpy spy(plugin, SIGNAL(replyReceived(int, const QString &)));
+    QSignalSpy spy(plugin, SIGNAL(replyReceived(int, QString &)));
     plugin->sendBugReport(AWTestLibrary::randomString(),
                           plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3)));
 

sources/translations/ru.po

@@ -1,25 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the awesome-widgets package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Evgeniy Alekseev <darkarcanis@mail.ru>, 2024
-# 
-#, fuzzy
+# Copyright (C) 2014
+# This file is distributed under the same license as the PyTextMonitor package.
+#
+# SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2020, 2024 Evgeniy Alekseev <esalexeev@gmail.com>
 msgid ""
 msgstr ""
-"Project-Id-Version: awesome-widgets\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
 "POT-Creation-Date: 2024-04-22 14:53+0300\n"
-"PO-Revision-Date: 2024-04-21 13:49+0000\n"
-"Last-Translator: Evgeniy Alekseev <darkarcanis@mail.ru>, 2024\n"
-"Language-Team: Russian (https://app.transifex.com/arcanis/teams/20130/ru/)\n"
+"PO-Revision-Date: 2024-04-19 20:17+0300\n"
+"Last-Translator: Evgenii Alekseev <esalexeev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 24.02.1\n"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../awdebug.cpp
 #, kde-format
@@ -439,7 +436,7 @@ msgstr "Погода"
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../awesome-widget/package/contents/ui/main.qml
 #, kde-format
 msgid "Run monitor"
-msgstr "Запустить системный монитор"
+msgstr "Запустить монитор"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../awesome-widget/package/contents/ui/main.qml
 #, kde-format
@@ -798,7 +795,7 @@ msgstr "Котировки"
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
 #, kde-format
 msgid "System"
-msgstr "Система"
+msgstr "Системные"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../extsysmon/extsysmonaggregator.cpp
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
@@ -840,12 +837,11 @@ msgstr "Предварительный просмотр"
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/AWInfoLabel.qml
 #, kde-format
 msgid ""
-"Detailed information may be found on <a "
-"href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>"
+"Detailed information may be found on <a href=\"https://arcanis.me/projects/"
+"awesome-widgets/\">project homepage</a>"
 msgstr ""
-"Подробная информация может быть найдена на <a "
-"href=\"https://arcanis.me/ru/projects/awesome-widgets/\">домашней странице "
-"проекта</a>"
+"Подробная информация может быть найдена на <a href=\"https://arcanis.me/ru/"
+"projects/awesome-widgets/\">домашней странице проекта</a>"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/AWTagSelector.qml
 #, kde-format
@@ -936,7 +932,7 @@ msgstr "HDD"
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
 #, kde-format
 msgid "Network request"
-msgstr "Сетевой запрос"
+msgstr "Веб-запрос"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
 #, kde-format
@@ -951,7 +947,7 @@ msgstr "Функции"
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
 #, kde-format
 msgid "User defined"
-msgstr "Пользовательские определения"
+msgstr "Пользовательские ключи"
 
 #: /home/arcanis/documents/github/awesome-widgets/sources/translations/../qml/General.qml
 #, kde-format
@@ -1041,8 +1037,9 @@ msgstr "Импорт дополнительных файлов"
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extupgrade.h
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extweather.h
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_graphicalitem.h
+#, fuzzy
 msgid "Configuration"
-msgstr "Настройки"
+msgstr "Экспорт настроек"
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_awdatetimeformatter.h
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_awfloatformatter.h
@@ -1176,7 +1173,7 @@ msgstr "Активен"
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extupgrade.h
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extweather.h
 msgid "Update"
-msgstr "Обновление"
+msgstr ""
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extnetworkrequest.h
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extquotes.h
@@ -1208,10 +1205,10 @@ msgid ""
 "Refer to <a href=\"https://stooq.com/\"><span style=\" text-decoration: "
 "underline; color:#0057ae;\">https://stooq.com/</span></a></p></body></html>"
 msgstr ""
-"<html><head/><body><p>Используйте Stooq тикер для получения котировок по "
-"финансовому инструменту, используя сайт <a "
-"href=\"https\\://stooq.com/\"><span style=\" text-decoration\\: underline; "
-"color\\:#0057ae;\">https\\://stooq.com/</span></a></p></body></html> "
+"<html><head/><body><p>Используйте тикеры Stooq, чтобы получить котировки по "
+"инструменту. См. <a href=\"https://stooq.com/\"><span style=\" text-"
+"decoration: underline; color:#0057ae;\">https://stooq.com/</span></a></p></"
+"body></html>"
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_extquotes.h
 msgid "Ticker"
@@ -1284,11 +1281,12 @@ msgstr "Тип активного наполнения"
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_graphicalitem.h
 msgid "..."
-msgstr "..."
+msgstr ""
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_graphicalitem.h
+#, fuzzy
 msgid "Inactive filling type"
-msgstr "Цвет неактивного наполнения"
+msgstr "Тип неактивного наполнения"
 
 #: /home/arcanis/documents/github/awesome-widgets/build/awesomewidgets/ui_graphicalitem.h
 msgid "Direction"

sources/version.h.in

@@ -70,13 +70,6 @@ static const char STATIC_KEYS[] = "time,"
                                   "cpucl,"
                                   "cpu,"
                                   "gpu,"
-                                  "gpumem,"
-                                  "gpufreemb,"
-                                  "gpufreegb,"
-                                  "gputotmb,"
-                                  "gputotgb,"
-                                  "gpuusedmb,"
-                                  "gpuusedgb,"
                                   "memmb,"
                                   "memgb,"
                                   "memfreemb,"