From 9dcb1b5bfd4772726f41bf011abf6810b6ce25ad Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 2 Aug 2010 00:50:04 +0200 Subject: Merging mr 154 by hand!! WARNING: I'm NOT sure about this. Please everyone, check it twice!! PS: Many thanks to Yoann21. He is doing a fantastic work on the bookmarks toolbar --- src/mainwindow.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8d0f28a7..245110ec 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -103,8 +103,7 @@ MainWindow::MainWindow() , m_analyzerPanel(0) , m_historyBackMenu(0) , m_encodingMenu(new KMenu(this)) -// , m_mainBar(new KToolBar(QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, true)) -// , m_bmBar(new KToolBar(QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, true)) + , m_bookmarksBar(new BookmarkToolBar(QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, true)) , m_popup(new KPassivePopup(this)) , m_hidePopup(new QTimer(this)) { @@ -179,8 +178,7 @@ MainWindow::MainWindow() MainWindow::~MainWindow() { - KToolBar *bookBar = toolBar("bookmarksToolBar"); - Application::bookmarkProvider()->removeToolBar(bookBar); + Application::bookmarkProvider()->removeToolBar(m_bookmarksBar); Application::bookmarkProvider()->removeBookmarkPanel(m_bookmarksPanel); Application::instance()->removeMainWindow(this); @@ -195,6 +193,8 @@ MainWindow::~MainWindow() delete m_historyBackMenu; delete m_encodingMenu; + delete m_bookmarksBar; + delete m_zoomSlider; delete m_popup; @@ -215,17 +215,17 @@ void MainWindow::setupToolbars() actionCollection()->addAction( QL1S("url_bar"), a); KToolBar *mainBar = toolBar("mainToolBar"); - KToolBar *bookBar = toolBar("bookmarksToolBar"); - +// KToolBar *bookBar = toolBar("bookmarksToolBar"); +// // bookmarks bar - KAction *bookmarkBarAction = Application::bookmarkProvider()->bookmarkToolBarAction(bookBar); + KAction *bookmarkBarAction = Application::bookmarkProvider()->bookmarkToolBarAction(m_bookmarksBar); a = actionCollection()->addAction( QL1S("bookmarks_bar"), bookmarkBarAction); mainBar->show(); // this just to fix reopening rekonq after fullscreen close // =========== Bookmarks ToolBar ================================ - bookBar->setAcceptDrops(true); - Application::bookmarkProvider()->setupBookmarkBar(bookBar); + m_bookmarksBar->setAcceptDrops(true); + Application::bookmarkProvider()->setupBookmarkBar(m_bookmarksBar); } -- cgit v1.2.1