arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-02 16:35:52 +00:00
Code Issues Projects Releases Wiki Activity

more correct methods naming, prepare to move to templates

Browse Source
This commit is contained in:
arcan1s
2015-07-25 00:03:45 +03:00
parent 4742617e3e
commit 3b6df44489
17 changed files with 144 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/extsysmon/CMakeLists.txt
View File

@ -2,6 +2,7 @@
set (SUBPROJECT plasma_dataengine_extsysmon)
set (PLUGIN_NAME ${SUBPROJECT})
message (STATUS "Subproject ${SUBPROJECT}")
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
# find required libaries
find_package (Qt5 REQUIRED COMPONENTS DBus Network Widgets)

18
sources/extsysmon/abstractextitem.cpp
View File

@ -145,24 +145,6 @@ void AbstractExtItem::setComment(const QString _comment)
}
void AbstractExtItem::setDirectories(QStringList _directories)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Directories" << _directories;
m_dirs = _directories;
}
void AbstractExtItem::setFileName(const QString _fileName)
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Filename" << _fileName;
m_fileName = _fileName;
}
void AbstractExtItem::setInterval(const int _interval)
{
if (debug) qDebug() << PDEBUG;

10
sources/extsysmon/abstractextitem.h
View File

@ -19,6 +19,7 @@
#define ABSTRACTEXTITEM_H
#include <QDialog>
#include <QInputDialog>
#include <QVariant>
@ -28,15 +29,14 @@ class AbstractExtItem : public QDialog
Q_PROPERTY(bool active READ isActive WRITE setActive)
Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
Q_PROPERTY(QString comment READ comment WRITE setComment)
Q_PROPERTY(QStringList directories READ directories WRITE setDirectories)
Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
Q_PROPERTY(QStringList directories READ directories)
Q_PROPERTY(QString fileName READ fileName)
Q_PROPERTY(int interval READ interval WRITE setInterval)
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(int number READ number WRITE setNumber)
public:
explicit AbstractExtItem(QWidget *parent = nullptr,
const QString desktopName = QString(),
explicit AbstractExtItem(QWidget *parent = nullptr, const QString desktopName = QString(),
const QStringList directories = QStringList(),
const bool debugCmd = false);
virtual ~AbstractExtItem();
@ -54,8 +54,6 @@ public:
void setApiVersion(const int _apiVersion = 0);
void setActive(const bool _state = true);
void setComment(const QString _comment = QString("empty"));
void setDirectories(const QStringList _directories);
void setFileName(const QString _fileName);
void setInterval(const int _interval = 1);
void setName(const QString _name = QString("none"));
void setNumber(int _number = -1);

3
sources/extsysmon/extquotes.h
View File

@ -37,7 +37,8 @@ class ExtQuotes : public AbstractExtItem
public:
explicit ExtQuotes(QWidget *parent = nullptr, const QString quotesName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
const QStringList directories = QStringList(),
const bool debugCmd = false);
~ExtQuotes();
// get methods
QString ticker() const;

3
sources/extsysmon/extscript.h
View File

@ -45,7 +45,8 @@ public:
};
explicit ExtScript(QWidget *parent = nullptr, const QString scriptName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
const QStringList directories = QStringList(),
const bool debugCmd = false);
~ExtScript();
// get methods
QString executable() const;

44
sources/extsysmon/extsysmon.cpp
View File

@ -75,7 +75,7 @@ ExtendedSysMon::~ExtendedSysMon()
}
QString ExtendedSysMon::getAllHdd()
QStringList ExtendedSysMon::getAllHdd() const
{
if (debug) qDebug() << PDEBUG;
@ -85,11 +85,11 @@ QString ExtendedSysMon::getAllHdd()
devices[i] = QString("/dev/%1").arg(devices[i]);
if (debug) qDebug() << PDEBUG << ":" << "Device list" << devices;
return devices.join(QChar(','));
return devices;
}
QString ExtendedSysMon::getAutoGpu()
QString ExtendedSysMon::getAutoGpu() const
{
if (debug) qDebug() << PDEBUG;
@ -108,7 +108,7 @@ QString ExtendedSysMon::getAutoGpu()
}
QString ExtendedSysMon::getAutoMpris()
QString ExtendedSysMon::getAutoMpris() const
{
if (debug) qDebug() << PDEBUG;
@ -293,7 +293,7 @@ void ExtendedSysMon::readConfiguration()
}
QMap<QString, QString> ExtendedSysMon::updateConfiguration(QMap<QString, QString> rawConfig)
QMap<QString, QString> ExtendedSysMon::updateConfiguration(QMap<QString, QString> rawConfig) const
{
if (debug) qDebug() << PDEBUG;
@ -306,7 +306,7 @@ QMap<QString, QString> ExtendedSysMon::updateConfiguration(QMap<QString, QString
(rawConfig[QString("GPUDEV")] != QString("nvidia")))
rawConfig[QString("GPUDEV")] = getAutoGpu();
// hdddev
allHddDevices = getAllHdd().split(QChar(','), QString::SkipEmptyParts);
QStringList allHddDevices = getAllHdd();
if (rawConfig[QString("HDDDEV")] == QString("all"))
rawConfig[QString("HDDDEV")] = allHddDevices.join(QChar(','));
else if (rawConfig[QString("HDDDEV")] == QString("disable"))
@ -336,7 +336,7 @@ QMap<QString, QString> ExtendedSysMon::updateConfiguration(QMap<QString, QString
}
QVariantMap ExtendedSysMon::getBattery(const QString acpiPath)
QVariantMap ExtendedSysMon::getBattery(const QString acpiPath) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "ACPI path" << acpiPath;
@ -379,7 +379,7 @@ QVariantMap ExtendedSysMon::getBattery(const QString acpiPath)
}
QVariantMap ExtendedSysMon::getCurrentDesktop()
QVariantMap ExtendedSysMon::getCurrentDesktop() const
{
if (debug) qDebug() << PDEBUG;
@ -398,7 +398,7 @@ QVariantMap ExtendedSysMon::getCurrentDesktop()
}
float ExtendedSysMon::getGpu(const QString device)
float ExtendedSysMon::getGpu(const QString device) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Device" << device;
@ -441,7 +441,7 @@ float ExtendedSysMon::getGpu(const QString device)
}
float ExtendedSysMon::getGpuTemp(const QString device)
float ExtendedSysMon::getGpuTemp(const QString device) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Device" << device;
@ -482,7 +482,7 @@ float ExtendedSysMon::getGpuTemp(const QString device)
}
float ExtendedSysMon::getHddTemp(const QString cmd, const QString device)
float ExtendedSysMon::getHddTemp(const QString cmd, const QString device) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
@ -516,7 +516,7 @@ float ExtendedSysMon::getHddTemp(const QString cmd, const QString device)
}
QString ExtendedSysMon::getNetworkDevice()
QString ExtendedSysMon::getNetworkDevice() const
{
if (debug) qDebug() << PDEBUG;
@ -535,7 +535,7 @@ QString ExtendedSysMon::getNetworkDevice()
QVariantMap ExtendedSysMon::getPlayerInfo(const QString playerName, const QString mpdAddress,
const QString mpdPort, QString mpris)
const QString mpdPort, QString mpris) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "player" << playerName;
@ -563,7 +563,7 @@ QVariantMap ExtendedSysMon::getPlayerInfo(const QString playerName, const QStrin
}
QVariantMap ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddress, const QString mpdPort)
QVariantMap ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddress, const QString mpdPort) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "MPD" << QString("%1:%2").arg(mpdAddress).arg(mpdPort);
@ -604,7 +604,7 @@ QVariantMap ExtendedSysMon::getPlayerMpdInfo(const QString mpdAddress, const QSt
}
QVariantMap ExtendedSysMon::getPlayerMprisInfo(const QString mpris)
QVariantMap ExtendedSysMon::getPlayerMprisInfo(const QString mpris) const
{
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << "MPRIS" << mpris;
@ -654,7 +654,7 @@ QVariantMap ExtendedSysMon::getPlayerMprisInfo(const QString mpris)
}
QVariantMap ExtendedSysMon::getPsStats()
QVariantMap ExtendedSysMon::getPsStats() const
{
if (debug) qDebug() << PDEBUG;
@ -712,14 +712,12 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
} else if (source == QString("gputemp")) {
setData(source, QString("value"), getGpuTemp(configuration[QString("GPUDEV")]));
} else if (source == QString("hddtemp")) {
// fill empty list
for (int i=0; i<allHddDevices.count(); i++)
setData(source, allHddDevices[i], 0.0);
QStringList deviceList = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts);
for (int i=0; i<deviceList.count(); i++) {
setData(source, deviceList[i],
getHddTemp(configuration[QString("HDDTEMPCMD")], deviceList[i]));
}
QStringList allHddDevices = getAllHdd();
for (int i=0; i<allHddDevices.count(); i++)
setData(source, allHddDevices[i], deviceList.contains(allHddDevices[i]) ?
getHddTemp(configuration[QString("HDDTEMPCMD")], allHddDevices[i]) :
0.0);
} else if (source == QString("netdev")) {
setData(source, QString("value"), getNetworkDevice());
} else if (source == QString("pkg")) {

29
sources/extsysmon/extsysmon.h
View File

@ -34,20 +34,20 @@ public:
explicit ExtendedSysMon(QObject *parent, const QVariantList &args);
~ExtendedSysMon();
// update functions
QVariantMap getBattery(const QString acpiPath);
QVariantMap getCurrentDesktop();
float getGpu(const QString device);
float getGpuTemp(const QString device);
float getHddTemp(const QString cmd, const QString device);
QString getNetworkDevice();
QVariantMap getBattery(const QString acpiPath) const;
QVariantMap getCurrentDesktop() const;
float getGpu(const QString device) const;
float getGpuTemp(const QString device) const;
float getHddTemp(const QString cmd, const QString device) const;
QString getNetworkDevice() const;
QVariantMap getPlayerInfo(const QString playerName,
const QString mpdAddress = QString(),
const QString mpdPort = QString(),
const QString mpris = QString());
const QString mpris = QString()) const;
QVariantMap getPlayerMpdInfo(const QString mpdAddress = QString(),
const QString mpdPort = QString());
QVariantMap getPlayerMprisInfo(const QString mpris = QString());
QVariantMap getPsStats();
const QString mpdPort = QString()) const;
QVariantMap getPlayerMprisInfo(const QString mpris = QString()) const;
QVariantMap getPsStats() const;
protected:
bool sourceRequestEvent(const QString &source);
@ -63,16 +63,15 @@ private:
QList<ExtWeather *> externalWeather;
bool debug;
// reread configuration
QStringList allHddDevices;
QString getAllHdd();
QString getAutoGpu();
QString getAutoMpris();
QStringList getAllHdd() const;
QString getAutoGpu() const;
QString getAutoMpris() const;
void initQuotes();
void initScripts();
void initUpgrade();
void initWeather();
void readConfiguration();
QMap<QString, QString> updateConfiguration(QMap<QString, QString> rawConfig);
QMap<QString, QString> updateConfiguration(QMap<QString, QString> rawConfig) const;
};

3
sources/extsysmon/extupgrade.h
View File

@ -35,7 +35,8 @@ class ExtUpgrade : public AbstractExtItem
public:
explicit ExtUpgrade(QWidget *parent = nullptr, const QString upgradeName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
const QStringList directories = QStringList(),
const bool debugCmd = false);
~ExtUpgrade();
// get methods
QString executable() const;

3
sources/extsysmon/extweather.h
View File

@ -40,7 +40,8 @@ class ExtWeather : public AbstractExtItem
public:
explicit ExtWeather(QWidget *parent = nullptr, const QString weatherName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
const QStringList directories = QStringList(),
const bool debugCmd = false);
~ExtWeather();
QString weatherFromInt(const int _id) const;
// get methods