[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace/farhad_hf/lockscreen] /: Merge branch 'master' into
From: Martin_Gräßlin <mgraesslin () kde ! org>
Date: 2011-09-18 6:56:36
Message-ID: 20110918065636.765A0A607A () git ! kde ! org
[Download RAW message or body]
Git commit 0efa14a3c45aa8afcef681e2e064d86bd25e4844 by Martin Gräßlin.
Committed on 18/09/2011 at 08:56.
Pushed by graesslin into branch 'farhad_hf/lockscreen'.
Merge branch 'master' into farhad_hf/lockscreen
Conflicts:
kwin/CMakeLists.txt
kwin/useractions.cpp
kwin/workspace.h
M +0 -14 krunner/krunnerapp.cpp
M +0 -4 krunner/krunnerapp.h
M +37 -76 kwin/CMakeLists.txt
R +1 -0 kwin/screenlocker/lock/kscreenlocker.notifyrc
R +3 -3 kwin/screenlocker/screensaver/saverengine.cpp
M +42 -49 kwin/useractions.cpp
M +23 -89 kwin/workspace.h
http://commits.kde.org/kde-workspace/0efa14a3c45aa8afcef681e2e064d86bd25e4844
diff --cc krunner/krunnerapp.h
index 456b3e0,040198d..773c3e6
--- a/krunner/krunnerapp.h
+++ b/krunner/krunnerapp.h
@@@ -47,12 -49,10 +46,10 @@@ public
KActionCollection* actionCollection();
virtual int newInstance();
-#ifdef Q_WS_X11
- SaverEngine& screensaver() { return m_saver; }
-#endif
+// #ifdef Q_WS_X11
+// SaverEngine& screensaver() { return m_saver; }
+// #endif
- bool hasCompositeManager() const;
-
public Q_SLOTS:
// DBUS interface. if you change these methods, you MUST run:
// qdbuscpp2xml -m krunnerapp.h -o dbus/org.kde.krunner.App.xml
@@@ -104,8 -102,10 +101,7 @@@ private
Plasma::RunnerManager *m_runnerManager;
KActionCollection *m_actionCollection;
-#ifdef Q_WS_X11
- SaverEngine m_saver;
-#endif
KRunnerDialog *m_interface;
- PanelShadows *m_shadows;
KSystemActivityDialog *m_tasks;
StartupId *m_startupId;
bool m_firstTime;
diff --cc kwin/CMakeLists.txt
index 02f552e,bde6626..e03f0d7
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@@ -64,14 -37,10 +37,14 @@@ if(OPENGL_FOUND
include_directories(${OPENGL_INCLUDE_DIR})
endif(OPENGL_FOUND)
- if(OPENGLES_FOUND AND KWIN_HAVE_OPENGLES_COMPOSITING)
+ if(OPENGLES_FOUND)
include_directories(${OPENGLES_INCLUDE_DIR})
- endif(OPENGLES_FOUND AND KWIN_HAVE_OPENGLES_COMPOSITING)
+ endif(OPENGLES_FOUND)
+# screensaver/locking stuff:
+macro_bool_to_01(X11_Xscreensaver_FOUND HAVE_XSCREENSAVER)
+macro_log_feature(HAVE_XSCREENSAVER "libxss" "XScreenSaver Library" \
"http://www.x.org/" FALSE "" "Needed to enable screensaver status check") +
# for things that are also used by kwin libraries
configure_file(libkwineffects/kwinconfig.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h ) # for kwin internal things
@@@ -82,10 -49,9 +55,10 @@@ configure_file(screenlocker/config-xaut
########### global ###############
- include_directories(
+ include_directories(BEFORE
${CMAKE_CURRENT_BINARY_DIR}/libkwineffects
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/screenlocker
${CMAKE_CURRENT_SOURCE_DIR}/libkwineffects
${CMAKE_CURRENT_SOURCE_DIR}/libkdecorations
${CMAKE_CURRENT_SOURCE_DIR}/effects
@@@ -107,14 -72,8 +80,12 @@@ if( KWIN_BUILD_DECORATIONS
endif( KWIN_BUILD_DECORATIONS )
add_subdirectory( data )
- if( KWIN_HAVE_COMPOSITING )
add_subdirectory( effects )
- endif( KWIN_HAVE_COMPOSITING )
+
+add_subdirectory( screenlocker/lock )
+
+
########### next target ###############
set(kwin_KDEINIT_SRCS
@@@ -156,29 -115,6 +127,12 @@@
compositingprefs.cpp
desktoplayout.cpp
paintredirector.cpp
- tile.cpp
- tiling.cpp
- tilinglayout.cpp
- tilinglayoutfactory.cpp
-
- # tiling layouts
- # spiral
- #tilinglayouts/spiral/spiralfactory.cpp
- tilinglayouts/spiral/spiral.cpp
-
- # columns
- #tilinglayouts/columns/columnsfactory.cpp
- tilinglayouts/columns/columns.cpp
-
- # floating
- tilinglayouts/floating/floating.cpp
-
+
+ # screensaver activation
+ screenlocker/screensaver/saverengine.cpp
+ screenlocker/screensaver/xautolock.cpp
+ screenlocker/screensaver/xautolock_diy.c
+ screenlocker/screensaver/xautolock_engine.c
)
if(KWIN_BUILD_SCRIPTING)
@@@ -240,10 -188,8 +214,13 @@@ qt4_add_dbus_interface( kwin_KDEINIT_SR
qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
- set(kwinLibs ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} saverengine kephal kworkspace \
kdecorations kwineffects ${X11_LIBRARIES}) + set(kwinLibs ${KDE4_KDEUI_LIBS} \
${KDE4_PLASMA_LIBS} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES} \
${X11_Xrandr_LIB} ${X11_Xcomposite_LIB} ${X11_Xdamage_LIB} ${X11_Xrender_LIB} \
${X11_Xfixes_LIB}) +
++if(X11_Xscreensaver_FOUND)
++ set(kwinLibs ${kwinLibs} ${X11_Xscreensaver_LIB})
++endif(X11_Xscreensaver_FOUND)
+
- ###################
+
if(KWIN_BUILD_SCRIPTING)
set(kwinLibs ${kwinLibs} ${QT_QTSCRIPT_LIBRARY})
endif(KWIN_BUILD_SCRIPTING)
@@@ -252,26 -198,8 +229,7 @@@ if(KWIN_BUILD_TABBOX
set(kwinLibs ${kwinLibs} ${QT_QTXML_LIBRARY})
endif(KWIN_BUILD_TABBOX)
- if (X11_Xrandr_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xrandr_LIB})
- endif (X11_Xrandr_FOUND)
- if (X11_Xcomposite_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xcomposite_LIB})
- endif (X11_Xcomposite_FOUND)
- if (X11_Xdamage_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xdamage_LIB})
- endif (X11_Xdamage_FOUND)
- if (X11_Xrender_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xrender_LIB})
- endif (X11_Xrender_FOUND)
- if (X11_Xfixes_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xfixes_LIB})
- endif (X11_Xfixes_FOUND)
- if(X11_Xscreensaver_FOUND)
- set(kwinLibs ${kwinLibs} ${X11_Xscreensaver_LIB})
- endif(X11_Xscreensaver_FOUND)
-
kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
-
target_link_libraries(kdeinit_kwin ${kwinLibs})
if(OPENGL_FOUND)
diff --cc kwin/useractions.cpp
index 089d7f4,521253a..1b816f8
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@@ -564,7 -550,11 +550,12 @@@ void Workspace::initShortcuts(
tab_box->initShortcuts(actionCollection);
}
#endif
+ #ifdef KWIN_BUILD_TILING
+ if (m_tiling) {
+ m_tiling->initShortcuts(actionCollection);
+ }
+ #endif
+ m_saver.initShortcuts(actionCollection);
discardPopup(); // so that it's recreated next time
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic