From 85961ce0a3c937af65ebb47d690886d7b8f2bbf4 Mon Sep 17 00:00:00 2001 From: Rivo Laks Date: Sat, 24 Nov 2007 13:43:52 +0000 Subject: [PATCH] Add KWin::GlobalShortcutsEditor which is a KShortcutsEditor that only edits global shortcuts. This allows shortcut editor widgets to be added in Designer (for 4.1 KShortcutsEditor should probably get setActionTypes() method so that it needn't be set in it's ctor). libkwineffects also links to kdeui now, I hope it's ok since it linked to QtGUI and kdecore already anyway. svn path=/trunk/KDE/kdebase/workspace/; revision=740954 --- lib/CMakeLists.txt | 2 +- lib/kwineffects.cpp | 9 +++++++++ lib/kwineffects.h | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index fd5eae4ae3..4e6b7ad310 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -32,7 +32,7 @@ set(kwin_EFFECTSLIB_SRCS kwinshadereffect.cpp ) kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS}) -target_link_libraries(kwineffects ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES}) +target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES}) set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install(TARGETS kwineffects DESTINATION ${LIB_INSTALL_DIR}) diff --git a/lib/kwineffects.cpp b/lib/kwineffects.cpp index a4a3de4a38..f9db7e9a67 100644 --- a/lib/kwineffects.cpp +++ b/lib/kwineffects.cpp @@ -422,6 +422,15 @@ EffectWindowGroup::~EffectWindowGroup() { } +//**************************************** +// GlobalShortcutsEditor +//**************************************** + +GlobalShortcutsEditor::GlobalShortcutsEditor( QWidget *parent ) : + KShortcutsEditor( parent, GlobalAction ) + { + } + /*************************************************************** WindowQuad ***************************************************************/ diff --git a/lib/kwineffects.h b/lib/kwineffects.h index 8f935dd242..5c446866d5 100644 --- a/lib/kwineffects.h +++ b/lib/kwineffects.h @@ -24,7 +24,8 @@ License. See the file "COPYING" for the exact licensing terms. #include #include -#include +#include +#include #include @@ -32,6 +33,7 @@ License. See the file "COPYING" for the exact licensing terms. class KLibrary; class KConfigGroup; +class KActionCollection; class QKeyEvent; namespace KWin @@ -529,6 +531,12 @@ class KWIN_EXPORT EffectWindowGroup virtual EffectWindowList members() const = 0; }; +class KWIN_EXPORT GlobalShortcutsEditor : public KShortcutsEditor + { + public: + GlobalShortcutsEditor( QWidget *parent ); + }; + /** * @short Vertex class *