diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2013-01-27 01:47:55 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2013-01-27 01:47:55 +0100 |
commit | a0b27fd9c8cec145c8c16d0ab5f99d030ced7fb8 (patch) | |
tree | 4dd3f661648366b6899ad055f3061f154cc7aef6 /src/webwindow | |
parent | Fix kpart window half shown (diff) | |
download | rekonq-a0b27fd9c8cec145c8c16d0ab5f99d030ced7fb8.tar.xz |
Fix tab when showing a kpart. Let also see title where needed
Diffstat (limited to 'src/webwindow')
-rw-r--r-- | src/webwindow/findbar.cpp | 4 | ||||
-rw-r--r-- | src/webwindow/webwindow.cpp | 14 | ||||
-rw-r--r-- | src/webwindow/webwindow.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/webwindow/findbar.cpp b/src/webwindow/findbar.cpp index 5f7d36e2..6bf9ac0d 100644 --- a/src/webwindow/findbar.cpp +++ b/src/webwindow/findbar.cpp @@ -150,7 +150,7 @@ void FindBar::setVisible(bool visible) if (visible && w->page()->isOnRekonqPage() - && w->view()->part() != 0) + && w->tabView()->part() != 0) { // findNext is the slot containing part integration code findNext(); @@ -230,7 +230,7 @@ void FindBar::findNext() if (w->page()->isOnRekonqPage()) { // trigger part find action - KParts::ReadOnlyPart *p = w->view()->part(); + KParts::ReadOnlyPart *p = w->tabView()->part(); if (p) { // connect(this, SIGNAL(triggerPartFind()), p, SLOT(slotFind())); diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp index 73543374..59c87571 100644 --- a/src/webwindow/webwindow.cpp +++ b/src/webwindow/webwindow.cpp @@ -121,13 +121,13 @@ WebWindow::WebWindow(QWidget *parent, bool isPrivateBrowsing, WebPage *pg) connect(rApp, SIGNAL(toggleBookmarksToolbar(bool)), this, SLOT(toggleBookmarksToolbar(bool))); // things changed signals - connect(_tab->view(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString))); - connect(_tab->view(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged())); + connect(_tab, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString))); + connect(_tab, SIGNAL(iconChanged()), this, SIGNAL(iconChanged())); // check view signals - connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(webLoadStarted())); - connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webLoadFinished(bool))); - connect(_tab->view(), SIGNAL(loadProgress(int)), this, SLOT(webLoadProgress(int))); + connect(_tab, SIGNAL(loadStarted()), this, SLOT(webLoadStarted())); + connect(_tab, SIGNAL(loadFinished(bool)), this, SLOT(webLoadFinished(bool))); + connect(_tab, SIGNAL(loadProgress(int)), this, SLOT(webLoadProgress(int))); connect(_bar, SIGNAL(focusIn()), this, SLOT(urlbarFocused())); @@ -668,7 +668,7 @@ KUrl WebWindow::url() const QString WebWindow::title() const { - QString t = _tab->view()->title(); + QString t = _tab->title(); if (t.isEmpty()) { if (url().isLocalFile()) @@ -687,7 +687,7 @@ UrlBar *WebWindow::urlBar() } -WebTab *WebWindow::view() +WebTab *WebWindow::tabView() { return _tab; } diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h index de927305..032da94f 100644 --- a/src/webwindow/webwindow.h +++ b/src/webwindow/webwindow.h @@ -73,7 +73,7 @@ public: QString title() const; UrlBar *urlBar(); - WebTab *view(); + WebTab *tabView(); QPixmap tabPreview(int width, int height); |