diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-04-02 01:19:56 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-04-02 01:19:56 +0200 |
| commit | 0d6af7007186d8db3a063908a51ef5deb770f0bd (patch) | |
| tree | c88d0149e7da294d6b12163bc0fff932d03df844 | |
| parent | updated FullScreenView (diff) | |
| download | rekonq-0d6af7007186d8db3a063908a51ef5deb770f0bd.tar.xz | |
Various fixes, including bookmarks bar
| -rw-r--r-- | src/bookmarks.cpp | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | src/rekonqui.rc | 4 | ||||
| -rw-r--r-- | src/tabbar.h | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp index da8b3908..80f005a5 100644 --- a/src/bookmarks.cpp +++ b/src/bookmarks.cpp @@ -2,7 +2,6 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com> * * @@ -181,4 +180,3 @@ void BookmarksProvider::contextMenu(const QPoint & point) menu->setAttribute(Qt::WA_DeleteOnClose); menu->popup(m_bmToolbar->mapToGlobal(point)); } - diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e864f80f..566a1b45 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -132,6 +132,10 @@ MainWindow::MainWindow() // setup history menu: this has to be done AFTER setupGUI!! setupHistoryMenu(); + // bookmarks bar: this has to be done AFTER setupGUI!! + KToolBar *bmToolbar = toolBar("bookmarksToolBar"); + m_bookmarksProvider->provideBmToolbar(bmToolbar); + // setup Tab Bar setupTabBar(); @@ -170,10 +174,6 @@ void MainWindow::setupToolBars() a->setDefaultWidget(m_searchBar); connect(m_searchBar, SIGNAL(search(const KUrl&)), this, SLOT(loadUrl(const KUrl&))); actionCollection()->addAction(QLatin1String("search_bar"), a); - - // bookmarks bar - KToolBar *bmToolbar = toolBar("bookmarksToolBar"); - m_bookmarksProvider->provideBmToolbar(bmToolbar); } diff --git a/src/rekonqui.rc b/src/rekonqui.rc index 4cb5bbf5..dae6c07e 100644 --- a/src/rekonqui.rc +++ b/src/rekonqui.rc @@ -76,14 +76,14 @@ </ToolBar> <!-- ============ Location ToolBar =========== --> -<ToolBar noEdit="true" name="locationToolBar" iconText="iconOnly" newline="false"> +<ToolBar name="locationToolBar" iconText="iconOnly" newline="false" noEdit="true"> <text>Location Toolbar</text> <Action name="url_bar" /> <Action name="search_bar" /> </ToolBar> <!-- ============ Bookmarks ToolBar =========== --> -<ToolBar noEdit="true" iconText="icontextright" fullWidth="true" name="bookmarksToolBar" iconSize="16" newline="true" hidden="true"> +<ToolBar name="bookmarksToolBar" fullWidth="true" iconText="icontextright" iconSize="16" newline="true" hidden="true" noEdit="true"> <text>Bookmark Toolbar</text> </ToolBar> diff --git a/src/tabbar.h b/src/tabbar.h index ad7a376d..ba057e36 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -19,8 +19,6 @@ * ============================================================ */ - - #ifndef TABBAR_H #define TABBAR_H |