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

List:       kde-commits
Subject:    KDE/kdepim/kjots
From:       David Faure <faure () kde ! org>
Date:       2010-10-20 21:30:29
Message-ID: 20101020213029.4575AAC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187963 by dfaure:

Use KAction API to "make add_bookmark use ctrl+shift+b to avoid the conflict with \
Bold", because KAction is where the handling of "app-default shortcut" and \
"user-modified shortcut" is done, QAction is too lowlevel for this.
BUG: 190096


 M  +3 -2      kjotswidget.cpp  


--- trunk/KDE/kdepim/kjots/kjotswidget.cpp #1187962:1187963
@@ -347,8 +347,9 @@
 
   // "Add bookmark" and "make text bold" actions have conflicting shortcuts (ctrl + \
b)  // Make add_bookmark use ctrl+shift+b to resolve that.
-  QAction *bm_action = actionCollection->action("add_bookmark");
-  bm_action->setShortcuts( QList<QKeySequence>() << ( QKeySequence( Qt::CTRL + \
Qt::SHIFT + Qt::Key_B ) ) ); +  KAction *bm_action = qobject_cast<KAction \
*>(actionCollection->action("add_bookmark")); +  Q_ASSERT(bm_action);
+  bm_action->setShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_B );
 
   KStandardAction::find( this, SLOT( onShowSearch() ), actionCollection );
   action = KStandardAction::findNext( this, SLOT( onRepeatSearch() ), \
actionCollection );


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