diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 052080f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "sources/3rdparty/fontdialog"] - path = sources/3rdparty/fontdialog - url = https://github.com/arcan1s/qtadds-fontdialog.git diff --git a/sources/3rdparty/fontdialog b/sources/3rdparty/fontdialog deleted file mode 160000 index e7bcf8e..0000000 --- a/sources/3rdparty/fontdialog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7bcf8ee858e7be3012168e12c7b14ccc28535b4 diff --git a/sources/3rdparty/fontdialog/COPYING b/sources/3rdparty/fontdialog/COPYING new file mode 100644 index 0000000..6600f1c --- /dev/null +++ b/sources/3rdparty/fontdialog/COPYING @@ -0,0 +1,165 @@ +GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/sources/3rdparty/fontdialog/README.md b/sources/3rdparty/fontdialog/README.md new file mode 100644 index 0000000..73a7621 --- /dev/null +++ b/sources/3rdparty/fontdialog/README.md @@ -0,0 +1,4 @@ +qtadds-fontdialog +================= + +Font dialog which provides a font color settings diff --git a/sources/3rdparty/fontdialog/fontdialog.cpp b/sources/3rdparty/fontdialog/fontdialog.cpp new file mode 100644 index 0000000..a659347 --- /dev/null +++ b/sources/3rdparty/fontdialog/fontdialog.cpp @@ -0,0 +1,215 @@ +/*************************************************************************** + * Copyright (C) 2014 Evgeniy Alekseev * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 3.0 of the License, or (at your option) any later version. * + * * + * This library 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 * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this library. * + ***************************************************************************/ + +#include "fontdialog.h" + +#include + + +CFont::CFont(const QString family, int pointSize, int weight, bool italic, QColor color) + : QFont(family, pointSize, weight, italic) +{ + setCurrentColor(color); +} + + +QColor CFont::color() +{ + return currentColor; +} + + +void CFont::setCurrentColor(const QColor color) +{ + currentColor = color; +} + + +int CFont::html2QFont(const int htmlWeight) +{ + int weight = 16; + switch(htmlWeight) { + case 100: + weight = 16; + break; + case 200: + case 300: + weight = 25; + break; + case 400: + weight = 50; + break; + case 500: + case 600: + weight = 63; + break; + case 700: + case 800: + weight = 75; + break; + case 900: + weight = 87; + break; + default: + break; + } + + return weight; +} + + +int CFont::qFont2html(const int weight) +{ + int htmlWeight = 400; + switch(weight) { + case 16: + htmlWeight = 100; + break; + case 25: + htmlWeight = 300; + break; + case 50: + htmlWeight = 400; + break; + case 63: + htmlWeight = 600; + break; + case 75: + htmlWeight = 800; + break; + case 87: + htmlWeight = 900; + break; + default: + break; + } + + return htmlWeight; +} + + +int CFont::htmlWeight() +{ + return CFont::qFont2html(weight()); +} + + +void CFont::setHtmlWeight(const int htmlWeight) +{ + setWeight(CFont::html2QFont(htmlWeight)); +} + + +CFont CFont::fromQFont(const QFont font, const QColor color) +{ + return CFont(font.family(), font.pointSize(), font.weight(), font.italic(), color); +} + + +QFont CFont::toQFont() +{ + return QFont(family(), pointSize(), weight(), italic()); +} + + +CFontDialog::CFontDialog(QWidget *parent, bool needWeight, bool needItalic) + : QDialog(parent) +{ + QGridLayout *mainGrid = new QGridLayout(this); + setLayout(mainGrid); + + colorBox = new QComboBox(this); + connect(colorBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateColor(QString))); + QStringList colorNames = QColor::colorNames(); + int index = 0; + for (int i=0; iaddItem(colorNames[i], color); + QModelIndex idx = colorBox->model()->index(index++, 0); + colorBox->model()->setData(idx, color, Qt::BackgroundRole); + } + mainGrid->addWidget(colorBox, 0, 0); + fontBox = new QFontComboBox(this); + mainGrid->addWidget(fontBox, 0, 1); + sizeBox = new QSpinBox(this); + mainGrid->addWidget(sizeBox, 0, 2); + weightBox = new QSpinBox(this); + mainGrid->addWidget(weightBox, 0, 3); + italicBox = new QComboBox(this); + italicBox->addItem(tr("normal")); + italicBox->addItem(tr("italic")); + mainGrid->addWidget(italicBox, 0, 4); + + buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, + Qt::Horizontal, this); + QObject::connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); + QObject::connect(buttons, SIGNAL(rejected()), this, SLOT(reject())); + mainGrid->addWidget(buttons, 1, 0, 1, 5); + + italicBox->setHidden(!needItalic); + weightBox->setHidden(!needWeight); +} + + +CFontDialog::~CFontDialog() +{ + delete colorBox; + delete buttons; + delete fontBox; + delete italicBox; + delete sizeBox; + delete weightBox; +} + + +void CFontDialog::updateColor(const QString color) +{ + colorBox->setStyleSheet(QString("background:%1").arg(QColor(color).name())); +} + + +CFont CFontDialog::getFont(const QString title, CFont defaultFont, bool needWeight, bool needItalic, int *status) +{ + CFontDialog dlg(0, needWeight, needItalic); + + dlg.setWindowTitle(title); + QStringList colorNames = QColor::colorNames(); + for (int i=0; isetCurrentIndex(i); + break; + } + dlg.fontBox->setCurrentFont(defaultFont); + dlg.sizeBox->setValue(defaultFont.pointSize()); + dlg.weightBox->setValue(defaultFont.weight()); + if (defaultFont.italic()) + dlg.italicBox->setCurrentIndex(1); + else + dlg.italicBox->setCurrentIndex(0); + + CFont font = CFont(defaultFont); + int ret = dlg.exec(); + if (ret == 1) + font = CFont(dlg.fontBox->currentFont().family(), + dlg.sizeBox->value(), + dlg.weightBox->value(), + dlg.italicBox->currentIndex() == 1, + QColor(dlg.colorBox->currentText())); + if (status != nullptr) + *status = ret; + return font; +} diff --git a/sources/3rdparty/fontdialog/fontdialog.h b/sources/3rdparty/fontdialog/fontdialog.h new file mode 100644 index 0000000..3a16d4b --- /dev/null +++ b/sources/3rdparty/fontdialog/fontdialog.h @@ -0,0 +1,82 @@ +/*************************************************************************** + * Copyright (C) 2014 Evgeniy Alekseev * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 3.0 of the License, or (at your option) any later version. * + * * + * This library 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 * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this library. * + ***************************************************************************/ + +#ifndef FONTDIALOG_H +#define FONTDIALOG_H + +#include +#include +#include +#include +#include + + +class CFont : public QFont +{ +public: + explicit CFont(const QString family, int pointSize = -1, + int weight = -1, bool italic = false, + QColor color = QColor(QString("#000000"))); + // color properties + QColor color(); + void setCurrentColor(const QColor color); + // html weight properties + static int html2QFont(const int htmlWeight); + static int qFont2html(const int weight); + int htmlWeight(); + void setHtmlWeight(const int htmlWeight); + // conversion to QFont + static CFont fromQFont(const QFont font, + const QColor color = QColor(QString("#000000"))); + QFont toQFont(); + +private: + QColor currentColor; +}; + + +class CFontDialog : public QDialog +{ + Q_OBJECT + +public: + explicit CFontDialog(QWidget *parent = 0, + const bool needWeight = true, + const bool needItalic = true); + ~CFontDialog(); + static CFont getFont(const QString title = tr("Select font"), + CFont defaultFont = CFont(QString("Arial"), + 12, 400, false, + QColor(QString("#000000"))), + const bool needWeight = true, + const bool needItalic = true, + int *status = nullptr); + +private slots: + void updateColor(const QString color); + +private: + QComboBox *colorBox; + QDialogButtonBox *buttons; + QFontComboBox *fontBox; + QComboBox *italicBox; + QSpinBox *sizeBox; + QSpinBox *weightBox; +}; + + +#endif /* FONTDIALOG_H */ diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 663ab5e..4112eac 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.16.0) # some fucking magic cmake_policy(SET CMP0011 NEW) diff --git a/sources/awesome-widget/metadata.desktop b/sources/awesome-widget/metadata.desktop index 09fd0c1..9b30552 100644 --- a/sources/awesome-widget/metadata.desktop +++ b/sources/awesome-widget/metadata.desktop @@ -22,6 +22,5 @@ X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget X-KDE-PluginInfo-Version=@PROJECT_VERSION@ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index 461fcb4..55570a3 100644 --- a/sources/awesome-widget/package/metadata.desktop +++ b/sources/awesome-widget/package/metadata.desktop @@ -22,6 +22,5 @@ X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget X-KDE-PluginInfo-Version=3.4.3 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/awesome-widget/plugin/awdbusadaptor.cpp b/sources/awesome-widget/plugin/awdbusadaptor.cpp index 1cb38a0..eece264 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.cpp +++ b/sources/awesome-widget/plugin/awdbusadaptor.cpp @@ -49,7 +49,7 @@ QStringList AWDBusAdaptor::ActiveServices() const QStringList arguments = listServices.arguments().first().toStringList(); return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(), - [](QStringList &source, const QString &service) { + [](QStringList source, const QString &service) { if (service.startsWith(AWDBUS_SERVICE)) source.append(service); return source; diff --git a/sources/awesomewidgets/qcronscheduler.h b/sources/awesomewidgets/qcronscheduler.h index 5088587..94c1600 100644 --- a/sources/awesomewidgets/qcronscheduler.h +++ b/sources/awesomewidgets/qcronscheduler.h @@ -28,20 +28,20 @@ class QCronScheduler : public QObject Q_OBJECT public: - typedef struct { + struct QCronRunSchedule { QList minutes; QList hours; QList days; QList months; QList weekdays; - } QCronRunSchedule; - typedef struct { + }; + struct QCronField { int minValue = -1; int maxValue = -1; int div = 1; void fromRange(const QString &_range, int _min, int _max); QList toList(); - } QCronField; + }; explicit QCronScheduler(QObject *_parent = nullptr); ~QCronScheduler() override; diff --git a/sources/compiler.cmake b/sources/compiler.cmake index 0e25c13..9dd0fda 100644 --- a/sources/compiler.cmake +++ b/sources/compiler.cmake @@ -17,7 +17,7 @@ else () endif () # some flags -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) # verbose output for debug builds diff --git a/sources/desktop-panel/metadata.desktop b/sources/desktop-panel/metadata.desktop index a2df8bf..a0950d9 100644 --- a/sources/desktop-panel/metadata.desktop +++ b/sources/desktop-panel/metadata.desktop @@ -22,6 +22,5 @@ X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel X-KDE-PluginInfo-Version=@PROJECT_VERSION@ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index 6ffb9c4..7596b71 100644 --- a/sources/desktop-panel/package/metadata.desktop +++ b/sources/desktop-panel/package/metadata.desktop @@ -22,6 +22,5 @@ X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel X-KDE-PluginInfo-Version=3.4.3 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-EnabledByDefault=true diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 434564a..6fbf218 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -64,7 +65,7 @@ bool DPAdds::isDebugEnabled() int DPAdds::currentDesktop() { - return KWindowSystem::currentDesktop(); + return KX11Extras::currentDesktop(); } @@ -87,7 +88,7 @@ QStringList DPAdds::dictKeys(const bool _sorted, const QString &_regexp) int DPAdds::numberOfDesktops() { - return KWindowSystem::numberOfDesktops(); + return KX11Extras::numberOfDesktops(); } @@ -236,7 +237,7 @@ QString DPAdds::valueByKey(const QString &_key, int _desktop) const .arg(currentMark, m_mark.count(), QLatin1Char(' ')) .replace(" ", " "); else if (_key == "name") - return KWindowSystem::desktopName(_desktop).replace(" ", " "); + return KX11Extras::desktopName(_desktop).replace(" ", " "); else if (_key == "number") return QString::number(_desktop); else if (_key == "total") @@ -290,7 +291,7 @@ void DPAdds::setCurrentDesktop(const int _desktop) { qCDebug(LOG_DP) << "Desktop" << _desktop; - KWindowSystem::setCurrentDesktop(_desktop); + KX11Extras::setCurrentDesktop(_desktop); } @@ -300,9 +301,9 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int _desktop) DesktopWindowsInfo info; - info.desktop = KWindowSystem::workArea(_desktop); + info.desktop = KX11Extras::workArea(_desktop); - for (auto &id : KWindowSystem::windows()) { + for (auto &id : KX11Extras::windows()) { KWindowInfo winInfo = KWindowInfo( id, NET::Property::WMDesktop | NET::Property::WMGeometry | NET::Property::WMState | NET::Property::WMWindowType | NET::Property::WMVisibleName); diff --git a/sources/extsysmon/plasma-dataengine-extsysmon.desktop b/sources/extsysmon/plasma-dataengine-extsysmon.desktop index 8481949..19664fb 100644 --- a/sources/extsysmon/plasma-dataengine-extsysmon.desktop +++ b/sources/extsysmon/plasma-dataengine-extsysmon.desktop @@ -13,5 +13,4 @@ X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=extsysmon X-KDE-PluginInfo-Version=@PROJECT_VERSION@ X-KDE-PluginInfo-Category=System Information -X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL3 diff --git a/sources/extsysmonsources/desktopsource.cpp b/sources/extsysmonsources/desktopsource.cpp index 746e2bf..ad6146d 100644 --- a/sources/extsysmonsources/desktopsource.cpp +++ b/sources/extsysmonsources/desktopsource.cpp @@ -18,7 +18,7 @@ #include "desktopsource.h" -#include +#include #include "awdebug.h" @@ -41,17 +41,17 @@ QVariant DesktopSource::data(const QString &_source) { qCDebug(LOG_ESS) << "Source" << _source; - int current = KWindowSystem::currentDesktop(); - int total = KWindowSystem::numberOfDesktops(); + int current = KX11Extras::currentDesktop(); + int total = KX11Extras::numberOfDesktops(); if (_source == "desktop/current/name") { - return KWindowSystem::desktopName(current); + return KX11Extras::desktopName(current); } else if (_source == "desktop/current/number") { return current; } else if (_source == "desktop/total/name") { QStringList desktops; for (int i = 1; i < total + 1; i++) - desktops.append(KWindowSystem::desktopName(i)); + desktops.append(KX11Extras::desktopName(i)); return desktops; } else if (_source == "desktop/total/number") { return total;