moved progress dialog (ProgressDlg) to libMacGitverCore with required minor changes

The progress dialog can now be called from the MGV-Core API.

Author: antis81

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,7 @@ SET( UI_FILES
     RepoMan/Config/RepoManConfigPage.ui
 
     Widgets/ExpandableDlg.ui
+    Widgets/ProgressDlg.ui
 )
 
 SET( HID_FILES

Modules/Repository/ProgressDlg.cpp renamed to Libs/libMacGitverCore/Widgets/ProgressDlg.cpp

@@ -1,28 +1,34 @@
 
+#include "ProgressDlg.hpp"
+#include "ui_ProgressDlg.h"
+
 #include <QStringBuilder>
 #include <QCloseEvent>
 #include <QDebug>
 #include <QPushButton>
 #include <QString>
 
-#include "ProgressDlg.hpp"
-
 
 ProgressDlg::ProgressDlg()
     : BlueSky::Dialog()
+    , ui( new Ui::ProgressDlg )
     , mDone( false )
 {
-    setupUi( this );
+    ui->setupUi( this );
 
-    QPushButton* close = buttonBox->button( QDialogButtonBox::Close );
+    QPushButton* close = ui->buttonBox->button( QDialogButtonBox::Close );
     close->setEnabled( false );
-    connect( close, SIGNAL(clicked()), this, SLOT(close ()) );
+    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 ) );
-    txtLog->setPalette( p );
+    ui->txtLog->setPalette( p );
+}
 
+ProgressDlg::~ProgressDlg()
+{
+    delete ui;
 }
 
 void ProgressDlg::setAction( const QString& action,
@@ -47,7 +53,7 @@ void ProgressDlg::setAction( const QString& action,
         act += QStringLiteral( " (<font color=\"red\">" ) % s % QStringLiteral( "</font>)" );
     }
 
-    lblAction->setText( act );
+    ui->lblAction->setText( act );
 }
 
 void ProgressDlg::setCurrent(QObject* current)
@@ -93,10 +99,10 @@ void ProgressDlg::transportProgress( quint32 totalObjects,
     {
         recv = QString::number( receivedBytes );
     }
-    lblTransferSize->setText( recv );
+    ui->lblTransferSize->setText( recv );
 
-    progressBar->setRange( 0, totalObjects * 2 );
-    progressBar->setValue( indexedObjects + receivedObjects );
+    ui->progressBar->setRange( 0, totalObjects * 2 );
+    ui->progressBar->setValue( indexedObjects + receivedObjects );
 }
 
 void ProgressDlg::remoteMessage( const QString& msg )
@@ -133,25 +139,25 @@ void ProgressDlg::remoteMessage( const QString& msg )
     QString log = mBaseLog % QStringLiteral( "<br/>" ) %
             output.replace( QChar( L'\n' ), QLatin1String("<br/>") ).simplified();
 
-    txtLog->setHtml( log );
+    ui->txtLog->setHtml( log );
 }
 
 void ProgressDlg::beginStep( const QString& step )
 {
     mBaseLog += tr( "<font color=\"blue\">%1</font><br/>" ).arg( step );
-    txtLog->setHtml( mBaseLog );
+    ui->txtLog->setHtml( mBaseLog );
 }
 
 void ProgressDlg::finalizeStep()
 {
-    mBaseLog = txtLog->toHtml() % QStringLiteral( "<br/>" );
+    mBaseLog = ui->txtLog->toHtml() % QStringLiteral( "<br/>" );
     mRawRemoteMessage = QString();
 
-    txtLog->setHtml( mBaseLog );
+    ui->txtLog->setHtml( mBaseLog );
 }
 
 void ProgressDlg::setDone()
 {
     mDone = true;
-    buttonBox->button( QDialogButtonBox::Close )->setEnabled( true );
+    ui->buttonBox->button( QDialogButtonBox::Close )->setEnabled( true );
 }

Modules/Repository/ProgressDlg.hpp renamed to Libs/libMacGitverCore/Widgets/ProgressDlg.hpp

@@ -1,19 +1,20 @@
 
-#ifndef MODREPO_PROGRESS_DLG_HPP
-#define MODREPO_PROGRESS_DLG_HPP
+#pragma once
 
+#include "libMacGitverCore/MacGitverApi.hpp"
 #include "libBlueSky/Dialog.hpp"
 
-#include "ui_ProgressDlg.h"
-
+namespace Ui
+{
+    class ProgressDlg;
+};
 
-class ProgressDlg
-        : public BlueSky::Dialog
-        , private Ui::ProgressDlg
+class MGV_CORE_API ProgressDlg : public BlueSky::Dialog
 {
     Q_OBJECT
 public:
     ProgressDlg();
+    ~ProgressDlg();
 
 public:
     void setAction( const QString& action, const QStringList& open,
@@ -33,11 +34,12 @@ private slots:
 protected:
     void closeEvent( QCloseEvent* ev );
 
+private:
+    Ui::ProgressDlg*    ui;
+
 private:
     bool            mDone;
     QString         mBaseLog;
     QObject*        mCurrent;
     QString         mRawRemoteMessage;
 };
-
-#endif

Modules/Repository/ProgressDlg.ui renamed to Libs/libMacGitverCore/Widgets/ProgressDlg.ui

@@ -22,9 +22,6 @@
   <property name="windowTitle">
    <string>Progress</string>
   </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
@@ -57,7 +54,16 @@
       <property name="sizeConstraint">
        <enum>QLayout::SetDefaultConstraint</enum>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -85,15 +91,24 @@
       <string>Current operation</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
       <property name="horizontalSpacing">
-       <number>-1</number>
+       <number>6</number>
       </property>
       <property name="verticalSpacing">
        <number>2</number>
       </property>
-      <property name="margin">
-       <number>3</number>
-      </property>
       <item row="1" column="1">
        <widget class="QProgressBar" name="progressBar">
         <property name="sizePolicy">

Modules/Repository/CMakeLists.txt

@@ -18,7 +18,6 @@ SET( SRC_FILES
 
     CloneRepositoryDlg.cpp
     CreateRepositoryDlg.cpp
-    ProgressDlg.cpp
 )
 
 SET( HDR_FILES
@@ -31,13 +30,11 @@ SET( HDR_FILES
 
     CloneRepositoryDlg.hpp
     CreateRepositoryDlg.h
-    ProgressDlg.hpp
 )
 
 SET( UI_FILES
 
     CloneOptionsWdgt.ui
-    CloneRepositoryDlg.ui
     CreateRepositoryDlg.ui
 )
 
@@ -60,4 +57,3 @@ ADD_MGV_MODULE(
     ${UIC_FILES} ${UI_FILES}
     ${HIC_FILES} ${HID_FILES}
 )
-

Modules/Repository/CloneRepositoryDlg.cpp

@@ -24,10 +24,10 @@
 #include "libGitWrap/Operations/CloneOperation.hpp"
 
 #include "libMacGitverCore/App/MacGitver.hpp"
+#include "libMacGitverCore/Widgets/ProgressDlg.hpp"
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include "ProgressDlg.hpp"
 
 
 CloneOptionsWdgt::CloneOptionsWdgt()