diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-08-22 21:23:22 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-08-22 21:23:22 +0200 |
| commit | 4a732b97f634399e5c4859684a25d06d4a830071 (patch) | |
| tree | 2c89168052dd7235db040b5acd1b16e5ad998b70 /src/mainwindow.cpp | |
| parent | Merge commit 'pano/string-fixes' (diff) | |
| parent | Some stupid fixes on style, spaces and some comments added (diff) | |
| download | rekonq-4a732b97f634399e5c4859684a25d06d4a830071.tar.xz | |
Merge branch 'OneUrlBar2'
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3ac46a1b..8a84b844 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -45,7 +45,6 @@ #include "findbar.h" #include "sidepanel.h" #include "urlbar.h" -#include "stackedurlbar.h" // Ui Includes #include "ui_cleardata.h" @@ -206,7 +205,7 @@ void MainWindow::setupBars() // location bar a = new KAction(i18n("Location Bar"), this); a->setShortcut(KShortcut(Qt::Key_F6)); - a->setDefaultWidget(m_view->urlBarStack()); + a->setDefaultWidget(m_view->urlBar()); actionCollection()->addAction(QLatin1String("url_bar"), a); // bookmarks bar @@ -468,8 +467,8 @@ void MainWindow::slotUpdateBrowser() void MainWindow::slotOpenLocation() { - m_view->currentUrlBar()->selectAll(); - m_view->currentUrlBar()->setFocus(); + m_view->urlBar()->selectAll(); + m_view->urlBar()->setFocus(); } @@ -591,7 +590,7 @@ void MainWindow::slotPrivateBrowsing(bool enable) if (button == KMessageBox::Yes) { settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true); - m_view->currentUrlBar()->setBackgroundColor(Qt::lightGray); // palette().color(QPalette::Active, QPalette::Background)); + m_view->urlBar()->setBackgroundColor(Qt::lightGray); // palette().color(QPalette::Active, QPalette::Background)); } else { @@ -601,7 +600,7 @@ void MainWindow::slotPrivateBrowsing(bool enable) else { settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false); - m_view->currentUrlBar()->setBackgroundColor(palette().color(QPalette::Active, QPalette::Base)); + m_view->urlBar()->setBackgroundColor(palette().color(QPalette::Active, QPalette::Base)); m_lastSearch.clear(); m_view->clear(); |