diff options
| -rw-r--r-- | src/plugins/help/helpviewer.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/help/helpviewer.h | 3 | ||||
| -rw-r--r-- | src/plugins/help/helpviewer_qtb.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/help/helpviewer_qwv.cpp | 9 |
4 files changed, 17 insertions, 15 deletions
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index 449ed8310b..58b7f473b0 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -164,6 +164,18 @@ void HelpViewer::home() setSource(homepage); } +void HelpViewer::slotLoadStarted() +{ + qApp->setOverrideCursor(QCursor(Qt::WaitCursor)); +} + +void HelpViewer::slotLoadFinished(bool ok) +{ + Q_UNUSED(ok) + emit sourceChanged(source()); + qApp->restoreOverrideCursor(); +} + bool HelpViewer::handleForwardBackwardMouseButtons(QMouseEvent *event) { if (event->button() == Qt::XButton1) { diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index 1692b9a7cb..f4debacec9 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -127,7 +127,8 @@ protected: private slots: void actionChanged(); - void setLoadFinished(bool ok); + void slotLoadStarted(); + void slotLoadFinished(bool ok); private: bool eventFilter(QObject *obj, QEvent *event); diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp index ee4ce93809..67036fd60d 100644 --- a/src/plugins/help/helpviewer_qtb.cpp +++ b/src/plugins/help/helpviewer_qtb.cpp @@ -72,7 +72,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent) setViewerFont(font); connect(this, SIGNAL(sourceChanged(QUrl)), this, SIGNAL(titleChanged())); - connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool))); + connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool))); } HelpViewer::~HelpViewer() @@ -312,12 +312,6 @@ void HelpViewer::actionChanged() // stub } -void HelpViewer::setLoadFinished(bool ok) -{ - Q_UNUSED(ok) - emit sourceChanged(source()); -} - // -- private bool HelpViewer::eventFilter(QObject *obj, QEvent *event) diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp index 6ea9e54092..988183c4ef 100644 --- a/src/plugins/help/helpviewer_qwv.cpp +++ b/src/plugins/help/helpviewer_qwv.cpp @@ -258,7 +258,8 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent) connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this, SLOT(actionChanged())); connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl))); - connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool))); + connect(this, SIGNAL(loadStarted()), this, SLOT(slotLoadStarted())); + connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool))); connect(this, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged())); connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); @@ -435,12 +436,6 @@ void HelpViewer::actionChanged() emit forwardAvailable(a->isEnabled()); } -void HelpViewer::setLoadFinished(bool ok) -{ - Q_UNUSED(ok) - emit sourceChanged(source()); -} - // -- private bool HelpViewer::eventFilter(QObject *obj, QEvent *event) |
