From 5e6be36618dd2e9f9dd64ffd2ed899ec4dc55f2c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 25 Feb 2009 12:05:15 +0100
Subject: 1st fixes to bookmarks system, toolbar and menu. Needs care and
docs..
---
src/bookmarks.cpp | 41 +++++++++++++++++++++++++++++++++++++----
src/bookmarks.h | 26 ++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index a2ebf08a..2c1b4afc 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -61,9 +61,25 @@ QString OwnBookMarks::currentTitle() const
// ------------------------------------------------------------------------------------------------------
+BookmarksMenu::BookmarksMenu( KBookmarkManager* manager, KBookmarkOwner* owner, KMenu* menu, KActionCollection* ac )
+ : KBookmarkMenu(manager, owner, menu, ac)
+{
+}
+
+KMenu* BookmarksMenu::viewContextMenu(QAction* action)
+{
+ return contextMenu( action );
+}
+
+
+// ------------------------------------------------------------------------------------------------------
+
+
BookmarksProvider::BookmarksProvider(KMainWindow* parent)
: m_parent(parent)
- , m_owner(new OwnBookMarks(parent))
+ , m_owner(new OwnBookMarks(parent))
+ , m_bmMenu(0)
+ , m_bmToolbar(0)
{
KUrl bookfile = KUrl( "~/.kde/share/apps/konqueror/bookmarks.xml" ); // share konqueror bookmarks
m_manager = KBookmarkManager::managerForExternalFile( bookfile.path() );
@@ -73,7 +89,12 @@ BookmarksProvider::BookmarksProvider(KMainWindow* parent)
void BookmarksProvider::provideBmToolbar(KToolBar* toolbar)
{
+ m_bmToolbar = toolbar;
toolbar->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
+
+ toolbar->setContextMenuPolicy( Qt::CustomContextMenu );
+ connect( toolbar, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)) );
+
KBookmarkGroup toolbarGroup = m_manager->toolbar();
KBookmark bm = toolbarGroup.first();
while(!bm.isNull())
@@ -102,8 +123,20 @@ void BookmarksProvider::provideBmToolbar(KToolBar* toolbar)
KMenu *BookmarksProvider::bookmarksMenu()
{
- KMenu *bmMenu = new KMenu(m_parent);
- new KBookmarkMenu( m_manager, m_owner, bmMenu, m_ac );
- return bmMenu;
+ KMenu *menu = new KMenu(m_parent);
+ m_bmMenu = new BookmarksMenu( m_manager, m_owner, menu, m_ac );
+ return menu;
+}
+
+
+void BookmarksProvider::contextMenu(const QPoint & point)
+{
+ KAction* action = dynamic_cast<KAction*>( m_bmToolbar->actionAt( point ) );
+ if(!action)
+ return;
+ KMenu *menu = m_bmMenu->viewContextMenu(action);
+ menu->setAttribute(Qt::WA_DeleteOnClose);
+ menu->popup( m_bmToolbar->mapToGlobal( point ));
}
+
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 825c0d3a..f9f3e91c 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -97,6 +97,26 @@ private:
};
+// ------------------------------------------------------------------------------
+
+/**
+ * This class represent the rekonq bookmarks menu.
+ * It's just a simple class inherited from KBookmarkMenu
+ *
+ * @author Andrea Diamantini <adjam7@gmail.com>
+ * @since 4.x
+ *
+ */
+class BookmarksMenu : public KBookmarkMenu
+{
+Q_OBJECT
+
+public:
+ BookmarksMenu( KBookmarkManager* manager, KBookmarkOwner* owner, KMenu* menu, KActionCollection* ac);
+
+ KMenu *viewContextMenu(QAction* action);
+};
+
// ------------------------------------------------------------------------------
@@ -139,10 +159,16 @@ public:
*/
KMenu *bookmarksMenu();
+public slots:
+ void contextMenu(const QPoint & point);
+
private:
KMainWindow *m_parent;
OwnBookMarks *m_owner;
KBookmarkManager *m_manager;
KActionCollection *m_ac;
+ BookmarksMenu *m_bmMenu;
+ KToolBar *m_bmToolbar;
};
+
#endif
--
cgit v1.2.1