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,16 +1,5 @@
-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.2
+pkgver=4.0.0alpha2
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('x86_64')

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 "2")
+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.2",
+        "Version": "4.0.0",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/awesome-widget/plugin/awdataaggregator.h

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

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/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,5 +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.2",
+        "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/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) 2014
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PyTextMonitor package.
-# This file is distributed under the same license as the awesome-widgets package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-# Translators:
+# SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2020, 2024 Evgeniy Alekseev <esalexeev@gmail.com>
-# Evgeniy Alekseev <darkarcanis@mail.ru>, 2024
-# 
-#, fuzzy
 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"
+"PO-Revision-Date: 2024-04-19 20:17+0300\n"
-"Last-Translator: Evgeniy Alekseev <darkarcanis@mail.ru>, 2024\n"
+"Last-Translator: Evgenii Alekseev <esalexeev@gmail.com>\n"
-"Language-Team: Russian (https://app.transifex.com/arcanis/teams/20130/ru/)\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"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"
+"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 "
+"Detailed information may be found on <a href=\"https://arcanis.me/projects/"
-"href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>"
+"awesome-widgets/\">project homepage</a>"
 msgstr ""
-"Подробная информация может быть найдена на <a "
+"Подробная информация может быть найдена на <a href=\"https://arcanis.me/ru/"
-"href=\"https://arcanis.me/ru/projects/awesome-widgets/\">домашней странице "
+"projects/awesome-widgets/\">домашней странице проекта</a>"
-"проекта</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 тикер для получения котировок по "
+"<html><head/><body><p>Используйте тикеры Stooq, чтобы получить котировки по "
-"финансовому инструменту, используя сайт <a "
+"инструменту. См. <a href=\"https://stooq.com/\"><span style=\" text-"
-"href=\"https\\://stooq.com/\"><span style=\" text-decoration\\: underline; "
+"decoration: underline; color:#0057ae;\">https://stooq.com/</span></a></p></"
-"color\\:#0057ae;\">https\\://stooq.com/</span></a></p></body></html> "
+"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"