Browse Source

Clear all unwanted KatePart shortcuts causing conflicts, not just the one for Find.

git-svn-id: file:///var/svn/tigccpp/trunk@1234 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 16 years ago
parent
commit
bc14de6c62
2 changed files with 10 additions and 2 deletions
  1. 5 1
      ktigcc/mainform.cpp
  2. 5 1
      ktigcc/srcfilewin.cpp

+ 5 - 1
ktigcc/mainform.cpp

@@ -109,6 +109,7 @@ class DnDListView : public K3ListView {
 #include <QAssistantClient>
 #include <QDBusConnection>
 #include <QDBusReply>
+#include <QAction>
 #include <kapplication.h>
 #include <kparts/factory.h>
 #include <klibloader.h>
@@ -145,6 +146,7 @@ class DnDListView : public K3ListView {
 #include <kpushbutton.h>
 #include <kmacroexpander.h>
 #include <kstandardaction.h>
+#include <kactioncollection.h>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -1919,7 +1921,9 @@ void *MainForm::createView(const QString &fileName, const QString &fileText, Q3L
   connect(newView->document(),SIGNAL(undoChanged()),this,SLOT(current_view_undoChanged()));
   newView->setContextMenu(te_popup);
   newView->setCursorPosition(KTextEditor::Cursor(0,0));
-  newView->action(KStandardAction::name(KStandardAction::Find))->setShortcut(QKeySequence());
+  // Clear unwanted KatePart shortcuts causing conflicts
+  QList<QAction *>actions=newView->actionCollection()->actions();
+  foreach(QAction *action, actions) action->setShortcuts(QKeySequence::UnknownKey);
   return newView;
 }
 

+ 5 - 1
ktigcc/srcfilewin.cpp

@@ -46,6 +46,7 @@
 #include <QCloseEvent>
 #include <QTextCodec>
 #include <QAssistantClient>
+#include <QAction>
 #include <kparts/factory.h>
 #include <klibloader.h>
 #include <ktexteditor/editor.h>
@@ -69,6 +70,7 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandardaction.h>
+#include <kactioncollection.h>
 #include <cstdio>
 #include <cstdlib>
 #include "ktigcc.h"
@@ -526,7 +528,9 @@ void *SourceFileWindow::createView(const QString &fileName, const QString &hlMod
   connect(newView->document(),SIGNAL(undoChanged()),this,SLOT(current_view_undoChanged()));
   newView->setContextMenu(te_popup);
   newView->setCursorPosition(KTextEditor::Cursor(0,0));
-  newView->action(KStandardAction::name(KStandardAction::Find))->setShortcut(QKeySequence());
+  // Clear unwanted KatePart shortcuts causing conflicts
+  QList<QAction *>actions=newView->actionCollection()->actions();
+  foreach(QAction *action, actions) action->setShortcuts(QKeySequence::UnknownKey);
   return newView;
 }