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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2010-10-19 21:18:31
Message-ID: 20101019211831.44CDDAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187607 by dfaure:

Make the shortcut for "Add bookmark" configurable, even though it's initially created \
in a separate action collection so that the shortcuts and toolbar dialogs don't get \
                polluted with thousand of bookmark actions.
FIXED-IN: 4.6
BUG: 153835


 M  +10 -3     konqmainwindow.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #1187606:1187607
@@ -3696,9 +3696,16 @@
 
   m_pBookmarkMenu = new KonqBookmarkMenu( s_bookmarkManager, m_pBookmarksOwner, \
m_pamBookmarks, m_bookmarksActionCollection );  
-  QAction *addBookmark = actionCollection()->action("add_bookmark");
-  if (addBookmark)
-     addBookmark->setText(i18n("Bookmark This Location"));
+  QAction *addBookmark = m_bookmarksActionCollection->action("add_bookmark");
+  if (addBookmark) {
+     // Keep the "Add bookmark" action visible though (#153835)
+     // -> We should think of a way to mark actions as "not configurable in \
toolbars" and +     // "should not appear in shortcut dialog (!= \
isShortcutConfigurable)" instead, and use +     // a single actionCollection.
+     actionCollection()->addAction("add_bookmark", \
m_bookmarksActionCollection->takeAction(addBookmark)); +  } else {
+     kDebug() << "Action add_bookmark not found!";
+  }
 
   m_paShowMenuBar = KStandardAction::showMenubar( this, SLOT( slotShowMenuBar() ), \
this );  actionCollection()->addAction( \
KStandardAction::name(KStandardAction::ShowMenubar), m_paShowMenuBar );


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