yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add KWin::GlobalShortcutsEditor which is a KShortcutsEditor that only edits global shortcuts.

Browse source 
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
This commit is contained in:
Rivo Laks 2007-11-24 13:43:52 +00:00
parent 02a46d9e5a
commit 85961ce0a3
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/CMakeLists.txt
View file

@ -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})

9
lib/kwineffects.cpp
View file

@ -422,6 +422,15 @@ EffectWindowGroup::~EffectWindowGroup()
{
}
//****************************************
// GlobalShortcutsEditor
//****************************************
GlobalShortcutsEditor::GlobalShortcutsEditor( QWidget *parent ) :
KShortcutsEditor( parent, GlobalAction )
{
}
/***************************************************************
WindowQuad
***************************************************************/

10
lib/kwineffects.h
View file

@ -24,7 +24,8 @@ License. See the file "COPYING" for the exact licensing terms.
#include <QtCore/QList>
#include <QtCore/QHash>
#include <KDE/KPluginFactory>
#include <KDE/KPluginFactory>
#include <KDE/KShortcutsEditor>
#include <assert.h>
@ -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
*