summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bookmarks.cpp2
-rw-r--r--src/mainwindow.cpp10
-rw-r--r--src/rekonqui.rc4
3 files changed, 9 insertions, 7 deletions
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index d4aa5a58..8fc01838 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -109,7 +109,7 @@ BookmarkMenu::BookmarkMenu(KBookmarkManager *manager,
{
KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this);
- a->setIcon(KIcon("rating"));
+// a->setIcon(KIcon("rating"));
a->setText(i18n("Add Bookmark"));
actionCollection->addAction(QLatin1String("rekonq_add_bookmark"),a);
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9b88dc5e..65975a3e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -123,7 +123,9 @@ MainWindow::MainWindow()
// Bookmark Menu
KActionMenu *bmMenu = Application::bookmarkProvider()->bookmarkActionMenu();
- actionCollection()->addAction(QLatin1String("bookmarks"), bmMenu);
+ bmMenu->setIcon(KIcon("rating"));
+ actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu);
+ ((KActionMenu *)actionByName("bookmarksActionMenu"))->setDelayed(false);
// Side Panel: this has to be done BEFORE setupGUI!!
setupSidePanel();
@@ -316,8 +318,8 @@ void MainWindow::setupActions()
connect(a, SIGNAL(triggered(bool)), m_view, SLOT(previousTab()));
// ==================== Bookmarks Actions
- QAction *ba = Application::bookmarkProvider()->actionByName("rekonq_add_bookmark");
- actionCollection()->addAction(QLatin1String("rekonq_add_bookmark"), ba);
+// QAction *ba = Application::bookmarkProvider()->actionByName("rekonq_add_bookmark");
+// actionCollection()->addAction(QLatin1String("rekonq_add_bookmark"), ba);
}
@@ -345,7 +347,7 @@ void MainWindow::setupHistoryMenu()
historyMenu->setTitle(i18n("&History"));
// setting history menu position
- menuBar()->insertMenu(actionCollection()->action("bookmarks"), historyMenu);
+ menuBar()->insertMenu(actionCollection()->action("bookmarksActionMenu"), historyMenu);
// setting initial actions
QList<QAction*> historyActions;
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 34e705f0..dfb7aef7 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -55,7 +55,7 @@
</Action>
<!-- ============ BOOKMARKS menu =========== -->
-<Action name="bookmarks" ><text>&amp;Bookmarks</text>
+<Action name="bookmarksActionMenu" ><text>&amp;Bookmarks</text>
</Action>
<!-- ============ TOOLS menu =========== -->
@@ -88,7 +88,7 @@
<Action name="stop_reload" />
<Action name="go_home" />
<Action name="url_bar" />
- <Action name="rekonq_add_bookmark" />
+ <Action name="bookmarksActionMenu" />
<Action name="options_configure" />
</ToolBar>