Commit d7208124 authored by Luigi Toscano's avatar Luigi Toscano
Browse files

Enable the "Edit bookmarks" menu

Use the default values exposed by KBookmarks: both 'add' end 'edit'
actions exposed through the menus.
KEditBookmarks based on Frameworks 5 has been available for a while.

Copying also the original bug, which was (correctly) reassigned
to the global menu (the bug prevents the right click action from
working).
CCBUG: 382570
parent 81e8a506
...@@ -49,16 +49,6 @@ QUrl BookmarkOwner::currentUrl() const ...@@ -49,16 +49,6 @@ QUrl BookmarkOwner::currentUrl() const
return url.scheme() == QLatin1String( "khelpcenter" ) ? QUrl() : url; return url.scheme() == QLatin1String( "khelpcenter" ) ? QUrl() : url;
} }
bool BookmarkOwner::enableOption( BookmarkOption option ) const
{
switch ( option ) {
case ShowAddBookmark:
return true;
default:
return false;
}
}
void BookmarkOwner::openBookmark( const KBookmark& bm, Qt::MouseButtons /*mb*/, Qt::KeyboardModifiers /*km*/ ) void BookmarkOwner::openBookmark( const KBookmark& bm, Qt::MouseButtons /*mb*/, Qt::KeyboardModifiers /*km*/ )
{ {
if ( !bm.url().isValid() ) { if ( !bm.url().isValid() ) {
......
...@@ -38,7 +38,6 @@ class BookmarkOwner : public QObject, public KBookmarkOwner ...@@ -38,7 +38,6 @@ class BookmarkOwner : public QObject, public KBookmarkOwner
QString currentTitle() const Q_DECL_OVERRIDE; QString currentTitle() const Q_DECL_OVERRIDE;
QUrl currentUrl() const Q_DECL_OVERRIDE; QUrl currentUrl() const Q_DECL_OVERRIDE;
bool enableOption( BookmarkOption option ) const Q_DECL_OVERRIDE;
void openBookmark( const KBookmark& bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km ) Q_DECL_OVERRIDE; void openBookmark( const KBookmark& bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km ) Q_DECL_OVERRIDE;
Q_SIGNALS: Q_SIGNALS:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment