summaryrefslogtreecommitdiff
path: root/src/browsermainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/browsermainwindow.cpp')
-rw-r--r--src/browsermainwindow.cpp33
1 files changed, 10 insertions, 23 deletions
diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp
index ac05a249..e9f685cd 100644
--- a/src/browsermainwindow.cpp
+++ b/src/browsermainwindow.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * 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>
@@ -103,7 +103,6 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
}
-
BrowserMainWindow::~BrowserMainWindow()
{
m_autoSaver->changeOccurred();
@@ -112,7 +111,6 @@ BrowserMainWindow::~BrowserMainWindow()
}
-
void BrowserMainWindow::loadDefaultState()
{
KConfig config("rekonqrc");
@@ -122,16 +120,6 @@ void BrowserMainWindow::loadDefaultState()
}
-
-QSize BrowserMainWindow::sizeHint() const
-{
- QRect desktopRect = QApplication::desktop()->screenGeometry();
- QSize size = desktopRect.size() * 0.9;
- return size;
-}
-
-
-
void BrowserMainWindow::save()
{
BrowserApplication::instance()->saveSession();
@@ -143,11 +131,9 @@ void BrowserMainWindow::save()
}
-
static const qint32 BrowserMainWindowMagic = 0xba;
-
QByteArray BrowserMainWindow::saveState(bool withTabs) const
{
int version = 2;
@@ -208,7 +194,6 @@ bool BrowserMainWindow::restoreState(const QByteArray &state)
}
-
void BrowserMainWindow::setupMenu()
{
// ------------------------------------------------------------- FILE --------------------------------------------------------------------------------------------------
@@ -367,7 +352,11 @@ void BrowserMainWindow::setupMenu()
void BrowserMainWindow::setupToolBar()
{
- m_navigationBar = new KToolBar( i18n("Navigation") , this, Qt::TopToolBarArea, true, false, false);
+ m_navigationBar = new KToolBar( i18n("Navigation") , this, Qt::TopToolBarArea, false, false, false);
+
+ // UI settings
+ m_navigationBar->setContextMenuPolicy( Qt::NoContextMenu );
+ m_navigationBar->setIconDimensions(22);
m_historyBack = new KAction( KIcon("go-previous"), i18n("Back"), this);
m_historyBackMenu = new KMenu(this);
@@ -390,14 +379,12 @@ void BrowserMainWindow::setupToolBar()
m_navigationBar->addWidget( m_tabWidget->lineEditStack() );
- m_searchBar = new SearchBar(m_navigationBar);
- m_navigationBar->addWidget(m_searchBar);
+ m_searchBar = new SearchBar( this );
connect(m_searchBar, SIGNAL(search(const KUrl&)), this, SLOT(loadUrl(const KUrl&)));
+ m_navigationBar->addWidget(m_searchBar);
- // UI settings
- m_navigationBar->setIconDimensions(16);
- m_navigationBar->setContextMenuPolicy( Qt::NoContextMenu );
- KToolBar::setToolBarsLocked( true );
+// KToolBar::setToolBarsEditable( false );
+// KToolBar::setToolBarsLocked( true );
}