summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-04-28 18:27:12 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-04-28 18:27:12 +0200
commitb83de023d2fe60dca70f6662d4c9264b44db5aaf (patch)
treeea83eb76f9a89e42036bf5720f8d7ed4bc2f44ec
parentImporting some reverted changes (diff)
downloadrekonq-b83de023d2fe60dca70f6662d4c9264b44db5aaf.tar.xz
removing location toolbar to let toolbars be more configurable
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/rekonqui.rc11
2 files changed, 6 insertions, 7 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a9364ef1..377f74a8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -76,7 +76,7 @@ MainWindow::MainWindow()
, m_searchBar(new SearchBar(this))
, m_sidePanel(0)
{
- // accept dnd
+ // accept d'n'd
setAcceptDrops(true);
// updating rekonq configuration
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 4598f097..aa372538 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="rekonq" version="39">
+<gui name="rekonq" version="40">
<MenuBar>
@@ -50,6 +50,10 @@
<Menu name="go" deleted="true">
</Menu>
+<!-- ============ HISTORY menu =========== -->
+<Action name="history" ><text>Hi&amp;story</text>
+</Action>
+
<!-- ============ BOOKMARKS menu =========== -->
<Action name="bookmarks" ><text>&amp;Bookmarks</text>
</Action>
@@ -87,11 +91,6 @@
<Action name="stop_reload" />
<Action name="go_home" />
<Action name="new_tab" />
-</ToolBar>
-
-<!-- ============ Location ToolBar =========== -->
-<ToolBar name="locationToolBar" iconText="iconOnly" newline="false" noEdit="true">
-<text>Location Toolbar</text>
<Action name="url_bar" />
<Action name="search_bar" />
</ToolBar>