arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-30 18:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: arcanis:eecb128865d463a5e8faeb09f2b0b7d9d6d682f0
Branches Tags
arcanis:master
arcanis:release-3.5.1
arcanis:release-2.4.0
arcanis:release-2.2.1
arcanis:4.0.1
arcanis:4.0.0
arcanis:4.0.0alpha2
arcanis:4.0.0alpha1
arcanis:3.5.1
arcanis:3.5.0
arcanis:V.3.4.3
arcanis:3.4.2
arcanis:V.3.4.2
arcanis:V.3.3.3
arcanis:V.3.3.2
arcanis:V.3.3.1
arcanis:V.3.2.1
arcanis:V.3.2.0
arcanis:V.3.1.2
arcanis:V.3.1.1
arcanis:V.3.1.0
arcanis:V.3.0.1
arcanis:V.3.0.0
arcanis:V.2.4.0
arcanis:V.2.3.3
arcanis:V.2.3.2
arcanis:V.2.3.1
arcanis:V.2.3.0
arcanis:V.2.2.2
arcanis:V.2.2.1
arcanis:V.2.2.0
arcanis:V.2.1.0
arcanis:V.2.0.5
arcanis:V.2.0.4
arcanis:V.2.0.3
arcanis:V.2.0.2
arcanis:V.2.0.1
arcanis:V.2.0.0
arcanis:V.1.11.0
arcanis:V.1.10.2
arcanis:V.1.10.1
arcanis:V.1.10.0
arcanis:V.1.9.0
arcanis:V.1.8.3
arcanis:V.1.8.2
arcanis:V.1.8.1
arcanis:V.1.8.0
arcanis:V.1.7.4
arcanis:V.1.7.3
arcanis:V.1.7.2
arcanis:V.1.7.1
arcanis:V.1.7.0
arcanis:V.1.6.1
arcanis:V.1.6.0
arcanis:V.1.5.3
arcanis:V.1.5.2
arcanis:V.1.5.1
arcanis:V.1.5.0
arcanis:V.1.4.0
arcanis:V.1.3.6
arcanis:V.1.3.5
arcanis:V.1.3.4
..
compare: arcanis:88f70c0ea6946070c522c4167c68290af96115b5
Branches Tags
arcanis:master
arcanis:release-3.5.1
arcanis:release-2.4.0
arcanis:release-2.2.1
arcanis:4.0.1
arcanis:4.0.0
arcanis:4.0.0alpha2
arcanis:4.0.0alpha1
arcanis:3.5.1
arcanis:3.5.0
arcanis:V.3.4.3
arcanis:3.4.2
arcanis:V.3.4.2
arcanis:V.3.3.3
arcanis:V.3.3.2
arcanis:V.3.3.1
arcanis:V.3.2.1
arcanis:V.3.2.0
arcanis:V.3.1.2
arcanis:V.3.1.1
arcanis:V.3.1.0
arcanis:V.3.0.1
arcanis:V.3.0.0
arcanis:V.2.4.0
arcanis:V.2.3.3
arcanis:V.2.3.2
arcanis:V.2.3.1
arcanis:V.2.3.0
arcanis:V.2.2.2
arcanis:V.2.2.1
arcanis:V.2.2.0
arcanis:V.2.1.0
arcanis:V.2.0.5
arcanis:V.2.0.4
arcanis:V.2.0.3
arcanis:V.2.0.2
arcanis:V.2.0.1
arcanis:V.2.0.0
arcanis:V.1.11.0
arcanis:V.1.10.2
arcanis:V.1.10.1
arcanis:V.1.10.0
arcanis:V.1.9.0
arcanis:V.1.8.3
arcanis:V.1.8.2
arcanis:V.1.8.1
arcanis:V.1.8.0
arcanis:V.1.7.4
arcanis:V.1.7.3
arcanis:V.1.7.2
arcanis:V.1.7.1
arcanis:V.1.7.0
arcanis:V.1.6.1
arcanis:V.1.6.0
arcanis:V.1.5.3
arcanis:V.1.5.2
arcanis:V.1.5.1
arcanis:V.1.5.0
arcanis:V.1.4.0
arcanis:V.1.3.6
arcanis:V.1.3.5
arcanis:V.1.3.4

No commits in common. "eecb128865d463a5e8faeb09f2b0b7d9d6d682f0" and "88f70c0ea6946070c522c4167c68290af96115b5" have entirely different histories.
eecb128865 ... 88f70c0ea6

4 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
sources/CMakeLists.txt
View File

@ -16,7 +16,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
set(PROJECT_LICENSE "GPL3") set(PROJECT_LICENSE "GPL3")
set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "5") set(PROJECT_VERSION_MINOR "5")
set(PROJECT_VERSION_PATCH "1") set(PROJECT_VERSION_PATCH "0")
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 "")

2
sources/awesome-widget/package/metadata.desktop
View File

@ -19,7 +19,7 @@ X-Plasma-MainScript=ui/main.qml
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
X-KDE-PluginInfo-Version=3.5.1 X-KDE-PluginInfo-Version=3.5.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-License=GPLv3

2
sources/desktop-panel/package/metadata.desktop
View File

@ -19,7 +19,7 @@ X-Plasma-MainScript=ui/main.qml
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
X-KDE-PluginInfo-Version=3.5.1 X-KDE-PluginInfo-Version=3.5.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-License=GPLv3 X-KDE-PluginInfo-License=GPLv3

7
sources/extsysmonsources/desktopsource.cpp
View File

@ -46,14 +46,13 @@ QVariant DesktopSource::data(const QString &_source)
{ {
qCDebug(LOG_ESS) << "Source" << _source; qCDebug(LOG_ESS) << "Source" << _source;
auto nativeIndex = m_vdi->position(m_vdi->currentDesktop()); auto increment = KWindowSystem::isPlatformX11() ? 0 : 1;
auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0; auto current = m_vdi->position(m_vdi->currentDesktop()) + increment;
auto current = nativeIndex - decrement;
if (_source == "desktop/current/name") { if (_source == "desktop/current/name") {
return m_vdi->desktopNames().at(current); return m_vdi->desktopNames().at(current);
} else if (_source == "desktop/current/number") { } else if (_source == "desktop/current/number") {
return current + 1; return current;
} else if (_source == "desktop/total/name") { } else if (_source == "desktop/total/name") {
return m_vdi->desktopNames(); return m_vdi->desktopNames();
} else if (_source == "desktop/total/number") { } else if (_source == "desktop/total/number") {