Compare commits

..

7 Commits

Author SHA1 Message Date
571417f786 Release 4.0.1 2024-12-11 17:12:24 +02:00
e3d24d1890 fix: disable tooltip painting for now, because it causes error during
png rendering in qt
2024-12-11 17:09:10 +02:00
ee7bd90aae Release 4.0.0 2024-05-05 15:55:56 +03:00
f79c94e9e2 fix: add buttons to import dialog 2024-05-05 15:55:03 +03:00
66baa78cda build: fix debug builds 2024-05-05 15:41:43 +03:00
79a148a21a chore: translate awesome-widgets.pot in ru (#167)
100% translated source file: 'awesome-widgets.pot'
on 'ru'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2024-05-04 01:19:09 +03:00
64b4618904 refactor: split formatters and matchers into separated singleton classes (#166)
* split formatter into separated singleton classes

* split data engine matchers to classes

* nodiscard attribute for formatter methods

* small refactoring in matchers

* fix codefactor warnings

* fix test building
2024-04-30 21:53:21 +03:00
15 changed files with 58 additions and 40 deletions

View File

@ -1,5 +1,13 @@
Ver.4.0.1:
- temporary disable tooltip painting in main widget
Ver.4.0.0: Ver.4.0.0:
* migration to plasma 6 * 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: Ver.3.5.0:
+ wayland support + wayland support

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -30,6 +30,7 @@ configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPR
qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n) qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER}) 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}) target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
# install # install

View File

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

View File

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

View File

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

View File

@ -15,4 +15,5 @@ file(GLOB SUBPROJECT_SOURCE *.cpp)
file(GLOB SUBPROJECT_HEADER *.h) file(GLOB SUBPROJECT_HEADER *.h)
add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER}) 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}) target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})

View File

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

View File

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

View File

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