Reorganize clone dialog

Libs/libMacGitverCore/App/MgvPrimaryWindowActions.hid

@@ -26,7 +26,9 @@ Ui MgvPrimaryWindowActions {
             StatusToolTip   "Repository related functions.";
 
             MergePlace RepositoryMenuMP;
+            Separator;
 
+            MergePlace CloneMP;
             Separator;
 
             Action RepositoryQuit {

Libs/libMacGitverCore/CMakeLists.txt

@@ -61,6 +61,7 @@ SET( SRC_FILES
     Widgets/FlatTreeComboBox.cpp
     Widgets/FlatTreeModel.cpp
     Widgets/FlatTreeDelegate.cpp
+    Widgets/ProgressDlg.cpp
     Widgets/SHA1Input.cpp
     Widgets/ShortCommitModel.cpp
     Widgets/RepoStateWidget.cpp
@@ -114,6 +115,7 @@ SET( PUB_HDR_FILES
     Widgets/FlatTreeComboBox.h
     Widgets/FlatTreeModel.h
     Widgets/FlatTreeDelegate.h
+    Widgets/ProgressDlg.hpp
     Widgets/SHA1Input.h
     Widgets/ShortCommitModel.h
     Widgets/TreeViewCtxMenu.hpp
@@ -161,6 +163,9 @@ SET( UI_FILES
     RepoMan/Config/RepoManConfigPage.ui
 
     Widgets/ExpandableDlg.ui
+    Widgets/ProgressDlg.ui
+
+    Widgets/ProgressWdgt.ui
 )
 
 SET( HID_FILES

Libs/libMacGitverCore/Widgets/ProgressDlg.cpp

@@ -0,0 +1,206 @@
+
+#include "ProgressDlg.hpp"
+#include "ui_ProgressDlg.h"
+#include "ui_ProgressWdgt.h"
+
+#include <QStringBuilder>
+#include <QCloseEvent>
+#include <QPushButton>
+
+namespace Private
+{
+
+    class ProgressWdgt : public QWidget, public Ui::ProgressWdgt
+    {
+    public:
+        typedef QMap< QString, QPointer<ProgressWdgt> > Steps;
+
+        enum Status { Running = 0, Stopped };
+
+    public:
+        ProgressWdgt(const QString& description)
+        {
+            setupUi(this);
+            progressBar->setMinimum(0);
+            progressBar->setMaximum(100);
+            txtHeader->setText( description );
+        }
+
+    public:
+        Steps   mSteps;
+        Status  mStatus     = Running;
+
+        qreal   mPercentage = 0.;
+    };
+
+}
+
+
+ProgressDlg::ProgressDlg()
+    : BlueSky::Dialog()
+    , ui( new Ui::ProgressDlg )
+    , mDone( false )
+{
+    ui->setupUi( this );
+
+    QPushButton* close = ui->buttonBox->button( QDialogButtonBox::Close );
+    close->setEnabled( false );
+    connect( close, &QPushButton::clicked, this, &ProgressDlg::close );
+
+    QPalette p;
+    p.setColor( QPalette::Base, p.color( QPalette::Window ) );
+    p.setColor( QPalette::Text, p.color( QPalette::WindowText ) );
+    ui->txtLog->setPalette( p );
+
+    connect(&mUpdater, &QTimer::timeout, this, &ProgressDlg::updateActivities);
+    mUpdater.start(250);
+}
+
+ProgressDlg::~ProgressDlg()
+{
+    delete ui;
+}
+
+int ProgressDlg::updateInterval() const
+{
+    return mUpdater.interval();
+}
+
+void ProgressDlg::setUpdateInterval(int msec)
+{
+    mUpdater.setInterval(msec);
+}
+
+void ProgressDlg::addActivity(const QString& description, QObject* activity,
+                              const StepInfo::List& steps)
+{
+    Q_ASSERT(activity);
+
+    Private::ProgressWdgt* a( new Private::ProgressWdgt(description) );
+    mActivities[activity] = a;
+
+    QTreeWidgetItem* activityItem(new QTreeWidgetItem);
+    ui->treeProgress->addTopLevelItem(activityItem);
+    ui->treeProgress->setItemWidget(activityItem, 0, a);
+
+    foreach (const StepInfo& sir, steps) {
+        Private::ProgressWdgt* s = new Private::ProgressWdgt(sir.desc);
+        a->mSteps[sir.name] = s;
+
+        QTreeWidgetItem* stepItem(new QTreeWidgetItem);
+        activityItem->addChild(stepItem);
+        ui->treeProgress->setItemWidget(stepItem, 0, s);
+    }
+}
+
+void ProgressDlg::setStatusInfo(QObject* activity, const QString& step,
+                                const QString& text)
+{
+    Q_ASSERT(activity && !step.isEmpty());
+
+    Private::ProgressWdgt* s = findStep(activity, step);
+    s->txtStatusInfo->setText(text);
+}
+
+void ProgressDlg::setPercentage(QObject* activity, const QString& step,
+                                qreal percent)
+{
+    Q_ASSERT(activity && !step.isEmpty());
+
+    Private::ProgressWdgt* s = findStep(activity, step);
+    s->mPercentage = qMin( qMax(percent, 0.), 1. ) * 100.;
+}
+
+void ProgressDlg::closeEvent( QCloseEvent* ev )
+{
+    if( !mDone )
+    {
+        ev->ignore();
+        return;
+    }
+
+    QDialog::closeEvent( ev );
+}
+
+void ProgressDlg::remoteMessage(const QString& msg)
+{
+    mRawRemoteMessage += msg;
+
+    QString output;
+    QChar outputBuffer[ 256 ];
+    int outBufPos = 0, outBufLen = 0;
+
+    for( int i = 0; i < mRawRemoteMessage.length(); ++i )
+    {
+        if( mRawRemoteMessage[ i ] == QChar( L'\r' ) )
+        {
+            outBufPos = 0;
+        }
+        else if( mRawRemoteMessage[ i ] == QChar( L'\n' ) )
+        {
+            if( outBufLen )
+                output += QString( outputBuffer, outBufLen );
+            output += QChar( L'\n' );
+            outBufPos = outBufLen = 0;
+        }
+        else
+        {
+            outputBuffer[ outBufPos++] = mRawRemoteMessage[ i ];
+            outBufLen = qMax( outBufLen, outBufPos );
+        }
+    }
+
+    if( outBufLen )
+        output += QString( outputBuffer, outBufLen );
+
+    QString log = mBaseLog % QStringLiteral( "<br/>" ) %
+            output.replace( QChar( L'\n' ), QStringLiteral("<br/>") ).simplified();
+
+    ui->txtLog->setHtml( log );
+}
+
+void ProgressDlg::finished(QObject* activity)
+{
+    mActivities[activity]->mStatus = Private::ProgressWdgt::Stopped;
+
+    bool done = true;
+    foreach (Private::ProgressWdgt* a, mActivities) {
+        done &= (a->mStatus == Private::ProgressWdgt::Stopped);
+        if (!done) {
+            break;
+        }
+    }
+
+    if (done) {
+        mDone = true;
+        ui->buttonBox->button( QDialogButtonBox::Close )->setEnabled( true );
+    }
+}
+
+void ProgressDlg::finished(QObject* activity, const QString& step)
+{
+    Q_ASSERT(activity && !step.isEmpty());
+
+    Private::ProgressWdgt* a = mActivities[activity];
+    a->mSteps[step]->mStatus = Private::ProgressWdgt::Stopped;
+}
+
+void ProgressDlg::updateActivities()
+{
+    foreach(Private::ProgressWdgt* a, mActivities) {
+        a->mPercentage = 0;
+        foreach (Private::ProgressWdgt* s, a->mSteps) {
+            s->progressBar->setValue(qRound(s->mPercentage));
+            qreal stepPercent = s->mPercentage / a->mSteps.size();
+            a->mPercentage += qMin( qMax(stepPercent, 0.), 100.);
+        }
+
+        a->progressBar->setValue(qRound(a->mPercentage));
+    }
+}
+
+Private::ProgressWdgt* ProgressDlg::findStep(QObject* activity, const QString& step) const
+{
+    Private::ProgressWdgt* a = mActivities[activity];
+    return step.isEmpty() || !a ? nullptr : a->mSteps[step];
+}

Libs/libMacGitverCore/Widgets/ProgressDlg.hpp

@@ -0,0 +1,74 @@
+
+#pragma once
+
+#include "libMacGitverCore/MacGitverApi.hpp"
+#include "libBlueSky/Dialog.hpp"
+
+#include <QMap>
+#include <QPointer>
+#include <QTimer>
+
+namespace Private
+{
+    class ProgressWdgt;
+};
+
+namespace Ui
+{
+    class ProgressDlg;
+};
+
+class MGV_CORE_API ProgressDlg : public BlueSky::Dialog
+{
+    Q_OBJECT
+
+public:
+    struct StepInfo
+    {
+        typedef QVector<StepInfo> List;
+
+        QString name;
+        QString desc;
+    };
+
+    typedef QMap< QPointer<QObject>, QPointer<Private::ProgressWdgt> > Activities;
+
+public:
+    ProgressDlg();
+    ~ProgressDlg();
+
+public:
+    int updateInterval() const;
+    void setUpdateInterval(int msec);
+
+    void addActivity(const QString& description, QObject* activity,
+                     const StepInfo::List& steps);
+
+    void setStatusInfo(QObject* activity, const QString& step,
+                       const QString& text);
+    void setPercentage(QObject* activity, const QString& step, qreal percent);
+    void remoteMessage(const QString& msg);
+
+    void finished(QObject* activity);
+    void finished(QObject* activity, const QString& step);
+
+private slots:
+    void updateActivities();
+
+protected:
+    void closeEvent( QCloseEvent* ev );
+
+private:
+    Private::ProgressWdgt* findStep(QObject* activity, const QString& step) const;
+
+private:
+    Ui::ProgressDlg*    ui;
+
+private:
+    bool            mDone;
+    QString         mBaseLog;
+    QString         mRawRemoteMessage;
+    Activities      mActivities;
+
+    QTimer          mUpdater;
+};