From d3238369761a157eaf79c176baa46c0c38b1817d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 4 Jan 2010 18:47:38 +0100 Subject: Main toolbar (right) name & (wrong) icon --- src/mainwindow.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 68af8add..1608014c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -181,9 +181,6 @@ void MainWindow::setupToolbars() { // ============ Main ToolBar ================================ m_mainBar->setToolButtonStyle(Qt::ToolButtonIconOnly); -// m_mainBar->setContextMenuPolicy(Qt::PreventContextMenu); -// m_mainBar->setFloatable(false); -// m_mainBar->setMovable(false); m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Back)) ); m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Forward)) ); @@ -203,8 +200,6 @@ void MainWindow::setupToolbars() m_bmBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); m_bmBar->setAcceptDrops(true); m_bmBar->setContextMenuPolicy(Qt::CustomContextMenu); -// m_bmBar->setFloatable(false); -// m_bmBar->setMovable(false); Application::bookmarkProvider()->setupBookmarkBar(m_bmBar); } @@ -398,7 +393,14 @@ void MainWindow::setupActions() connect(a, SIGNAL(triggered(bool)), m_view->tabBar(), SLOT(detachTab()) ); // ----------------------- Bookmarks ToolBar Action -------------------------------------- - QAction *qa = m_bmBar->toggleViewAction(); + QAction *qa; + + qa = m_mainBar->toggleViewAction(); + qa->setText( i18n("Main Toolbar") ); + qa->setIcon( KIcon("bookmark-toolbar") ); + actionCollection()->addAction(QLatin1String("main_bar"), qa); + + qa = m_bmBar->toggleViewAction(); qa->setText( i18n("Bookmarks Toolbar") ); qa->setIcon( KIcon("bookmark-toolbar") ); actionCollection()->addAction(QLatin1String("bm_bar"), qa); -- cgit v1.2.1