use lookandfeelaccess for logout screen

wilder-5.14
Marco Martin 12 years ago
parent 74e3600185
commit 57d64e103b
  1. 1
      ksmserver/CMakeLists.txt
  2. 8
      ksmserver/shutdowndlg.cpp
  3. 1
      ksmserver/tests/CMakeLists.txt

@ -23,6 +23,7 @@ set(ksmserver_KDEINIT_SRCS
startup.cpp
shutdown.cpp
client.cpp
../lookandfeelaccess/lookandfeelaccess.cpp
#TODO: figure out what do to with these effects
# logouteffect.cpp
# fadeeffect.cpp

@ -67,6 +67,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kjob.h>
#include <qstandardpaths.h>
#include "../../lookandfeelaccess/lookandfeelaccess.h"
#define FONTCOLOR "#bfbfbf"
Q_DECLARE_METATYPE(Solid::PowerManagement::SleepState)
@ -152,9 +154,9 @@ KSMShutdownDlg::KSMShutdownDlg( QWindow* parent,
QString fileName;
if(theme.isEmpty()) {
ShellPluginLoader::init();
Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/LookAndFeel");
pkg.setPath("org.kde.lookandfeel");
fileName = pkg.filePath("logoutmainscript", QString());
LookAndFeelAccess access;
fileName = access.filePath("logoutmainscript");
} else
fileName = theme;

@ -2,6 +2,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
set(testsh_SRCS
test.cpp
../../lookandfeelaccess/lookandfeelaccess.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../shutdowndlg.cpp
# ${CMAKE_CURRENT_SOURCE_DIR}/../logouteffect.cpp
# ${CMAKE_CURRENT_SOURCE_DIR}/../curtaineffect.cpp

Loading…
Cancel
Save