feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix missing progress indicator during load.

Browse Source 
Task-number: QTCREATORBUG-3380
This commit is contained in:
kh1
2011-01-11 13:16:12 +01:00
parent ae83b4b7b6
commit fd89e85850
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/help/helpviewer.cpp
View File

@@ -164,6 +164,18 @@ void HelpViewer::home()
setSource(homepage); 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) bool HelpViewer::handleForwardBackwardMouseButtons(QMouseEvent *event)
{ {
if (event->button() == Qt::XButton1) { if (event->button() == Qt::XButton1) {

3
src/plugins/help/helpviewer.h
View File

@@ -127,7 +127,8 @@ protected:
private slots: private slots:
void actionChanged(); void actionChanged();
void setLoadFinished(bool ok); void slotLoadStarted();
void slotLoadFinished(bool ok);
private: private:
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);

8
src/plugins/help/helpviewer_qtb.cpp
View File

@@ -72,7 +72,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
setViewerFont(font); setViewerFont(font);
connect(this, SIGNAL(sourceChanged(QUrl)), this, SIGNAL(titleChanged())); 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() HelpViewer::~HelpViewer()
@@ -312,12 +312,6 @@ void HelpViewer::actionChanged()
// stub // stub
} }
void HelpViewer::setLoadFinished(bool ok)
{
Q_UNUSED(ok)
emit sourceChanged(source());
}
// -- private // -- private
bool HelpViewer::eventFilter(QObject *obj, QEvent *event) bool HelpViewer::eventFilter(QObject *obj, QEvent *event)

9
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -258,7 +258,8 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this, connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this,
SLOT(actionChanged())); SLOT(actionChanged()));
connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl))); 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(this, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged()));
connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
@@ -435,12 +436,6 @@ void HelpViewer::actionChanged()
emit forwardAvailable(a->isEnabled()); emit forwardAvailable(a->isEnabled());
} }
void HelpViewer::setLoadFinished(bool ok)
{
Q_UNUSED(ok)
emit sourceChanged(source());
}
// -- private // -- private
bool HelpViewer::eventFilter(QObject *obj, QEvent *event) bool HelpViewer::eventFilter(QObject *obj, QEvent *event)