summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-02-24 16:11:08 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-02-24 16:11:08 +0100
commitad14cf95df6e432f747ff1d144621523f837e2b1 (patch)
treef622b0a8fb0e0b0e5a49a14c9a54e23ab8c8064b
parentreorganizing a bit .kcfg file.. (diff)
downloadrekonq-ad14cf95df6e432f747ff1d144621523f837e2b1.tar.xz
Again and again.. :)
Saving one QString for each tab..
-rw-r--r--src/mainview.cpp8
-rw-r--r--src/webtab.cpp12
-rw-r--r--src/webtab.h4
3 files changed, 6 insertions, 18 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp
index bad6999b..e2f9094f 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -294,15 +294,17 @@ void MainView::currentChanged(int index)
connect(tab->view(), SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
- connect(tab->view()->page(), SIGNAL(statusBarMessage(const QString&)),
+ connect(tab->page(), SIGNAL(statusBarMessage(const QString&)),
this, SIGNAL(showStatusBarMessage(const QString&)));
- connect(tab->view()->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+ connect(tab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
this, SIGNAL(linkHovered(const QString&)));
emit setCurrentTitle(tab->view()->title());
urlBar()->setUrl(tab->view()->url());
urlBar()->setProgress(tab->progress());
- emit showStatusBarMessage(tab->lastStatusBarText());
+
+ // clean up "status bar"
+ emit showStatusBarMessage( QString() );
// notify UI to eventually switch stop/reload button
if(urlBar()->isLoading())
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 10898d46..645c9606 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -128,18 +128,6 @@ int WebTab::progress()
}
-QString WebTab::lastStatusBarText() const
-{
- return m_statusBarText;
-}
-
-
-void WebTab::setStatusBarText(const QString &string)
-{
- m_statusBarText = string;
-}
-
-
void WebTab::updateProgress(int p)
{
m_progress = p;
diff --git a/src/webtab.h b/src/webtab.h
index 8f434ee7..7fd63b18 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -51,12 +51,11 @@ public:
WebView *view();
WebPage *page();
KUrl url();
- QString lastStatusBarText() const;
+
int progress();
void createPreviewSelectorBar(int index);
private slots:
- void setStatusBarText(const QString &string);
void updateProgress(int progress);
void loadFinished(bool);
@@ -64,7 +63,6 @@ private slots:
private:
int m_progress;
- QString m_statusBarText;
};
#endif