[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/farhad_hf/lockscreen] /: moved screen locking
From:       Farhad Hedayati Fard <hf.farhad () gmail ! com>
Date:       2011-07-27 12:15:42
Message-ID: 20110727121542.D76F9A60AE () git ! kde ! org
[Download RAW message or body]

Git commit 6e7c02a6b79576cdc4d474803d8553e8dd73c9b3 by Farhad Hedayati Fard.
Committed on 27/07/2011 at 14:13.
Pushed by hedayatifard into branch 'farhad_hf/lockscreen'.

moved screen locking shortcut from krunner to kwin (kwinbindings).

M  +1    -1    kwin/workspace.h
M  +6    -6    kwin/CMakeLists.txt
M  +7    -0    kwin/useractions.cpp
M  +0    -1    krunner/krunnerapp.cpp
M  +1    -0    kwin/kwinbindings.cpp
M  +1    -3    krunner/CMakeLists.txt

http://commits.kde.org/kde-workspace/6e7c02a6b79576cdc4d474803d8553e8dd73c9b3

diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index e47728d..02312b2 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -66,9 +66,7 @@ if(NOT WIN32)
   target_link_libraries(kdeinit_krunner processui  ${X11_Xrender_LIB} ${X11_LIBRARIES})
 endif(NOT WIN32)
 
-if(X11_Xss_LIB)
-  target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
-endif(X11_Xss_LIB)
+
 
 if(X11_Xcursor_FOUND)
   target_link_libraries(kdeinit_krunner ${X11_Xcursor_LIB})
diff --git a/krunner/krunnerapp.cpp b/krunner/krunnerapp.cpp
index 9071fb9..3b380cb 100644
--- a/krunner/krunnerapp.cpp
+++ b/krunner/krunnerapp.cpp
@@ -158,7 +158,6 @@ void KRunnerApp::initialize()
     if (KAuthorized::authorize(QLatin1String("lock_screen"))) {
         a = m_actionCollection->addAction(QLatin1String("Lock Session"));
         a->setText(i18n("Lock Session"));
-        a->setGlobalShortcut(KShortcut(Qt::ALT+Qt::CTRL+Qt::Key_L));
         connect(a, SIGNAL(triggered(bool)), this, SLOT(lock()));
     }
 #endif
diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 002910f..98edc3b 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -213,12 +213,12 @@ qt4_add_dbus_interface( kwin_KDEINIT_SRCS
 
 qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
 
-SET_SOURCE_FILES_PROPERTIES(
-     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
-     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
-     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
-     PROPERTIES GENERATED 1
-)
+# SET_SOURCE_FILES_PROPERTIES(
+#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
+#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
+#      ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
+#      PROPERTIES GENERATED 1
+# )
 set (
      kwin_KDEINIT_SRCS
      ${kwin_KDEINIT_SRCS}
diff --git a/kwin/kwinbindings.cpp b/kwin/kwinbindings.cpp
index 0d81857..40bba26 100644
--- a/kwin/kwinbindings.cpp
+++ b/kwin/kwinbindings.cpp
@@ -158,6 +158,7 @@ for (int i = 0; i < 8; ++i) {
 }
 DEF(I18N_NOOP("Window to Next Screen"),            0, slotWindowToNextScreen());
 DEF(I18N_NOOP("Show Desktop"),                     0, slotToggleShowDesktop());
+DEF(I18N_NOOP("Lock Screen"), Qt::ALT+Qt::CTRL+Qt::Key_L, slotLockScreen());
 
 a = actionCollection->addAction("Group:Desktop Switching");
 a->setText(i18n("Desktop Switching"));
diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp
index 387e499..44685b9 100644
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@ -1728,4 +1728,11 @@ bool Workspace::shortcutAvailable(const KShortcut& cut, Client* ignore) const
     return true;
 }
 
+void Workspace::slotLockScreen()
+{
+    m_saver.Lock();
+}
+
 } // namespace
+
+
diff --git a/kwin/workspace.h b/kwin/workspace.h
index f83cfc9..bd926b3 100644
--- a/kwin/workspace.h
+++ b/kwin/workspace.h
@@ -642,7 +642,7 @@ public slots:
     void slotToggleFloating();
     void slotNextTileLayout();
     void slotPreviousTileLayout();
-
+    void slotLockScreen();
     // Changes the focused client
     void slotFocusTileLeft();
     void slotFocusTileRight();

[prev in list] [next in list] [prev in thread] [next in thread]