refact1

InstructorsAndTrainees/CMakeLists.txt

@@ -17,6 +17,12 @@ add_library(InstructorsAndTrainees SHARED
   settings/dialogsettings.cpp
   settings/dialogsettings.h
   settings/dialogsettings.ui
+  settings/dialognewversion.cpp
+  settings/dialognewversion.h
+  settings/dialognewversion.ui
+  settings/dialogversioncontrol.cpp
+  settings/dialogversioncontrol.h
+  settings/dialogversioncontrol.ui
 
   specialmessagebox/specialmessagebox.cpp
   specialmessagebox/specialmessagebox.h
@@ -132,12 +138,6 @@ add_library(InstructorsAndTrainees SHARED
   tasks/subprocitemwidget.h
   tasks/subprocitemwidget.ui
 
-  widgets/dialognewversion.cpp
-  widgets/dialognewversion.h
-  widgets/dialognewversion.ui
-  widgets/versionselectwidget.cpp
-  widgets/versionselectwidget.h
-  widgets/versionselectwidget.ui
   widgets/waitanimationwidget.cpp
   widgets/waitanimationwidget.h
   widgets/waitanimationwidget.ui

InstructorsAndTrainees/settings/dialogsettings.cpp

@@ -4,7 +4,7 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QRegExpValidator>
-#include "versionselectwidget.h"
+#include "dialogversioncontrol.h"
 
 DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instructorIsLogged, QWidget *parent) :
     QDialog(parent),
@@ -201,9 +201,8 @@ void DialogSettings::on_btnSetVersion_clicked()
     if(connectorToServer)
         if(connectorToServer->getIsConnected())
         {
-            VersionSelectWidget *versionSelectWidget = new VersionSelectWidget(connectorToServer, this);
+            DialogVersionControl *versionSelectWidget = new DialogVersionControl(connectorToServer, this);
-            versionSelectWidget->setAuthor(connectorToServer->getLoginName());
+            versionSelectWidget->initialize(connectorToServer->getLoginName());
-            versionSelectWidget->initialize();
             versionSelectWidget->exec();
             delete versionSelectWidget;
         }

InstructorsAndTrainees/settings/dialogversioncontrol.cpp

@@ -1,17 +1,17 @@
 #include <QResizeEvent>
 
-#include "versionselectwidget.h"
+#include "dialogversioncontrol.h"
 #include "specialmessagebox.h"
-#include "ui_versionselectwidget.h"
+#include "ui_dialogversioncontrol.h"
 
 
-VersionSelectWidget::VersionSelectWidget(ConnectorToServer* connectorToServer, QWidget *parent) :
+DialogVersionControl::DialogVersionControl(ConnectorToServer* connectorToServer, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::VersionSelectWidget),
+    ui(new Ui::DialogVersionControl),
-    connectorToServer(connectorToServer),
+    connectorToServer(connectorToServer),    
-    versionContainer(nullptr),
     serverDataList(nullptr),
     selectedVersion(nullptr),
+    versionContainer(nullptr),
     waitAnimationWidget(nullptr),
     authorName(""),
     flGetVersion(false)
@@ -30,7 +30,7 @@ VersionSelectWidget::VersionSelectWidget(ConnectorToServer* connectorToServer, Q
     waitAnimationWidget->initialize(movie,this);
 }
 
-VersionSelectWidget::~VersionSelectWidget()
+DialogVersionControl::~DialogVersionControl()
 {
     waitAnimationWidget->hideWithStop();
 
@@ -41,24 +41,25 @@ VersionSelectWidget::~VersionSelectWidget()
     delete ui;
 }
 
-void VersionSelectWidget::initialize()
+void DialogVersionControl::initialize(QString authorName)
 {
-    connect (connectorToServer, &ConnectorToServer::signal_SetVersion, this, &VersionSelectWidget::slot_SetVersion);
+    this->authorName = authorName;
-    connect(connectorToServer, &ConnectorToServer::signal_AnimationActivated, this, &VersionSelectWidget::slot_activateLoadAnimation);
 
-    connect(connectorToServer, &ConnectorToServer::signal_showServerList, this, &VersionSelectWidget::slot_showServerList);
+    connect (connectorToServer, &ConnectorToServer::signal_SetVersion, this, &DialogVersionControl::slot_SetVersion);
+    connect(connectorToServer, &ConnectorToServer::signal_AnimationActivated, this, &DialogVersionControl::slot_activateLoadAnimation);
 
-    connect(this, &VersionSelectWidget::sigSendSwitchVersion, connectorToServer, &ConnectorToServer::slot_SendSwitchVersion);
+    connect(connectorToServer, &ConnectorToServer::signal_showServerList, this, &DialogVersionControl::slot_showServerList);
-    connect(this, &VersionSelectWidget::sigSendCopyVersion, connectorToServer, &ConnectorToServer::slot_SendCopyVersion);
-    connect(this, &VersionSelectWidget::sigSendDeleteVersion, connectorToServer, &ConnectorToServer::slot_SendDeleteVersion);
 
-    connect(this, &VersionSelectWidget::signal_getVersion, connectorToServer, &ConnectorToServer::slot_getVersion);
+    connect(this, &DialogVersionControl::sigSendSwitchVersion, connectorToServer, &ConnectorToServer::slot_SendSwitchVersion);
+    connect(this, &DialogVersionControl::sigSendCopyVersion, connectorToServer, &ConnectorToServer::slot_SendCopyVersion);
+    connect(this, &DialogVersionControl::sigSendDeleteVersion, connectorToServer, &ConnectorToServer::slot_SendDeleteVersion);
+
+    connect(this, &DialogVersionControl::signal_getVersion, connectorToServer, &ConnectorToServer::slot_getVersion);
 
     emit signal_getVersion();
-    //connectorToServer->sendShowVersionSelect();
 }
 
-void VersionSelectWidget::fillView(QList<StreamingVersionData *> *serverData)
+void DialogVersionControl::fillView(QList<StreamingVersionData *> *serverData)
 {
     ui->verListView->clear();
     serverDataList = serverData;
@@ -69,17 +70,20 @@ void VersionSelectWidget::fillView(QList<StreamingVersionData *> *serverData)
         ui->verListView->addItem(data->getViewName());
     }
 
-    ui->verListView->setCurrentRow(0);
+    if(ui->verListView->count())
-    ui->verListView->itemClicked(ui->verListView->item(0));
+    {
+        ui->verListView->setCurrentRow(0);
+        ui->verListView->itemClicked(ui->verListView->item(0));
+    }
 }
 
-QString VersionSelectWidget::changableText(bool flag)
+QString DialogVersionControl::changableText(bool flag)
 {
     if(flag) return tr("Yes");
     else return tr("No");
 }
 
-void VersionSelectWidget::on_verListView_itemClicked(QListWidgetItem *item)
+void DialogVersionControl::on_verListView_itemClicked(QListWidgetItem *item)
 {
     for(StreamingVersionData *data : *serverDataList)
     {
@@ -95,7 +99,7 @@ void VersionSelectWidget::on_verListView_itemClicked(QListWidgetItem *item)
     }
 }
 
-void VersionSelectWidget::sendCopyEmit(QString newName)
+void DialogVersionControl::sendCopyEmit(QString newName)
 {
     QString result = selectedVersion->getViewName() + ";" + newName + ";" + authorName;
 
@@ -110,7 +114,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName)
         emit sigSendCopyVersion(result);
 }
 
-void VersionSelectWidget::on_createDuplicateButton_clicked()
+void DialogVersionControl::on_createDuplicateButton_clicked()
 {
     if (selectedVersion == nullptr)
     {
@@ -139,7 +143,7 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
     delete dlgNewVersion;
 }
 
-void VersionSelectWidget::on_deleteVersionButton_clicked()
+void DialogVersionControl::on_deleteVersionButton_clicked()
 {
     if (selectedVersion == nullptr)
     {
@@ -151,7 +155,7 @@ void VersionSelectWidget::on_deleteVersionButton_clicked()
         emit sigSendDeleteVersion(selectedVersion);
 }
 
-void VersionSelectWidget::on_switchServerVersionButton_clicked()
+void DialogVersionControl::on_switchServerVersionButton_clicked()
 {
     if (selectedVersion == nullptr)
     {
@@ -165,7 +169,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
     emit sigSendSwitchVersion(selectedVersion);
 }
 
-void VersionSelectWidget::slot_activateLoadAnimation(bool flag)
+void DialogVersionControl::slot_activateLoadAnimation(bool flag)
 {
     if (flag)
     {
@@ -177,12 +181,12 @@ void VersionSelectWidget::slot_activateLoadAnimation(bool flag)
     }
 }
 
-void VersionSelectWidget::slot_showServerList(QList<StreamingVersionData *> *serverList)
+void DialogVersionControl::slot_showServerList(QList<StreamingVersionData *> *serverList)
 {
     fillView(serverList);
 }
 
-void VersionSelectWidget::slot_SetVersion(StreamingVersionData *serverVersion)
+void DialogVersionControl::slot_SetVersion(StreamingVersionData *serverVersion)
 {
     versionContainer->setServerVersionData(serverVersion);
 
@@ -192,12 +196,7 @@ void VersionSelectWidget::slot_SetVersion(StreamingVersionData *serverVersion)
     flGetVersion = true;
 }
 
-void VersionSelectWidget::setAuthor(QString name)
+void DialogVersionControl::resizeEvent(QResizeEvent *event)
-{
-    authorName = name;
-}
-
-void VersionSelectWidget::resizeEvent(QResizeEvent *event)
 {
     QSize size = event->size();
     waitAnimationWidget->resize(size);

InstructorsAndTrainees/settings/dialogversioncontrol.h

@@ -10,23 +10,20 @@
 #include "dialognewversion.h"
 #include "waitanimationwidget.h"
 #include "connectortoserver.h"
-#include "versioncontainer.h"
 
 namespace Ui {
-class VersionSelectWidget;
+class DialogVersionControl;
 }
 
-class VersionSelectWidget : public QDialog
+class DialogVersionControl : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit VersionSelectWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
+    explicit DialogVersionControl(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
-    ~VersionSelectWidget();
+    ~DialogVersionControl();
 
-    void initialize();
+    void initialize(QString authorName);
-    void sendCopyEmit(QString newName);
-    void setAuthor(QString name);
 
 public:
     void resizeEvent(QResizeEvent *event) override;
@@ -53,19 +50,20 @@ signals:
 private:
     QString changableText(bool flag);
     void fillView(QList<StreamingVersionData*> *serverData);
+    void sendCopyEmit(QString newName);
 
 private:
 
-    Ui::VersionSelectWidget *ui;
+    Ui::DialogVersionControl *ui;
 
-    ConnectorToServer* connectorToServer;
+    ConnectorToServer* connectorToServer;    
-
-    VersionContainer *versionContainer;
 
     QList<StreamingVersionData*> *serverDataList;
 
     StreamingVersionData *selectedVersion;
 
+    VersionContainer *versionContainer;
+
     WaitAnimationWidget *waitAnimationWidget;
 
     QString authorName;

InstructorsAndTrainees/settings/dialogversioncontrol.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>VersionSelectWidget</class>
+ <class>DialogVersionControl</class>
- <widget class="QWidget" name="VersionSelectWidget">
+ <widget class="QDialog" name="DialogVersionControl">
   <property name="geometry">
    <rect>
     <x>0</x>