summaryrefslogtreecommitdiff
path: root/src/webtab/webview.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-11-29 11:00:23 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:06 +0100
commitc67be496fa2ac21dd3d96162ac2a79461cc2d9de (patch)
tree410ce3a56a8c7676d25b2ab9d76a235174cbd85a /src/webtab/webview.cpp
parentRestoring inspector, part 1 (diff)
downloadrekonq-c67be496fa2ac21dd3d96162ac2a79461cc2d9de.tar.xz
Restoring inspector, part 2
Add an inspector widget to the bottom of the page
Diffstat (limited to 'src/webtab/webview.cpp')
-rw-r--r--src/webtab/webview.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp
index ec74be1e..2a73b050 100644
--- a/src/webtab/webview.cpp
+++ b/src/webtab/webview.cpp
@@ -98,6 +98,7 @@ WebView::WebView(QWidget* parent)
, m_isViewSmoothScrolling(false)
, m_accessKeysPressed(false)
, m_accessKeysActive(false)
+ , m_parentTab(qobject_cast<WebTab *>(parent))
{
// loadUrl signal
connect(this, SIGNAL(loadUrl(KUrl, Rekonq::OpenType)), rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
@@ -162,10 +163,7 @@ void WebView::setPage(WebPage *pg)
{
KWebView::setPage(pg);
- WebTab *tab = qobject_cast<WebTab *>(parent());
- if (!tab)
- return;
- WebWindow *w = tab->webWindow();
+ WebWindow *w = m_parentTab->webWindow();
if (w && w->window())
pg->setWindow(w->window());
}
@@ -268,8 +266,8 @@ bool WebView::popupSpellMenu(QContextMenuEvent *event)
void WebView::contextMenuEvent(QContextMenuEvent *event)
{
m_contextMenuHitResult = page()->mainFrame()->hitTestContent(event->pos());
- WebTab *tab = qobject_cast<WebTab *>(parent());
- WebWindow *webwin = tab->webWindow();
+
+ WebWindow *webwin = m_parentTab->webWindow();
KMenu menu(this);
QAction *a;
@@ -333,7 +331,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
frameMenu->addAction(pageAction(KWebPage::OpenFrameInNewWindow));
a = new KAction(KIcon("document-print-frame"), i18n("Print Frame"), this);
- connect(a, SIGNAL(triggered()), tab, SLOT(printFrame()));
+ connect(a, SIGNAL(triggered()), m_parentTab, SLOT(printFrame()));
frameMenu->addAction(a);
menu.addAction(frameMenu);
@@ -761,8 +759,7 @@ void WebView::openLinkInNewTab()
KAction *a = qobject_cast<KAction*>(sender());
KUrl url(a->data().toUrl());
- WebTab *tab = qobject_cast<WebTab *>(parent());
- WebWindow *webwin = tab->webWindow();
+ WebWindow *webwin = m_parentTab->webWindow();
if (webwin)
emit loadUrl(url, Rekonq::NewTab);