summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-02-07 00:01:52 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-02-07 00:01:52 +0100
commitf4f86382a7dc3f57a62820df19afd8b1b1d9355d (patch)
treefdb618f2877f61ddfc3f91504a1675420d8e2f78 /src/mainwindow.cpp
parentMerge commit 'refs/merge-requests/86' of git://gitorious.org/rekonq/mainline ... (diff)
parentFix loading previews : when load finished, result wasn't shown (diff)
downloadrekonq-f4f86382a7dc3f57a62820df19afd8b1b1d9355d.tar.xz
Merge commit 'refs/merge-requests/84' of git://gitorious.org/rekonq/mainline into matgic_tab_page
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e4890b72..9e6bfb03 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -98,6 +98,7 @@ MainWindow::MainWindow()
: KMainWindow()
, m_view( new MainView(this) )
, m_findBar( new FindBar(this) )
+ , m_previewSelectorBar( new PreviewSelectorBar(this) )
, m_historyPanel(0)
, m_bookmarksPanel(0)
, m_webInspectorPanel(0)
@@ -122,6 +123,7 @@ MainWindow::MainWindow()
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_view);
+ layout->addWidget(m_previewSelectorBar);
layout->addWidget(m_findBar);
centralWidget->setLayout(layout);
@@ -648,6 +650,9 @@ void MainWindow::updateActions()
QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward));
historyForwardAction->setEnabled(currentTab()->view()->history()->canGoForward());
+
+ if(m_previewSelectorBar->isVisible())
+ m_previewSelectorBar->setPage(currentTab()->page());
}