Merge branch 'develop'

.gitignore

@@ -1,2 +1,4 @@
 .kdev4
 system_panel.kdev4
+
+.vscode/

AUTHORS

@@ -1 +1 @@
-Copyright (c) 2016 Carlos López Sánchez <musikolo{AT}hotmail[DOT]com>
+Copyright (c) 2024 Carlos López Sánchez <musikolo{AT}hotmail[DOT]com>

ChangeLog

@@ -1,3 +1,9 @@
+---------------------
+2024-06-23 - v.2.0.0
+---------------------
+- Port to KDe Plasma 6.
+- Other minor code enhancements. 
+
 ---------------------
 2019-07-08 - v.1.6.0
 ---------------------

INSTALL

@@ -1,21 +1,21 @@
 # (0) Minimum Requirements (tested, but might be lower)
-- Qt                    >= 5.4.0
-- KDE Workspace         >= 5.4.0
-- Plasma Framework      >= 5.19
-- extra-cmake-modules   >= 5.38.0
+- Qt                    >= 6.6.0
+- Plasma Workspace      >= 6.0.0
+- Plasma Framework      >= 6.0.0
+- extra-cmake-modules   >= 6.0.0
 
 # (1) Standard way: having root permission
 cd /path/to/system_panel/
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_INSTALL_DIR=lib -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../src/
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLIB_INSTALL_DIR=lib -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../src/
 make
 make install
 
 # (2) Alternative way: having non-root permission
 cd /path/to/system_panel/
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_INSTALL_DIR=lib -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../src/
+cmake -DCMAKE_INSTALL_PREFIX=~/local/share --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_INSTALL_DIR=lib -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../src/
 make
 make install

README.md

@@ -1,5 +1,5 @@
-# plasma5-applets-system-panel
-Plasma5 applet that displays a panel with a set of system actions.
+# plasma-applets-system-panel
+Applet for KDE Plasma 6 that displays a panel with a set of system actions.
 
 ## Screenshots:
 ![alt tag](./docs/screenshoots/system_panel_01.png)
@@ -13,7 +13,9 @@ Plasma5 applet that displays a panel with a set of system actions.
 ## Supported actions:
 - Standby (turn off monitor to save energy).
 - Lock screen.
-- Leave (log out, restart or shut down the computer).
+- Shut Down.
+- Restart.
+- Log out.
 - Switch user (switch user o create new session).
 - Sleep (suspend to RAM).
 - Hibernate (suspend to disk).
@@ -29,3 +31,11 @@ Plasma5 applet that displays a panel with a set of system actions.
 - English (default).
 - French.
 - Spanish.
+
+If you want to support a new language, please follow [these simple steps](./src/translations/TRANSLATORS.REAME.md).
+
+## Testing source code locally
+You can test this code locally by issuing the following command:
+```
+QT_LOGGING_RULES="qml.debug=true" plasmoidviewer -a src/package/
+```

TODO

@@ -1,3 +1,4 @@
-- Add contextual menu with unselected options
-- Select custom action
-- Add About tab in the Settings window
+- Improve the turnOffScreen operation to rely on DBus rather than command execution.
+- Port confirmation dialog for sleep and hibernate actions.
+- Add contextual menu with not displayed actions.
+- Implement feature to allow running custom actions.

src/CMakeLists.txt

@@ -1,23 +1,23 @@
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+project(plasma-applet-system-panel)
 
-set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.0.0")
-
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+set(QT_MIN_VERSION "6.6.0")
+set(KF6_MIN_VERSION "6.0.0")
 
+find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
+include(KDEInstallDirs6)
+include(KDECMakeSettings NO_POLICY_SCOPE)
 
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Plasma)
+find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED Quick)
+find_package(Plasma ${KF6_MIN_VERSION} REQUIRED)
 
 add_subdirectory(plugin)
 add_subdirectory(translations)
 
 plasma_install_package(package org.kde.plasma.systempanel)
 
-install( DIRECTORY image/breeze DESTINATION ${ICON_INSTALL_DIR})
-install( DIRECTORY image/breeze-dark DESTINATION ${ICON_INSTALL_DIR})
+message(STATUS "Install directory KDE_INSTALL_ICONDIR=${KDE_INSTALL_ICONDIR}")
+install( DIRECTORY image/breeze DESTINATION ${KDE_INSTALL_ICONDIR})
+install( DIRECTORY image/breeze-dark DESTINATION ${KDE_INSTALL_ICONDIR})