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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkate=5D_kate/app=3A_do_not_loose_shortcuts_by_not_s?=
From:       Dominik Haumann <dhaumann () kde ! org>
Date:       2011-06-24 20:56:17
Message-ID: 20110624205617.670C4A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit a2497ff09388e39c07173af26e47f51d37fe25e6 by Dominik Haumann.
Committed on 24/06/2011 at 22:54.
Pushed by dhaumann into branch 'master'.

do not loose shortcuts by not setting the DefaultShortcut flag

BUG: 144945

M  +0    -5    kate/app/katemainwindow.cpp     
M  +3    -8    kate/app/katemdi.cpp     
M  +1    -2    kate/app/katemdi.h     

http://commits.kde.org/kate/a2497ff09388e39c07173af26e47f51d37fe25e6

diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index eb092a2..1729c52 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -707,9 +707,6 @@ void KateMainWindow::editKeys()
 //     kDebug(13001)<<client->componentData().aboutData()->programName();
     dlg.addCollection ( client->actionCollection(), \
client->componentData().aboutData()->programName() );  }
-  /*
-    dlg.insert( externalTools->actionCollection(), i18n("External Tools") );
-  */
   dlg.configure();
 
   QList<KTextEditor::Document*>  l = KateDocManager::self()->documentList();
@@ -724,8 +721,6 @@ void KateMainWindow::editKeys()
 //       kDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1;
     }
   }
-
-  //externalTools->actionCollection()->writeSettings( new KConfig("externaltools", \
false, false, "appdata") );  }
 
 void KateMainWindow::openUrl (const QString &name)
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index e28388b..1f46da5 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -51,12 +51,11 @@ namespace KateMDI
 
 //BEGIN TOGGLETOOLVIEWACTION
 
-  ToggleToolViewAction::ToggleToolViewAction ( const QString& text, const KShortcut& \
cut, ToolView *tv, +  ToggleToolViewAction::ToggleToolViewAction ( const QString& \
text, ToolView *tv,  QObject* parent )
       : KToggleAction(text, parent)
       , m_tv(tv)
   {
-    setShortcut(cut);
     connect(this, SIGNAL(toggled(bool)), this, SLOT(slotToggled(bool)));
     connect(m_tv, SIGNAL(toolVisibleChanged(bool)), this, \
SLOT(toolVisibleChanged(bool)));  
@@ -139,11 +138,7 @@ namespace KateMDI
 
     actionCollection()->addAssociatedWidget(m_mw);
     foreach (QAction* action, actionCollection()->actions())
-#if QT_VERSION < KDE_MAKE_VERSION(4,4,0)
-      action->setShortcutContext(Qt::WidgetShortcut); // remove after Qt4.4 becomes \
                mandatory
-#else
       action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-#endif
   }
 
   GUIClient::~GUIClient()
@@ -163,8 +158,8 @@ namespace KateMDI
     KSharedConfig::Ptr cfg = KGlobal::config();
     sc = KShortcut( cfg->group("Shortcuts").readEntry( aname, QString() ) );
 
-    KToggleAction *a = new ToggleToolViewAction(i18n("Show %1", tv->text),
-                       sc, tv, this );
+    KToggleAction *a = new ToggleToolViewAction(i18n("Show %1", tv->text), tv, this \
); +    a->setShortcut(sc, KAction::ActiveShortcut); // no DefaultShortcut! see bug \
#144945  actionCollection()->addAction( aname.toLatin1(), a );
 
     m_toolViewActions.append(a);
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 5347cee..0ef9e3a 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -49,8 +49,7 @@ namespace KateMDI
       Q_OBJECT
 
     public:
-      ToggleToolViewAction ( const QString& text, const KShortcut& cut,
-                             class ToolView *tv, QObject *parent );
+      ToggleToolViewAction ( const QString& text, ToolView *tv, QObject *parent );
 
       virtual ~ToggleToolViewAction();
 


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