From 5447e970c3f2074836344c7ac03429efb930ae8a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 30 Aug 2009 02:11:18 +0200 Subject: Bookmark Bar fixes --- src/mainwindow.cpp | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2a733c63..6d5c9c16 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -159,7 +159,8 @@ SidePanel *MainWindow::sidePanel() void MainWindow::setupToolbar() { - KToolBar *mainToolBar = new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea); + // ============ Main ToolBar ================================ + KToolBar *mainToolBar = new KToolBar( i18n("Main ToolBar"), this, Qt::TopToolBarArea, true, false, false); mainToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); mainToolBar->addAction( actionByName("history_back") ); mainToolBar->addAction( actionByName("history_forward") ); @@ -170,8 +171,26 @@ void MainWindow::setupToolbar() mainToolBar->addAction( actionByName("bookmarksActionMenu") ); mainToolBar->addAction( actionByName("rekonq_tools") ); - KToolBar::setToolBarsEditable(false); - KToolBar::setToolBarsLocked(true); + // =========== Bookmarks ToolBar ================================ + KToolBar *bmToolBar= new KToolBar( i18n("Bookmarks ToolBar"), this, Qt::TopToolBarArea, true, false, true); + bmToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + bmToolBar->setIconDimensions(16); + bmToolBar->setAcceptDrops(true); + bmToolBar->setContentsMargins(0, 0, 0, 0); + bmToolBar->setMinimumHeight(16); + bmToolBar->setContextMenuPolicy(Qt::CustomContextMenu); + + Application::bookmarkProvider()->setupBookmarkBar(bmToolBar); + + // Bookmarks ToolBar Action + QAction *a = bmToolBar->toggleViewAction(); + a->setIcon( KIcon("bookmark-toolbar") ); + actionCollection()->addAction(QLatin1String("bm_bar"), a); + +// connect(a, SIGNAL(triggered(bool)), this, SLOT(showBookmarkToolBar(bool))); + +// KToolBar::setToolBarsEditable(false); +// KToolBar::setToolBarsLocked(true); } @@ -232,10 +251,6 @@ void MainWindow::setupActions() a->setDefaultWidget(m_view->urlBar()); actionCollection()->addAction(QLatin1String("url_bar"), a); - // bookmarks bar - KAction *bookmarkBarAction = Application::bookmarkProvider()->bookmarkToolBarAction(); - a = actionCollection()->addAction(QLatin1String("bookmarks_bar"), bookmarkBarAction); - // Standard Actions KStandardAction::open(this, SLOT(slotFileOpen()), actionCollection()); KStandardAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection()); -- cgit v1.2.1