summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2008-12-30 17:24:57 +0100
committerAndrea Diamantini <adjam7@gmail.com>2008-12-30 17:24:57 +0100
commitff09defcd3ce26802866e689125548b059c4f2c3 (patch)
tree8ce9d3c9e7a535cc57753b8ea4756880f3d4d634
parentFixed Settings changes.. (diff)
downloadrekonq-ff09defcd3ce26802866e689125548b059c4f2c3.tar.xz
Final adjs for 0.0.2
-rw-r--r--src/findbar.cpp2
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/rekonqui.rc45
3 files changed, 23 insertions, 26 deletions
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 382f9b09..6df09de1 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -30,7 +30,7 @@
#include <QtGui>
FindBar::FindBar(KXmlGuiWindow *parent)
- : KToolBar( "FindBar" , parent, Qt::BottomToolBarArea, true, false, false)
+ : KToolBar( "Find Bar" , parent, Qt::BottomToolBarArea, true, false, false)
, m_lineEdit(0)
{
KAction *close = new KAction(KIcon("dialog-close") , "close" , this);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7bf44d06..3e0d71fa 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -109,7 +109,7 @@ MainWindow::MainWindow()
navigationBar->addWidget(m_searchBar);
// Find Bar
- m_findBar = new FindBar(this);
+ m_findBar = new FindBar( this );
connect( m_findBar, SIGNAL( searchString(const QString &) ), this, SLOT( slotFind(const QString &) ) );
}
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index a3502229..a7ab8cfb 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -2,7 +2,7 @@
<kpartgui name="rekonq" version="1">
<MenuBar>
<!-- ============ FILE menu =========== -->
- <Menu name="file" noMerge="1"><text>&amp;File</text>
+<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_new" />
<Action name="file_open" />
<Action name="open location" />
@@ -18,9 +18,9 @@
<Action name="private browsing" />
<Separator/>
<Action name="file_quit" />
- </Menu>
- <!-- ============ EDIT menu =========== -->
- <Menu name="edit" noMerge="1"><text>&amp;Edit</text>
+</Menu>
+<!-- ============ EDIT menu =========== -->
+<Menu name="edit" noMerge="1"><text>&amp;Edit</text>
<Action name="edit_undo" />
<Action name="edit_redo" />
<Separator/>
@@ -33,45 +33,42 @@
<Action name="edit_find" />
<Action name="edit_find_next" />
<Action name="edit_find_prev" />
- </Menu>
- <!-- ============ VIEW menu =========== -->
- <Menu name="view" noMerge="1"><text>&amp;View</text>
+</Menu>
+<!-- ============ VIEW menu =========== -->
+<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="view_redisplay" />
<Separator/>
-<!-- <Menu name="fontmenu"> -->
-<!-- <text>make text..</text> -->
- <Action name="bigger font" />
- <Action name="normal font" />
- <Action name="smaller font" />
-<!-- </Menu> -->
+ <Action name="bigger font" />
+ <Action name="normal font" />
+ <Action name="smaller font" />
<Separator/>
<Action name="page source" />
<Action name="fullscreen" />
- </Menu>
+</Menu>
<!-- ============ GO menu =========== -->
- <Menu name="go" deleted="true">
- </Menu>
+<Menu name="go" deleted="true">
+</Menu>
<!-- ============ BOOKMARKS menu =========== -->
<Action name="bookmarks" />
<!-- ============ TOOLS menu =========== -->
- <Menu name="tools">
+<Menu name="tools">
<Action name="downloads" />
<Action name="web inspector" />
</Menu>
<!-- ============ SETTINGS menu =========== -->
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
- <Action name="options_show_statusbar" />
- <Separator/>
- <Action name="options_configure_keybinding"/>
- <Action name="options_configure_toolbars"/>
- <Action name="options_configure"/>
+ <Action name="options_show_statusbar" />
+ <Separator/>
+ <Action name="options_configure_keybinding"/>
+ <Action name="options_configure_toolbars"/>
+ <Action name="options_configure"/>
</Menu>
+
</MenuBar>
<!-- ============ Main ToolBar =========== -->
-<ToolBar name="mainToolBar" fullWidth="true" iconText="iconOnly" position="top" noMerge="1">
- <text>Main Toolbar</text>
+<ToolBar name="mainToolBar" fullWidth="true" iconText="iconOnly" position="top" noMerge="1"><text>Main Toolbar</text>
<Action name="history back" />
<Action name="history forward" />
<Action name="stop reload" />