Commit 4c63deae authored by Eike Ziller's avatar Eike Ziller

Git/VCS: Use spinning progress indicator for log view

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's avatarOrgad Shaneh <orgads@gmail.com>
parent 8c3e6883
......@@ -727,7 +727,6 @@ const char *GitClient::stashNamePrefix = "stash@{";
GitClient::GitClient(GitSettings *settings) :
m_cachedGitVersion(0),
m_msgWait(tr("Waiting for data...")),
m_settings(settings),
m_disableEditor(false)
{
......@@ -797,7 +796,7 @@ VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynami
// Exists already
EditorManager::activateEditor(outputEditor);
outputEditor->document()->setContents(m_msgWait.toUtf8());
outputEditor->document()->setContents(QByteArray()); // clear
rc = VcsBaseEditor::getVcsBaseEditor(outputEditor);
return rc;
......@@ -926,8 +925,7 @@ VcsBaseEditorWidget *GitClient::createVcsEditor(
QTC_CHECK(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue));
// Create new, set wait message, set up with source and codec
IEditor *outputEditor = EditorManager::openEditorWithContents(id, &title,
m_msgWait.toUtf8());
IEditor *outputEditor = EditorManager::openEditorWithContents(id, &title);
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
rc = VcsBaseEditor::getVcsBaseEditor(outputEditor);
connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
......
......@@ -435,7 +435,6 @@ private:
mutable Utils::FileName m_gitVersionForBinary;
mutable unsigned m_cachedGitVersion;
const QString m_msgWait;
GitSettings *m_settings;
QString m_gitQtcEditor;
QMap<QString, StashInfo> m_stashInfo;
......
......@@ -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())
......
......@@ -242,6 +242,8 @@ private slots:
void slotAnnotateRevision();
void slotApplyDiffChunk();
void slotPaste();
void showProgressIndicator();
void hideProgressIndicator();
protected:
/* A helper that can be used to locate a file in a diff in case it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment