From 803d6d631a179379f5f9afb1beeb76a296f14015 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Thu, 7 Mar 2024 17:57:05 +0200 Subject: [PATCH] port library --- sources/awesome-widget/metadata.json | 29 ++++++++++++++ .../awesome-widget/package/contents/ui/qmldir | 40 +++++++++---------- sources/awesome-widget/plugin/CMakeLists.txt | 6 +-- sources/awesomewidgets/CMakeLists.txt | 6 +-- sources/awesomewidgets/abstractextitem.cpp | 2 +- sources/awesomewidgets/awabstractformatter.h | 2 + sources/awesomewidgets/awjsonformatter.cpp | 6 +-- sources/awesomewidgets/awlistformatter.cpp | 2 +- sources/awesomewidgets/awlistformatter.h | 2 +- sources/awesomewidgets/extnetworkrequest.cpp | 4 +- sources/awesomewidgets/extscript.cpp | 5 +-- sources/awesomewidgets/extupgrade.cpp | 5 +-- sources/awesomewidgets/owmweatherprovider.cpp | 2 +- .../awesomewidgets/stooqquotesprovider.cpp | 3 +- sources/desktop-panel/metadata.json | 29 ++++++++++++++ .../desktop-panel/package/contents/ui/qmldir | 40 +++++++++---------- sources/desktop-panel/plugin/CMakeLists.txt | 6 +-- sources/extsysmon/CMakeLists.txt | 10 ++--- sources/extsysmon/extsysmon.h | 2 +- .../plasma-dataengine-extsysmon.json | 20 ++++++++++ sources/extsysmonsources/CMakeLists.txt | 4 +- .../abstractextsysmonsource.h | 7 ++-- sources/extsysmonsources/gpuloadsource.cpp | 5 +-- sources/extsysmonsources/gputempsource.cpp | 5 +-- sources/extsysmonsources/hddtempsource.cpp | 7 ++-- sources/extsysmonsources/networksource.cpp | 5 +-- sources/extsysmonsources/playersource.cpp | 9 ++--- sources/extsysmonsources/processessource.cpp | 2 +- sources/libraries.cmake | 3 +- sources/test/CMakeLists.txt | 6 +-- 30 files changed, 170 insertions(+), 104 deletions(-) create mode 100644 sources/awesome-widget/metadata.json create mode 100644 sources/desktop-panel/metadata.json create mode 100644 sources/extsysmon/plasma-dataengine-extsysmon.json diff --git a/sources/awesome-widget/metadata.json b/sources/awesome-widget/metadata.json new file mode 100644 index 0000000..0f83643 --- /dev/null +++ b/sources/awesome-widget/metadata.json @@ -0,0 +1,29 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "esalexeev@gmail.com", + "Name": "Evgeniy Alekseev aka arcanis" + } + ], + "Category": "System Information", + "Description": "A minimalistic Plasmoid", + "Description[en]": "A minimalistic Plasmoid", + "Description[es]": "Un script Plasmoïde minimaliste", + "Description[pt_BR]": "Um script Plasmoid", + "Description[ru]": "Минималистичный плазмоид", + "Description[uk]": "Мінімалістичний плазмоїд", + "EnabledByDefault": true, + "Icon": "utilities-system-monitor", + "Id": "org.kde.plasma.awesomewidget", + "License": "GPLv3", + "Name": "Awesome Widget", + "ServiceTypes": [ + "Plasma/Applet" + ], + "Version": "@PROJECT_VERSION@", + "Website": "https://arcanis.me/projects/awesome-widgets/" + }, + "X-Plasma-API": "declarativeappletscript", + "X-Plasma-MainScript": "ui/main.qml" +} diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir index 2f19ff4..637924c 100644 --- a/sources/awesome-widget/package/contents/ui/qmldir +++ b/sources/awesome-widget/package/contents/ui/qmldir @@ -3,25 +3,25 @@ # common QML constants -singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml +singleton General 1.0 file:///usr//awesomewidgets/qml/General.qml # custom QML UI classes -AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml -AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml -AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml -AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml -AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml -BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml -ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml -CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml -ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml -ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml -ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml -FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml -HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml -HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml -HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml -HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml -ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml -IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml -LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml +AboutTab file:///usr//awesomewidgets/qml/AboutTab.qml +AWExtensions file:///usr//awesomewidgets/qml/AWExtensions.qml +AWInfoLabel file:///usr//awesomewidgets/qml/AWInfoLabel.qml +AWTagSelector file:///usr//awesomewidgets/qml/AWTagSelector.qml +AWTextEditor file:///usr//awesomewidgets/qml/AWTextEditor.qml +BugReport file:///usr//awesomewidgets/qml/BugReport.qml +ButtonSelector file:///usr//awesomewidgets/qml/ButtonSelector.qml +CheckBoxSelector file:///usr//awesomewidgets/qml/CheckBoxSelector.qml +ColorSelector file:///usr//awesomewidgets/qml/ColorSelector.qml +ComboBoxSelector file:///usr//awesomewidgets/qml/ComboBoxSelector.qml +ExportDialog file:///usr//awesomewidgets/qml/ExportDialog.qml +FontSelector file:///usr//awesomewidgets/qml/FontSelector.qml +HtmlDefaultFunctionsBar file:///usr//awesomewidgets/qml/HtmlDefaultFunctionsBar.qml +HtmlEditorButton file:///usr//awesomewidgets/qml/HtmlEditorButton.qml +HtmlEditorColor file:///usr//awesomewidgets/qml/HtmlEditorColor.qml +HtmlEditorFont file:///usr//awesomewidgets/qml/HtmlEditorFont.qml +ImportDialog file:///usr//awesomewidgets/qml/ImportDialog.qml +IntegerSelector file:///usr//awesomewidgets/qml/IntegerSelector.qml +LineSelector file:///usr//awesomewidgets/qml/LineSelector.qml diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt index 0011a9f..2fb27b5 100644 --- a/sources/awesome-widget/plugin/CMakeLists.txt +++ b/sources/awesome-widget/plugin/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp) @@ -16,8 +16,8 @@ file(GLOB SUBPROJECT_NOTIFY *.notifyrc) qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER}) -target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) +target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget) install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget) -install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR}) +install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}) diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt index 5d991ab..881ec58 100644 --- a/sources/awesomewidgets/CMakeLists.txt +++ b/sources/awesomewidgets/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp) @@ -30,7 +30,7 @@ configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPR qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER}) -target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) +target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) # install install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) @@ -41,5 +41,5 @@ install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJEC install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -install(FILES ${SUBPROJECT_INI} DESTINATION ${KDE_INSTALL_FULL_CONFDIR}) +install(FILES ${SUBPROJECT_INI} DESTINATION ${KDE_INSTALL_CONFDIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather) diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index ab6ad2f..247650c 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -99,7 +99,7 @@ QString AbstractExtItem::writtableConfig() const { QString path = m_fileName; QString name = QFileInfo(path).fileName(); - path.remove(path.count() - name.count() - 1, name.count() + 1); + path.remove(path.length() - name.length() - 1, name.length() + 1); QString dir = QFileInfo(path).fileName(); return QString("%1/awesomewidgets/%2/%3") diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h index 4da1bfc..99785c2 100644 --- a/sources/awesomewidgets/awabstractformatter.h +++ b/sources/awesomewidgets/awabstractformatter.h @@ -18,6 +18,8 @@ #ifndef AWABSTRACTFORMATTER_H #define AWABSTRACTFORMATTER_H +#include + #include "abstractextitem.h" diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp index e0b1366..27f3413 100644 --- a/sources/awesomewidgets/awjsonformatter.cpp +++ b/sources/awesomewidgets/awjsonformatter.cpp @@ -53,7 +53,7 @@ QString AWJsonFormatter::convert(const QVariant &_value) const qCDebug(LOG_LIB) << "Convert value" << _value; // check if _value is string and parse first if required - QJsonDocument json = _value.type() == QVariant::String ? QJsonDocument::fromJson(_value.toString().toUtf8()) + QJsonDocument json = _value.userType() == QMetaType::QString ? QJsonDocument::fromJson(_value.toString().toUtf8()) : QJsonDocument::fromVariant(_value); QVariant converted = json.toVariant(); for (auto &element : m_splittedPath) @@ -147,9 +147,9 @@ QVariant AWJsonFormatter::getFromJson(const QVariant &_value, const QVariant &_e { qCDebug(LOG_LIB) << "Looking for element" << _element << "in" << _value; - if (_element.type() == QVariant::String) { + if (_element.userType() == QMetaType::QString) { return getFromMap(_value, _element.toString()); - } else if (_element.type() == QVariant::Int) { + } else if (_element.userType() == QMetaType::Int) { return getFromList(_value, _element.toInt()); } else { qCWarning(LOG_LIB) << "Unknown type" << _element.typeName(); diff --git a/sources/awesomewidgets/awlistformatter.cpp b/sources/awesomewidgets/awlistformatter.cpp index de15406..10d0e91 100644 --- a/sources/awesomewidgets/awlistformatter.cpp +++ b/sources/awesomewidgets/awlistformatter.cpp @@ -97,7 +97,7 @@ void AWListFormatter::setFilter(const QString &_filter) qCDebug(LOG_LIB) << "Filter" << _filter; m_filter = _filter; - m_regex = QRegExp(m_filter); + m_regex = QRegularExpression(m_filter); } diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h index 665e54b..1732303 100644 --- a/sources/awesomewidgets/awlistformatter.h +++ b/sources/awesomewidgets/awlistformatter.h @@ -58,7 +58,7 @@ private: QString m_filter = ""; QString m_separator = ""; bool m_sorted = false; - QRegExp m_regex; + QRegularExpression m_regex; }; diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp index c218b43..f496c16 100644 --- a/sources/awesomewidgets/extnetworkrequest.cpp +++ b/sources/awesomewidgets/extnetworkrequest.cpp @@ -20,9 +20,7 @@ #include -#include #include -#include #include @@ -174,7 +172,7 @@ void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply) } m_isRunning = false; - m_values[tag("response")] = QTextCodec::codecForMib(106)->toUnicode(_reply->readAll()).trimmed(); + m_values[tag("response")] = QString::fromUtf8(_reply->readAll()).trimmed(); emit(dataReceived(m_values)); } diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index 007822f..27cfec8 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include "awdebug.h" @@ -325,9 +324,9 @@ void ExtScript::startProcess() void ExtScript::updateValue() { qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode(); - QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed(); + QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed(); qCInfo(LOG_LIB) << "Error" << qdebug; - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed(); qCInfo(LOG_LIB) << "Output" << qoutput; QString strValue; diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index 433ec14..7f81025 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -21,7 +21,6 @@ #include #include -#include #include "awdebug.h" @@ -214,10 +213,10 @@ void ExtUpgrade::updateValue() qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode(); qCInfo(LOG_LIB) << "Error" << m_process->readAllStandardError(); - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed(); m_values[tag("pkgcount")] = [this](const QString &output) { return filter().isEmpty() ? output.split('\n', Qt::SkipEmptyParts).count() - null() - : output.split('\n', Qt::SkipEmptyParts).filter(QRegExp(filter())).count(); + : output.split('\n', Qt::SkipEmptyParts).filter(QRegularExpression(filter())).count(); }(qoutput); emit(dataReceived(m_values)); diff --git a/sources/awesomewidgets/owmweatherprovider.cpp b/sources/awesomewidgets/owmweatherprovider.cpp index 91a849d..70d9126 100644 --- a/sources/awesomewidgets/owmweatherprovider.cpp +++ b/sources/awesomewidgets/owmweatherprovider.cpp @@ -99,7 +99,7 @@ QVariantHash OWMWeatherProvider::parseSingleJson(const QVariantMap &_json) const } // timestamp - output[tag("timestamp")] = QDateTime::fromTime_t(_json["dt"].toUInt()).toUTC(); + output[tag("timestamp")] = QDateTime::fromSecsSinceEpoch(_json["dt"].toUInt()).toUTC(); return output; } diff --git a/sources/awesomewidgets/stooqquotesprovider.cpp b/sources/awesomewidgets/stooqquotesprovider.cpp index 591d927..036adbf 100644 --- a/sources/awesomewidgets/stooqquotesprovider.cpp +++ b/sources/awesomewidgets/stooqquotesprovider.cpp @@ -17,7 +17,6 @@ #include "stooqquotesprovider.h" -#include #include #include "awdebug.h" @@ -55,7 +54,7 @@ QVariantHash StooqQuotesProvider::parse(const QByteArray &_source, const QVarian QVariantHash values; - QStringList sourceValues = QTextCodec::codecForMib(106)->toUnicode(_source).trimmed().split(','); + QStringList sourceValues = QString::fromUtf8(_source).trimmed().split(','); if (sourceValues.count() != 2) { qCWarning(LOG_LIB) << "Parse error" << sourceValues; return values; diff --git a/sources/desktop-panel/metadata.json b/sources/desktop-panel/metadata.json new file mode 100644 index 0000000..efd12be --- /dev/null +++ b/sources/desktop-panel/metadata.json @@ -0,0 +1,29 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "esalexeev@gmail.com", + "Name": "Evgeniy Alekseev aka arcanis" + } + ], + "Category": "System Information", + "Description": "A minimalistic Plasmoid", + "Description[en]": "A minimalistic Plasmoid", + "Description[es]": "Un script Plasmoïde minimaliste", + "Description[pt_BR]": "Um script Plasmoid", + "Description[ru]": "Минималистичный плазмоид", + "Description[uk]": "Мінімалістичний плазмоїд", + "EnabledByDefault": true, + "Icon": "utilities-system-monitor", + "Id": "org.kde.plasma.desktoppanel", + "License": "GPLv3", + "Name": "Desktop Panel", + "ServiceTypes": [ + "Plasma/Applet" + ], + "Version": "@PROJECT_VERSION@", + "Website": "https://arcanis.me/projects/awesome-widgets/" + }, + "X-Plasma-API": "declarativeappletscript", + "X-Plasma-MainScript": "ui/main.qml" +} diff --git a/sources/desktop-panel/package/contents/ui/qmldir b/sources/desktop-panel/package/contents/ui/qmldir index 2f19ff4..637924c 100644 --- a/sources/desktop-panel/package/contents/ui/qmldir +++ b/sources/desktop-panel/package/contents/ui/qmldir @@ -3,25 +3,25 @@ # common QML constants -singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml +singleton General 1.0 file:///usr//awesomewidgets/qml/General.qml # custom QML UI classes -AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml -AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml -AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml -AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml -AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml -BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml -ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml -CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml -ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml -ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml -ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml -FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml -HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml -HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml -HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml -HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml -ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml -IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml -LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml +AboutTab file:///usr//awesomewidgets/qml/AboutTab.qml +AWExtensions file:///usr//awesomewidgets/qml/AWExtensions.qml +AWInfoLabel file:///usr//awesomewidgets/qml/AWInfoLabel.qml +AWTagSelector file:///usr//awesomewidgets/qml/AWTagSelector.qml +AWTextEditor file:///usr//awesomewidgets/qml/AWTextEditor.qml +BugReport file:///usr//awesomewidgets/qml/BugReport.qml +ButtonSelector file:///usr//awesomewidgets/qml/ButtonSelector.qml +CheckBoxSelector file:///usr//awesomewidgets/qml/CheckBoxSelector.qml +ColorSelector file:///usr//awesomewidgets/qml/ColorSelector.qml +ComboBoxSelector file:///usr//awesomewidgets/qml/ComboBoxSelector.qml +ExportDialog file:///usr//awesomewidgets/qml/ExportDialog.qml +FontSelector file:///usr//awesomewidgets/qml/FontSelector.qml +HtmlDefaultFunctionsBar file:///usr//awesomewidgets/qml/HtmlDefaultFunctionsBar.qml +HtmlEditorButton file:///usr//awesomewidgets/qml/HtmlEditorButton.qml +HtmlEditorColor file:///usr//awesomewidgets/qml/HtmlEditorColor.qml +HtmlEditorFont file:///usr//awesomewidgets/qml/HtmlEditorFont.qml +ImportDialog file:///usr//awesomewidgets/qml/ImportDialog.qml +IntegerSelector file:///usr//awesomewidgets/qml/IntegerSelector.qml +LineSelector file:///usr//awesomewidgets/qml/LineSelector.qml diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt index 34d3aad..25cf51f 100644 --- a/sources/desktop-panel/plugin/CMakeLists.txt +++ b/sources/desktop-panel/plugin/CMakeLists.txt @@ -6,15 +6,15 @@ include_directories( ${CMAKE_BINARY_DIR} ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp) file(GLOB SUBPROJECT_NOTIFY *.notifyrc) add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE}) -target_link_libraries(${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) +target_link_libraries(${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel) install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel) -install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR}) +install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}) diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt index f078f0b..e7162d6 100644 --- a/sources/extsysmon/CMakeLists.txt +++ b/sources/extsysmon/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_MONITORSOURCES}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) file(GLOB SUBPROJECT_DESKTOP_IN *.desktop) @@ -25,11 +25,9 @@ configure_file(${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT add_library(${SUBPROJECT} MODULE ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER}) target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} - ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) -kcoreaddons_desktop_to_json(${SUBPROJECT} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} - SERVICE_TYPES plasma-dataengine.desktop) + ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) # install install(TARGETS ${SUBPROJECT} DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES ${SUBPROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR}) +#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES ${SUBPROJECT_CONF} DESTINATION ${KDE_INSTALL_CONFDIR}) diff --git a/sources/extsysmon/extsysmon.h b/sources/extsysmon/extsysmon.h index 0bf3f8e..018f2ec 100644 --- a/sources/extsysmon/extsysmon.h +++ b/sources/extsysmon/extsysmon.h @@ -18,7 +18,7 @@ #ifndef EXTSYSMON_H #define EXTSYSMON_H -#include +#include class ExtSysMonAggregator; diff --git a/sources/extsysmon/plasma-dataengine-extsysmon.json b/sources/extsysmon/plasma-dataengine-extsysmon.json new file mode 100644 index 0000000..9e5441e --- /dev/null +++ b/sources/extsysmon/plasma-dataengine-extsysmon.json @@ -0,0 +1,20 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "esalexeev@gmail.com", + "Name": "Evgeniy Alekseev aka arcanis" + } + ], + "Category": "System Information", + "Description": "Adds some additional functions to System DataEngine", + "Icon": "utilities-system-monitor", + "Id": "extsysmon", + "License": "GPL3", + "Name": "Extended SystemMonitor", + "ServiceTypes": [ + "Plasma/DataEngine" + ], + "Version": "@PROJECT_VERSION@" + } +} diff --git a/sources/extsysmonsources/CMakeLists.txt b/sources/extsysmonsources/CMakeLists.txt index b5940f7..b3fd1c7 100644 --- a/sources/extsysmonsources/CMakeLists.txt +++ b/sources/extsysmonsources/CMakeLists.txt @@ -8,11 +8,11 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) file(GLOB SUBPROJECT_SOURCE *.cpp) file(GLOB SUBPROJECT_HEADER *.h) add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER}) -target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) +target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES}) diff --git a/sources/extsysmonsources/abstractextsysmonsource.h b/sources/extsysmonsources/abstractextsysmonsource.h index cfe1366..eda296c 100644 --- a/sources/extsysmonsources/abstractextsysmonsource.h +++ b/sources/extsysmonsources/abstractextsysmonsource.h @@ -19,7 +19,7 @@ #define ABSTRACTEXTSYSMONSOURCE_H #include -#include +#include #include @@ -38,9 +38,8 @@ public: // used by extensions static int index(const QString &_source) { - QRegExp rx("\\d+"); - rx.indexIn(_source); - return rx.cap().toInt(); + QRegularExpression rx("\\d+"); + return rx.globalMatch(_source).next().captured(1).toInt(); } signals: diff --git a/sources/extsysmonsources/gpuloadsource.cpp b/sources/extsysmonsources/gpuloadsource.cpp index 74078df..8a2fb95 100644 --- a/sources/extsysmonsources/gpuloadsource.cpp +++ b/sources/extsysmonsources/gpuloadsource.cpp @@ -20,7 +20,6 @@ #include #include -#include #include "awdebug.h" @@ -124,9 +123,9 @@ QStringList GPULoadSource::sources() const void GPULoadSource::updateValue() { qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode(); - QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed(); + QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed(); qCInfo(LOG_ESS) << "Error" << qdebug; - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed(); qCInfo(LOG_ESS) << "Output" << qoutput; if (m_device == "nvidia") { diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp index de13ff4..021a1d5 100644 --- a/sources/extsysmonsources/gputempsource.cpp +++ b/sources/extsysmonsources/gputempsource.cpp @@ -20,7 +20,6 @@ #include #include -#include #include "awdebug.h" @@ -103,9 +102,9 @@ QStringList GPUTemperatureSource::sources() const void GPUTemperatureSource::updateValue() { qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode(); - QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed(); + QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed(); qCInfo(LOG_ESS) << "Error" << qdebug; - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed(); qCInfo(LOG_ESS) << "Output" << qoutput; if (m_device == "nvidia") { diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp index 322ffd1..6e4402f 100644 --- a/sources/extsysmonsources/hddtempsource.cpp +++ b/sources/extsysmonsources/hddtempsource.cpp @@ -20,7 +20,6 @@ #include #include -#include #include "awdebug.h" @@ -61,7 +60,7 @@ HDDTemperatureSource::~HDDTemperatureSource() QStringList HDDTemperatureSource::allHdd() { QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name); - QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$")); + QStringList devices = allDevices.filter(QRegularExpression("^[hms]d[a-z]$")); for (int i = 0; i < devices.count(); i++) devices[i] = QString("/dev/%1").arg(devices.at(i)); @@ -120,9 +119,9 @@ void HDDTemperatureSource::updateValue(const QString &_device) qCDebug(LOG_ESS) << "Called with device" << _device; qCInfo(LOG_ESS) << "Cmd returns" << m_processes[_device]->exitCode(); - QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardError()).trimmed(); + QString qdebug = QString::fromUtf8(m_processes[_device]->readAllStandardError()).trimmed(); qCInfo(LOG_ESS) << "Error" << qdebug; - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_processes[_device]->readAllStandardOutput()).trimmed(); qCInfo(LOG_ESS) << "Output" << qoutput; // parse diff --git a/sources/extsysmonsources/networksource.cpp b/sources/extsysmonsources/networksource.cpp index e56c7b5..b2a94cb 100644 --- a/sources/extsysmonsources/networksource.cpp +++ b/sources/extsysmonsources/networksource.cpp @@ -20,7 +20,6 @@ #include #include -#include #include "awdebug.h" @@ -101,9 +100,9 @@ QStringList NetworkSource::sources() const void NetworkSource::updateSsid() { qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode(); - QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed(); + QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed(); qCInfo(LOG_ESS) << "Error" << qdebug; - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed(); + QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed(); qCInfo(LOG_ESS) << "Output" << qoutput; m_values["network/current/ssid"] = qoutput; diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp index b56d07e..529de9d 100644 --- a/sources/extsysmonsources/playersource.cpp +++ b/sources/extsysmonsources/playersource.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "awdebug.h" @@ -219,7 +218,7 @@ QString PlayerSource::buildString(const QString &_current, const QString &_value qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value << "will be stripped after" << _s; int index = _value.indexOf(_current); - if ((_current.isEmpty()) || ((index + _s + 1) > _value.count())) + if ((_current.isEmpty()) || ((index + _s + 1) > _value.length())) return QString("%1").arg(_value.left(_s), -_s, QLatin1Char(' ')); else return QString("%1").arg(_value.mid(index + 1, _s), -_s, QLatin1Char(' ')); @@ -230,8 +229,8 @@ QString PlayerSource::stripString(const QString &_value, const int _s) { qCDebug(LOG_ESS) << "New value" << _value << "will be stripped after" << _s; - return _value.count() > _s ? QString("%1\u2026").arg(_value.left(_s - 1)) - : _value.leftJustified(_s, QLatin1Char(' ')); + return _value.length() > _s ? QString("%1\u2026").arg(_value.left(_s - 1)) + : _value.leftJustified(_s, QLatin1Char(' ')); } @@ -249,7 +248,7 @@ void PlayerSource::mpdSocketConnected() void PlayerSource::mpdSocketReadyRead() { - QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_mpdSocket.readAll()).trimmed(); + QString qoutput = QString::fromUtf8(m_mpdSocket.readAll()).trimmed(); qCInfo(LOG_ESS) << "Output" << qoutput; // parse diff --git a/sources/extsysmonsources/processessource.cpp b/sources/extsysmonsources/processessource.cpp index 9d434e0..35c1a67 100644 --- a/sources/extsysmonsources/processessource.cpp +++ b/sources/extsysmonsources/processessource.cpp @@ -80,7 +80,7 @@ QVariantMap ProcessesSource::initialData(const QString &_source) const void ProcessesSource::run() { QStringList allDirectories = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - QStringList directories = allDirectories.filter(QRegExp("(\\d+)")); + QStringList directories = allDirectories.filter(QRegularExpression("(\\d+)")); QStringList running; for (auto &dir : directories) { diff --git a/sources/libraries.cmake b/sources/libraries.cmake index d4ed2b4..59e5730 100644 --- a/sources/libraries.cmake +++ b/sources/libraries.cmake @@ -25,6 +25,5 @@ find_package(Plasma REQUIRED) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) -set(Kf6_INCLUDE ${I18n_INCLUDE_DIR} ${Notifications_INCLUDE_DIR} ${Plasma_INCLUDE_DIR}) +set(Kf6_INCLUDE ${KDE_INSTALL_FULL_INCLUDEDIR_KF}) set(Kf6_LIBRARIES KF6::I18n KF6::Notifications KF6::WindowSystem PW::LibTaskManager) - diff --git a/sources/test/CMakeLists.txt b/sources/test/CMakeLists.txt index d0318c2..ffe3962 100644 --- a/sources/test/CMakeLists.txt +++ b/sources/test/CMakeLists.txt @@ -13,16 +13,16 @@ include_directories( ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} ${Qt5Test_INCLUDE_DIRS} - ${Kf5_INCLUDE} + ${Kf6_INCLUDE} ) # library set(AWTESTLIBRARY_HEADERS awtestlibrary.h) set(AWTESTLIBRARY_SOURCES awtestlibrary.cpp) add_library(${SUBPROJECT}-awtest STATIC ${AWTESTLIBRARY_SOURCES} ${AWTESTLIBRARY_HEADERS}) -target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt5Test_LIBRARIES} ${Kf5_LIBRARIES}) +target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt5Test_LIBRARIES} ${Kf6_LIBRARIES}) set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} - ${Qt_LIBRARIES} ${Kf5_LIBRARIES} ${Qt5Test_LIBRARIES}) + ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt5Test_LIBRARIES}) # modules set(TEST_MODULES