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

Git/VCS: Use spinning progress indicator for log view

Browse Source 
Show a spinning progress indicator instead of the "Waiting for data"
text for e.g. the git log view and other commands that use
VcsBaseEditor.

Change-Id: Ie4c73f85397f8809bda6bb276140eb695d96174f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2015-01-16 16:06:16 +01:00
parent 8c3e68832e
commit 4c63deae5c
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -46,6 +46,7 @@
#include <projectexplorer/session.h>
#include <texteditor/textdocument.h>
#include <texteditor/textdocumentlayout.h>
#include <utils/progressindicator.h>
#include <utils/qtcassert.h>
#include <QDebug>
@@ -573,6 +574,7 @@ public:
QPointer<VcsCommand> m_command;
QObject *m_describeReceiver;
const char *m_describeSlot;
Utils::ProgressIndicator *m_progressIndicator;
private:
QComboBox *m_entriesComboBox;
@@ -589,6 +591,7 @@ VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *edit
m_mouseDragging(false),
m_describeReceiver(0),
m_describeSlot(0),
m_progressIndicator(0),
m_entriesComboBox(0)
{
m_textCursorHandlers.append(new ChangeTextCursorHandler(editorWidget));
@@ -1352,9 +1355,18 @@ VcsBaseEditorParameterWidget *VcsBaseEditorWidget::configurationWidget() const
void VcsBaseEditorWidget::setCommand(VcsCommand *command)
{
if (d->m_command)
if (d->m_command) {
d->m_command->abort();
hideProgressIndicator();
}
d->m_command = command;
if (d->m_command) {
d->m_progressIndicator = new Utils::ProgressIndicator(Utils::ProgressIndicator::Large);
d->m_progressIndicator->attachToWidget(this);
connect(d->m_command, &VcsCommand::finished,
this, &VcsBaseEditorWidget::hideProgressIndicator);
QTimer::singleShot(100, this, SLOT(showProgressIndicator()));
}
}
// Find the complete file from a diff relative specification.
@@ -1439,6 +1451,19 @@ void VcsBaseEditorWidget::slotPaste()
}
}
void VcsBaseEditorWidget::showProgressIndicator()
{
if (!d->m_progressIndicator) // already stopped and deleted
return;
d->m_progressIndicator->show();
}
void VcsBaseEditorWidget::hideProgressIndicator()
{
delete d->m_progressIndicator;
d->m_progressIndicator = 0;
}
bool VcsBaseEditorWidget::canApplyDiffChunk(const DiffChunk &dc) const
{
if (!dc.isValid())