refact0

InstructorsAndTrainees/settings/dialogsettings.cpp

@@ -198,12 +198,6 @@ void DialogSettings::on_btnSave_clicked()
 
 void DialogSettings::on_btnSetVersion_clicked()
 {
-    /*
-    if(connectorToServer)
-        if(connectorToServer->getIsConnected())
-            connectorToServer->sendShowVersionSelect();
-            */
-
     if(connectorToServer)
         if(connectorToServer->getIsConnected())
         {

InstructorsAndTrainees/widgets/dialognewversion.cpp

@@ -4,7 +4,6 @@
 DialogNewVersion::DialogNewVersion(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::DialogNewVersion),
-    versionSelectWidget(nullptr),
     validator(nullptr)
 {
     ui->setupUi(this);
@@ -22,18 +21,21 @@ DialogNewVersion::~DialogNewVersion()
     delete ui;
 }
 
-void DialogNewVersion::initialize(VersionSelectWidget *versionSelectWidget, QString prevName)
+void DialogNewVersion::initialize(QString prevName)
 {
-    this->versionSelectWidget = versionSelectWidget;
-    ui->prevVerValue->setText(prevName);    
+    ui->prevVerValue->setText(prevName);
+}
+
+QString DialogNewVersion::getNewName()
+{
+    return ui->lineEdit->text();
 }
 
 void DialogNewVersion::on_createButton_clicked()
 {
     if(ui->lineEdit->text() != "")
     {
-        versionSelectWidget->sendCopyEmit(ui->lineEdit->text());
-        close();
+        accept();
     }
 }
 

InstructorsAndTrainees/widgets/dialognewversion.h

@@ -5,15 +5,12 @@
 #include <QWidget>
 #include <QLineEdit>
 #include <QToolTip>
-
-#include "versionselectwidget.h"
+#include <QRegExpValidator>
 
 namespace Ui {
 class DialogNewVersion;
 }
 
-class VersionSelectWidget;
-
 class DialogNewVersion : public QDialog
 {
     Q_OBJECT
@@ -23,16 +20,17 @@ public:
     ~DialogNewVersion();
 
 public:
-    void initialize(VersionSelectWidget *versionSelectWidget, QString prevName);
+    void initialize(QString prevName);
+    QString getNewName();
 
 private slots:
     void on_createButton_clicked();
     void on_cancelButton_clicked();
+
     void on_lineEdit_inputRejected();
 
 private:
     Ui::DialogNewVersion *ui;
-    VersionSelectWidget *versionSelectWidget;
     QRegExpValidator *validator;
 };
 

InstructorsAndTrainees/widgets/versionselectwidget.cpp

@@ -120,8 +120,22 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
     }
 
     DialogNewVersion *dlgNewVersion = new DialogNewVersion(this);
-    dlgNewVersion->initialize(this, selectedVersion->getViewName());
-    dlgNewVersion->exec();
+    dlgNewVersion->initialize(selectedVersion->getViewName());
+
+    switch(dlgNewVersion->exec())
+    {
+    case QDialog::Accepted:
+    {
+        QString newName = dlgNewVersion->getNewName();
+        sendCopyEmit(newName);
+        break;
+    }
+    case QDialog::Rejected:
+        break;
+    default:
+        break;
+    }
+
     delete dlgNewVersion;
 }