summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-07-29 00:22:14 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-07-29 00:22:14 +0200
commitd64b60a884452202d8d7dd5e4a13fcdcedbb6265 (patch)
treea1e04a251645179b11fdde71f5a1ecf70e906b18 /src/mainwindow.cpp
parentMerge branch 'PrivateColor' (diff)
downloadrekonq-d64b60a884452202d8d7dd5e4a13fcdcedbb6265.tar.xz
Simplifying a bit web load progress process structure
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a862ee95..2f74bd8a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -168,7 +168,7 @@ void MainWindow::postLaunch()
// --------- connect signals and slots
connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(slotUpdateWindowTitle(const QString &)));
- connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int)));
+ connect(m_view, SIGNAL(browserLoading(bool)), this, SLOT(slotBrowserLoading(bool)));
connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
// update toolbar actions signals
@@ -252,7 +252,7 @@ void MainWindow::setupActions()
connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotWebStop()));
// stop reload Action
- m_stopReloadAction = new KAction(KIcon("view-refresh"), i18n("Reload"), this);
+ m_stopReloadAction = new KAction(KIcon("process-stop"), i18n("&Stop"), this);
actionCollection()->addAction(QLatin1String("stop_reload") , m_stopReloadAction);
m_stopReloadAction->setShortcutConfigurable(false);
@@ -770,11 +770,11 @@ WebView *MainWindow::currentTab() const
}
-void MainWindow::slotLoadProgress(int progress)
+void MainWindow::slotBrowserLoading(bool v)
{
QAction *stop = actionCollection()->action("stop");
QAction *reload = actionCollection()->action("view_redisplay");
- if (progress < 100 && progress > 0)
+ if (v)
{
disconnect(m_stopReloadAction, SIGNAL(triggered(bool)), reload , SIGNAL(triggered(bool)));
m_stopReloadAction->setIcon(KIcon("process-stop"));