arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 14:55:48 +00:00
Code Issues Projects Releases Wiki Activity

Release 4.0.0

Browse Source
This commit is contained in:
Evgenii Alekseev
2024-03-25 13:59:25 +02:00
parent 115bef3dbe
commit 161ff64293
11 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/CMakeLists.txt
View File

@ -14,9 +14,9 @@ project(awesomewidgets)
set(PROJECT_AUTHOR "Evgeniy Alekseev")
set(PROJECT_CONTACT "esalexeev@gmail.com")
set(PROJECT_LICENSE "GPL3")
set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "5")
set(PROJECT_VERSION_PATCH "1")
set(PROJECT_VERSION_MAJOR "4")
set(PROJECT_VERSION_MINOR "0")
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 "")

14
sources/awesome-widget/plugin/awdataenginemapper.cpp
View File

@ -131,15 +131,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
key.remove("extsysmon/custom/");
m_map.insert(_source, key);
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
} else if (_source == "extsysmon/desktop/current/name") {
} else if (_source == "extsysmon/desktop/name") {
// current desktop name
m_map.insert(_source, "desktop");
m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
} else if (_source == "extsysmon/desktop/current/number") {
} else if (_source == "extsysmon/desktop/number") {
// current desktop number
m_map.insert(_source, "ndesktop");
m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
} else if (_source == "extsysmon/desktop/total/number") {
} else if (_source == "extsysmon/desktop/count") {
// desktop count
m_map.insert(_source, "tdesktops");
m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
@ -217,7 +217,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
} else if (_source.startsWith("extsysmon/hdd/temperature")) {
// hdd temperature
QString device = _source;
device.remove("hdd/temperature");
device.remove("extsysmon/hdd/temperature");
int index = m_devices["hdd"].indexOf(device);
if (index > -1) {
QString key = QString("hddtemp%1").arg(index);
@ -313,15 +313,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
key.remove("extsysmon/player/");
m_map.insert(_source, key);
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
} else if (_source == "extsysmon/ps/running/count") {
} else if (_source == "extsysmon/ps/running") {
// running processes count
m_map.insert(_source, "pscount");
m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
} else if (_source == "extsysmon/ps/running/list") {
} else if (_source == "extsysmon/ps/list") {
// list of running processes
m_map.insert(_source, "ps");
m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
} else if (_source == "extsysmon/ps/total/count") {
} else if (_source == "extsysmon/ps/count") {
// total processes count
m_map.insert(_source, "pstot");
m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;

12
sources/awesome-widget/plugin/awkeyoperations.cpp
View File

@ -302,17 +302,17 @@ void AWKeyOperations::addDevice(const QString &_source)
{
qCDebug(LOG_AW) << "Source" << _source;
auto diskRegexp = QRegularExpression("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
auto mountRegexp = QRegularExpression("partitions/.*/filllevel");
auto diskRegexp = QRegularExpression("disk/.*/read");
auto mountRegexp = QRegularExpression("disk/.*/usedPercent");
auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
if (_source.contains(diskRegexp)) {
QString device = _source;
device.remove("/Rate/rblk");
auto device = _source;
device.remove("disk/").remove("/read");
addKeyToCache("disk", device);
} else if (_source.contains(mountRegexp)) {
QString device = _source;
device.remove("partitions").remove("/filllevel");
auto device = _source;
device.remove("disk/").remove("/usedPercent");
addKeyToCache("mount", device);
} else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
|| _source == "cpu/all/averageTemperature") {

1
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -64,7 +64,6 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
// custom
createSensor("custom", i18n("Scripts"), new CustomSource(this, {}));
// desktop
// FIXME causes segfault
createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
// gpu load
createSensor("gpuload", i18n("GPU load"), new GPULoadSource(this, {_config["GPUDEV"]}));

24
sources/extsysmonsources/desktopsource.cpp
View File

@ -51,13 +51,13 @@ QVariant DesktopSource::data(const QString &_source)
auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
auto current = nativeIndex - decrement;
if (_source == "current/name") {
if (_source == "name") {
return m_vdi->desktopNames().at(current);
} else if (_source == "current/number") {
} else if (_source == "number") {
return current + 1;
} else if (_source == "total/name") {
} else if (_source == "names") {
return m_vdi->desktopNames();
} else if (_source == "total/number") {
} else if (_source == "count") {
return m_vdi->numberOfDesktops();
}
@ -70,20 +70,20 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "current/name") {
if (_source == "name") {
data->name = "Current desktop name";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "current/number") {
} else if (_source == "number") {
data->min = 0;
data->name = "Current desktop number";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source == "total/name") {
} else if (_source == "names") {
data->name = "All desktops by name";
data->variantType = QVariant::StringList;
data->unit = KSysGuard::UnitNone;
} else if (_source == "total/number") {
} else if (_source == "count") {
data->min = 0;
data->name = "Desktops count";
data->variantType = QVariant::Int;
@ -97,10 +97,10 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
QStringList DesktopSource::sources() const
{
QStringList sources;
sources.append("current/name");
sources.append("current/number");
sources.append("total/name");
sources.append("total/number");
sources.append("name");
sources.append("number");
sources.append("names");
sources.append("count");
return sources;
}

18
sources/extsysmonsources/processessource.cpp
View File

@ -56,17 +56,17 @@ KSysGuard::SensorInfo *ProcessesSource::initialData(const QString &_source) cons
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "running/count") {
if (_source == "running") {
data->min = 0;
data->max = 0;
data->name = "Count of running processes";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source == "running/list") {
} else if (_source == "list") {
data->name = "All running processes list";
data->variantType = QVariant::StringList;
data->unit = KSysGuard::UnitNone;
} else if (_source == "total/count") {
} else if (_source == "count") {
data->min = 0;
data->max = 0;
data->name = "Total count of processes";
@ -99,18 +99,18 @@ void ProcessesSource::run()
cmdFile.close();
}
m_values["running/count"] = running.count();
m_values["running/list"] = running;
m_values["total/count"] = directories.count();
m_values["running"] = running.count();
m_values["list"] = running;
m_values["count"] = directories.count();
}
QStringList ProcessesSource::sources() const
{
QStringList sources;
sources.append("running/count");
sources.append("running/list");
sources.append("total/count");
sources.append("running");
sources.append("list");
sources.append("count");
return sources;
}

4
sources/test/CMakeLists.txt
View File

@ -20,9 +20,9 @@ include_directories(
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} ${Kf6_LIBRARIES})
target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt6Test_LIBRARIES} ${Kf6_LIBRARIES})
set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES}
${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt5Test_LIBRARIES})
${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt6Test_LIBRARIES})
# modules
set(TEST_MODULES