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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kxkb
From:       Andriy Rysin <arysin () gmail ! com>
Date:       2008-03-01 3:05:39
Message-ID: 1204340739.496957.29442.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780807 by rysin:

- provide toggled() and getKDEShortcut() in KxkbPart

 M  +14 -0     kxkb_part.cpp  
 M  +8 -4      kxkb_part.h  
 M  +10 -0     kxkbcore.cpp  
 M  +3 -1      kxkbcore.h  


--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkb_part.cpp #780806:780807
@@ -23,6 +23,8 @@
 #include <KPluginLoader>
 #include <KDebug>
 
+#include <kshortcut.h>
+
 #include "kxkb_part.h"
 #include "kxkbwidget.h"
 #include "kxkbcore.h"
@@ -82,3 +84,15 @@
 {
     return m_kxkbCore->getLayoutsList();
 }
+
+void
+KxkbPart::toggled()
+{
+    m_kxkbCore->toggled();
+}
+
+const KShortcut* 
+KxkbPart::getKDEShortcut()
+{
+    return m_kxkbCore->getKDEShortcut();
+}
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkb_part.h #780806:780807
@@ -19,27 +19,31 @@
 #ifndef __kxkb_part_h
 #define __kxkb_part_h
 
+#include <QString>
 #include <QWidget>
 #include <QList>
 #include <QVariant>
 
-class QString;
+class KShortcut;
 class KxkbCore;
 
 class KxkbPart : public QWidget
 {
   Q_OBJECT
- public:
+
+public:
   KxkbPart( QWidget* parent,
                const QList<QVariant>& args = QList<QVariant>() );
   virtual ~KxkbPart();
 
- protected slots:
+public slots:
   bool setLayout(const QString& layoutPair);
   QString getCurrentLayout();
   QStringList getLayoutsList();
+  void toggled();
+  const KShortcut* getKDEShortcut();
 
- private:
+private:
     KxkbCore* m_kxkbCore;
 };
 
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkbcore.cpp #780806:780807
@@ -165,6 +165,16 @@
     }
 }
 
+const KShortcut* KxkbCore::getKDEShortcut() {
+    if( actionCollection == NULL )
+        return NULL;
+    KAction* kAction = static_cast<KAction*>(actionCollection->action(0));
+    if (kAction == NULL) 
+        return NULL;
+        
+    return &kAction->globalShortcut();
+}
+
 void KxkbCore::stopKDEShortcut()
 {
     if( actionCollection != NULL ) {
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkbcore.h #780806:780807
@@ -39,6 +39,7 @@
 class LayoutMap;
 class KxkbWidget;
 class QAction;
+class KShortcut;
 
 //typedef KxkbWidget* (*KxkbWidgetCreateFn(KxkbWidget*));
 
@@ -62,16 +63,17 @@
     bool x11EventFilter ( XEvent * event );
     void setWidget(KxkbWidget* kxkbWidet);
     void cleanup();
+    const KShortcut* getKDEShortcut();
 
 // DBUS:
 public slots:
     bool setLayout(const QString& layoutPair);
     QString getCurrentLayout() { return m_kxkbConfig.m_layouts[m_currentLayout].toPair(); }
     QStringList getLayoutsList() { return m_kxkbConfig.getLayoutStringList(); }
+    void toggled();
 
 protected slots:
     void iconMenuTriggered(QAction*);
-    void toggled();
     void windowChanged(WId winId);
     void desktopChanged(int desktop);
 
[prev in list] [next in list] [prev in thread] [next in thread]