diff options
| author | Lindsay Mathieson <lindsay.mathieson@gmail.com> | 2013-01-24 20:17:06 +1000 |
|---|---|---|
| committer | Lindsay Mathieson <lindsay.mathieson@gmail.com> | 2013-01-24 20:17:06 +1000 |
| commit | a068a29d7c33211a5d4e5ebc1a0227feba158b65 (patch) | |
| tree | c25dd2e9da9d5242390d2bce41e6292ca3f2df78 /src/webwindow | |
| parent | Added option for opening new tabs next to current (default to true). Otherwis... (diff) | |
| parent | Improve icon management code (diff) | |
| download | rekonq-a068a29d7c33211a5d4e5ebc1a0227feba158b65.tar.xz | |
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/webwindow')
| -rw-r--r-- | src/webwindow/webwindow.cpp | 3 | ||||
| -rw-r--r-- | src/webwindow/webwindow.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp index d512620d..73543374 100644 --- a/src/webwindow/webwindow.cpp +++ b/src/webwindow/webwindow.cpp @@ -122,6 +122,7 @@ WebWindow::WebWindow(QWidget *parent, bool isPrivateBrowsing, WebPage *pg) // things changed signals connect(_tab->view(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString))); + connect(_tab->view(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged())); // check view signals connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(webLoadStarted())); @@ -673,7 +674,7 @@ QString WebWindow::title() const if (url().isLocalFile()) return url().fileName(); else - return QL1S("rekonq"); + return url().prettyUrl(); } return t; diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h index e8e77dd7..de927305 100644 --- a/src/webwindow/webwindow.h +++ b/src/webwindow/webwindow.h @@ -145,7 +145,8 @@ private Q_SLOTS: Q_SIGNALS: void titleChanged(QString); - + void iconChanged(); + void loadStarted(); void loadProgress(int); void loadFinished(bool); |