Repository Module: reimplemented CloneDlg that inherits ExpandableDlg

Modules/Repository/CMakeLists.txt

@@ -16,9 +16,8 @@ SET( SRC_FILES
     RepoTreeView.cpp
     RepositoryContext.cpp
 
-    CreateRepositoryDlg.cpp
     CloneRepositoryDlg.cpp
-    CloneOptionsWdgt.cpp
+    CreateRepositoryDlg.cpp
     ProgressDlg.cpp
 )
 
@@ -30,18 +29,16 @@ SET( HDR_FILES
     RepoTreeView.hpp
     RepositoryContext.hpp
 
+    CloneRepositoryDlg.hpp
     CreateRepositoryDlg.h
-    CloneRepositoryDlg.h
-    CloneOptionsWdgt.hpp
     ProgressDlg.hpp
 )
 
 SET( UI_FILES
 
-    CreateRepositoryDlg.ui
-    CloneRepositoryDlg.ui
     CloneOptionsWdgt.ui
-    ProgressDlg.ui
+    CloneRepositoryDlg.ui
+    CreateRepositoryDlg.ui
 )
 
 SET( HID_FILES

Modules/Repository/CloneOptionsWdgt.cpp

@@ -1,33 +0,0 @@
-#include "CloneOptionsWdgt.hpp"
-
-#include <QLayout>
-
-
-CloneOptionsWdgt::CloneOptionsWdgt(QWidget *parent) :
-    QWidget(parent)
-{
-    setupUi(this);
-
-    // margin is controlled by the parent widget's layout
-    layout()->setMargin(0);
-}
-
-CloneOptionsWdgt::~CloneOptionsWdgt()
-{
-}
-
-void CloneOptionsWdgt::on_txtCloneMode_currentIndexChanged(int index)
-{
-    // Note: clone modes are fixed
-    mCloneMode = static_cast<CloneMode>( index );
-    grpSubmodules->setEnabled( mCloneMode == cmCheckout );
-}
-
-void CloneOptionsWdgt::on_chkInitSubmodules_toggled(bool checked)
-{
-    chkSubmodulesRecursive->setEnabled( checked );
-    if( !checked )
-    {
-        chkSubmodulesRecursive->setChecked( false );
-    }
-}

Modules/Repository/CloneOptionsWdgt.hpp

@@ -1,35 +1 @@
-#ifndef UICLONEOPTIONS_HPP
-#define UICLONEOPTIONS_HPP
 
-#include <QWidget>
-
-#include "ui_CloneOptionsWdgt.h"
-
-
-class CloneOptionsWdgt : public QWidget, Ui::CloneOptionsWdgt
-{
-    Q_OBJECT
-
-    friend class CloneRepositoryDlg;
-
-public:
-    enum CloneMode {
-        cmCheckout  = 0,
-        cmBare,
-        cmMirror
-    };
-
-public:
-    explicit CloneOptionsWdgt(QWidget *parent = 0);
-    ~CloneOptionsWdgt();
-
-private slots:
-    void on_txtCloneMode_currentIndexChanged(int index);
-
-    void on_chkInitSubmodules_toggled(bool checked);
-
-private:
-    CloneMode       mCloneMode;
-};
-
-#endif // UICLONEOPTIONS_HPP

Modules/Repository/CloneRepositoryDlg.cpp

@@ -1,6 +1,9 @@
 /*
  * MacGitver
- * Copyright (C) 2012 Sascha Cunz <sascha@babbelbox.org>
+ * Copyright (C) 2015 The MacGitver-Developers <dev@macgitver.org>
+ *
+ * (C) Sascha Cunz <sascha@macgitver.org>
+ * (C) Nils Fenner <nils@macgitver.org>
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License (Version 2) as published by the Free Software Foundation.
@@ -14,31 +17,50 @@
  *
  */
 
-#include <QFileDialog>
-#include <QMessageBox>
+#include "CloneRepositoryDlg.hpp"
 
 #include "libMacGitverCore/Config/Config.h"
 
 #include "libGitWrap/Operations/CloneOperation.hpp"
 
 #include "libMacGitverCore/App/MacGitver.hpp"
 
-#include "CloneRepositoryDlg.h"
-#include "CloneOptionsWdgt.hpp"
+#include <QFileDialog>
+#include <QMessageBox>
 #include "ProgressDlg.hpp"
 
-CloneRepositoryDlg::CloneRepositoryDlg()
-    : mProgress( NULL )
+
+CloneOptionsWdgt::CloneOptionsWdgt()
 {
-    setupUi( this );
+    setupUi(this);
+}
 
-    connect( btnBrowseTo, SIGNAL(clicked()), SLOT(onBrowse()) );
-    connect( txtPath, SIGNAL(textChanged(QString)), SLOT(checkValid()) );
+void CloneOptionsWdgt::on_txtCloneMode_currentIndexChanged(int index)
+{
+    // Note: clone modes are fixed
+    mCloneMode = static_cast<CloneMode>( index );
+    grpSubmodules->setEnabled( mCloneMode == cmCheckout );
+}
 
-    checkValid();
+void CloneOptionsWdgt::on_chkInitSubmodules_toggled(bool checked)
+{
+    chkSubmodulesRecursive->setEnabled( checked );
+    if( !checked )
+    {
+        chkSubmodulesRecursive->setChecked( false );
+    }
 }
 
-void CloneRepositoryDlg::onBrowse()
+
+CloneWdgt::CloneWdgt()
+{
+    setupUi( this );
+
+    connect(btnBrowseTo,    &QAbstractButton::clicked,
+            this,           &CloneWdgt::onBrowse);
+}
+
+void CloneWdgt::onBrowse()
 {
     QString fn = txtPath->text();
     if( fn.isEmpty() )
@@ -59,7 +81,7 @@ void CloneRepositoryDlg::onBrowse()
     fd->open( this, SLOT(onBrowseHelper(QString)) );
 }
 
-void CloneRepositoryDlg::onBrowseHelper( const QString& directory )
+void CloneWdgt::onBrowseHelper( const QString& directory )
 {
     if( directory.isEmpty() )
     {
@@ -70,12 +92,30 @@ void CloneRepositoryDlg::onBrowseHelper( const QString& directory )
     txtPath->setText( directory );
 }
 
-void CloneRepositoryDlg::checkValid()
+
+CloneDlg::CloneDlg()
+    : mCloneWdgt(new CloneWdgt)
+    , mCloneOptsWdgt(new CloneOptionsWdgt)
 {
-    bool okay = !txtPath->text().isEmpty() &&
-                !txtUrl->text().isEmpty();
+    setDialogWidgets(mCloneWdgt, mCloneOptsWdgt);
+
+    connect(mCloneWdgt->txtPath,    &QLineEdit::textChanged,
+            this,                   &CloneDlg::checkValid);
 
-    QDir wanted( QDir::toNativeSeparators( txtPath->text() ) );
+    checkValid();
+}
+
+void CloneDlg::checkValid()
+{
+    if (!mCloneWdgt) {
+        setAcceptable(false);
+        return;
+    }
+
+    bool okay = !mCloneWdgt->txtPath->text().isEmpty() &&
+                !mCloneWdgt->txtUrl->text().isEmpty();
+
+    QDir wanted( QDir::toNativeSeparators( mCloneWdgt->txtPath->text() ) );
     if( wanted.exists() )
     {
         QStringList sl = wanted.entryList( QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot );
@@ -85,16 +125,20 @@ void CloneRepositoryDlg::checkValid()
         }
     }
 
-    buttonBox->button( QDialogButtonBox::Ok )->setEnabled( okay );
+    setAcceptable( okay );
 }
 
-void CloneRepositoryDlg::accept()
+void CloneDlg::accept()
 {
     Git::CloneOperation* clone = new Git::CloneOperation( this );
-    QString repoName  = QUrl( txtUrl->text() ).adjusted( QUrl::NormalizePathSegments | QUrl::StripTrailingSlash ).toString();
-    QString targetDir = QUrl( txtPath->text() ).adjusted( QUrl::NormalizePathSegments | QUrl::StripTrailingSlash ).toString();
-
-    if ( chkAppendRepoName->isChecked() )
+    QString repoName  = QUrl(mCloneWdgt->txtUrl->text() )
+                        .adjusted(QUrl::NormalizePathSegments |
+                                  QUrl::StripTrailingSlash ).toString();
+    QString targetDir = QUrl(mCloneWdgt->txtPath->text() )
+                        .adjusted(QUrl::NormalizePathSegments |
+                                  QUrl::StripTrailingSlash ).toString();
+
+    if ( mCloneWdgt->chkAppendRepoName->isChecked() )
     {
         targetDir += QString::fromUtf8("/%1")
                     .arg( QUrl( repoName ).fileName() );
@@ -103,13 +147,13 @@ void CloneRepositoryDlg::accept()
     clone->setBackgroundMode( true );
     clone->setUrl( repoName );
     clone->setPath( targetDir );
-    clone->setRemoteAlias( txtRemoteAlias->text() );
+    clone->setRemoteAlias( mCloneWdgt->txtRemoteAlias->text() );
 
-    if ( mCloneOpts )
+    if ( mCloneOptsWdgt )
     {
-        clone->setBare( mCloneOpts->mCloneMode == CloneOptionsWdgt::cmBare );
-        clone->setReference( mCloneOpts->txtBranch->text() );
-        clone->setDepth( mCloneOpts->txtCloneDepth->value() );
+        clone->setBare( mCloneOptsWdgt->mCloneMode == CloneOptionsWdgt::cmBare );
+        clone->setReference( mCloneOptsWdgt->txtBranch->text() );
+        clone->setDepth( mCloneOptsWdgt->txtCloneDepth->value() );
     }
 
     mProgress = new ProgressDlg;
@@ -140,7 +184,7 @@ void CloneRepositoryDlg::accept()
     clone->execute();
 }
 
-void CloneRepositoryDlg::beginDownloading()
+void CloneDlg::beginDownloading()
 {
     disconnect( sender(), SIGNAL(transportProgress(quint32,quint32,quint32,quint64)),
                 this, SLOT(beginDownloading()) );
@@ -151,13 +195,13 @@ void CloneRepositoryDlg::beginDownloading()
     updateAction();
 }
 
-void CloneRepositoryDlg::doneDownload()
+void CloneDlg::doneDownload()
 {
     mStates[ Download ] = Done;
     updateAction();
 }
 
-void CloneRepositoryDlg::doneIndexing()
+void CloneDlg::doneIndexing()
 {
     mStates[ Index ] = Done;
 
@@ -167,13 +211,13 @@ void CloneRepositoryDlg::doneIndexing()
     updateAction();
 }
 
-void CloneRepositoryDlg::doneCheckout()
+void CloneDlg::doneCheckout()
 {
     mStates[ Checkout ] = Done;
     updateAction();
 }
 
-void CloneRepositoryDlg::rootCloneFinished()
+void CloneDlg::rootCloneFinished()
 {
     Git::BaseOperation* operation = static_cast<Git::BaseOperation*>( sender() );
     Q_ASSERT( operation );
@@ -189,7 +233,7 @@ void CloneRepositoryDlg::rootCloneFinished()
     mProgress->reject();
 }
 
-void CloneRepositoryDlg::updateAction()
+void CloneDlg::updateAction()
 {
     QStringList open, current, done;
 
@@ -213,27 +257,3 @@ void CloneRepositoryDlg::updateAction()
 
     mProgress->setAction( mAction, open, current, done );
 }
-
-void CloneRepositoryDlg::on_btnCloneopts_toggled(bool checked)
-{
-    if ( checked )
-    {
-        if ( !mCloneOpts )
-        {
-            mCloneOpts = new CloneOptionsWdgt();
-        }
-
-        optsLayout->addWidget( mCloneOpts );
-        mCloneOpts->show();
-    }
-    else
-    {
-        optsLayout->removeWidget( mCloneOpts );
-        if ( mCloneOpts )
-        {
-            mCloneOpts->hide();
-        }
-        layout()->activate();
-        resize( width(), minimumSizeHint().height() );
-    }
-}