ref: draft

Widgets/commonbuttongroupwidget.cpp

@@ -8,11 +8,10 @@ CommonButtonGroupWidget::CommonButtonGroupWidget(QWidget *parent) :
     ui->setupUi(this);
 }
 
-void CommonButtonGroupWidget::initialize(MainWindow *mainWindow,ExternalExecuter *extExec,SendSystem *sendSystem,TCPClient *client)
+void CommonButtonGroupWidget::initialize(ExternalExecuter *extExec,SendSystem *sendSystem,TCPClient *client)
 {
     externalExecuter = extExec;
     this->sendSystem = sendSystem;
-    this->mainWindow = mainWindow;
     ui->loadingProgressBar->setValue(0);
     ui->loadingProgressBar->hide();
     ui->updateButton->hide();
@@ -84,8 +83,8 @@ void CommonButtonGroupWidget::on_updateButton_clicked()
 {
     emit sigSendPacket(PacketType::TYPE_UPDATE);
     startUpdateState();
-    mainWindow->disableUnsaveButton(true);
-    mainWindow->setInlineDebug(tr("Загрузка..."));
+    emit sigUpdateCommonWidget();
+
 }
 
 void CommonButtonGroupWidget::on_startButton_clicked()

Widgets/commonbuttongroupwidget.h

@@ -18,7 +18,7 @@ class CommonButtonGroupWidget : public QWidget
 
 public:
     explicit CommonButtonGroupWidget(QWidget *parent = nullptr);
-    void initialize(MainWindow *mainWindow,ExternalExecuter *extExec,SendSystem *sendSystem,TCPClient *client);
+    void initialize(ExternalExecuter *extExec,SendSystem *sendSystem,TCPClient *client);
     void loadCompleteState();
     void lastVerInstalledState();
     void disconnectState();
@@ -31,6 +31,7 @@ public:
 signals:
     void sigSendPacket(PacketType packet);
     void sigSendXMLAnswer(QString answer);
+    void sigUpdateCommonWidget();
 
 private slots:
     void on_updateButton_clicked();
@@ -41,7 +42,6 @@ public:
 
 private:
     Ui::CommonButtonGroupWidget *ui;
-    MainWindow *mainWindow;
     ExternalExecuter *externalExecuter;
     SendSystem *sendSystem;
 };

Widgets/entrywidget.cpp

@@ -8,13 +8,11 @@ EntryWidget::EntryWidget(QWidget *parent) :
     ui->setupUi(this);
 }
 
-void EntryWidget::initialize(MainWindow *mainWindow)
+void EntryWidget::initialize()
 {
     ui->offlineWidget->hide();
     ui->loginWidget->hide();
     ui->settingsWidget->hide();
-    this->mainWindow = mainWindow;
-
 }
 
 void EntryWidget::connectionEmptyState()
@@ -58,12 +56,12 @@ void EntryWidget::loginIsActive(bool flag)
 
 void EntryWidget::on_loginButton_clicked()
 {
-    mainWindow->login();
+    emit sigTryLogin();
 }
 
 void EntryWidget::on_saveServerButton_clicked()
 {
-    mainWindow->saveServerSettingsWithConnect();
+    emit sigSaveServerSettings();
 }
 
 ServerSettings *EntryWidget::getServerSettings()

Widgets/entrywidget.h

@@ -1,7 +1,6 @@
 #ifndef ENTRYWIDGET_H
 #define ENTRYWIDGET_H
 
-#include "mainwindow.h"
 #include <QWidget>
 #include <Data/Datas.h>
 
@@ -15,7 +14,7 @@ class EntryWidget : public QWidget
 
 public:
     explicit EntryWidget(QWidget *parent = nullptr);
-    void initialize(MainWindow *mainWindow);
+    void initialize();
     void AconnectionEmptyState();
     void settingsState();
     bool isLoginFieldsFill();
@@ -27,14 +26,17 @@ public:
     void fillSettings(ServerSettings *settings);
     ServerSettings *getServerSettings();
     void isActive(bool flag);
+
+signals:
+    void sigTryLogin();
+    void sigSaveServerSettings();
+
 private slots:
     void on_loginButton_clicked();
-
     void on_saveServerButton_clicked();
 
 private:
     Ui::EntryWidget *ui;
-    MainWindow *mainWindow;
 };
 
 #endif // ENTRYWIDGET_H

Widgets/instructorbuttongroupwidget.cpp

@@ -10,29 +10,26 @@ InstructorButtonGroupWidget::InstructorButtonGroupWidget(QWidget *parent) :
     ui->setupUi(this);
 }
 
-void InstructorButtonGroupWidget::initialize(MainWindow *mainWindow)
+void InstructorButtonGroupWidget::initialize()
 {
-    this->mainWindow = mainWindow;
     hide();
 }
 
 void InstructorButtonGroupWidget::on_loadToServerButton_clicked()
 {
-    mainWindow->loadToServer();
+    emit sigLoadToServer();
 }
 
 void InstructorButtonGroupWidget::on_undoChangesButton_clicked()
 {
-    mainWindow->undoCurrentChanges();
+    emit sigUndoCurrentChanges();
 }
 
 void InstructorButtonGroupWidget::on_startWithCurrentChangesButton_clicked()
 {
-    mainWindow->startUnityClient();
+    emit sigStartUnityClient();
 }
 
-
-
 InstructorButtonGroupWidget::~InstructorButtonGroupWidget()
 {
     delete ui;

Widgets/instructorbuttongroupwidget.h

@@ -2,33 +2,31 @@
 #define INSTRUCTORBUTTONGROUPWIDGET_H
 
 #include <QWidget>
-#include "mainwindow.h"
 
 namespace Ui {
 class InstructorButtonGroupWidget;
 }
 
-class MainWindow;
-
 class InstructorButtonGroupWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     explicit InstructorButtonGroupWidget(QWidget *parent = nullptr);
-    void initialize(MainWindow *mainWindow);
+    void initialize();
 
     ~InstructorButtonGroupWidget();
+signals:
+    void sigLoadToServer();
+    void sigUndoCurrentChanges();
+    void sigStartUnityClient();
 private slots:
     void on_loadToServerButton_clicked();
-
     void on_undoChangesButton_clicked();
-
     void on_startWithCurrentChangesButton_clicked();
 
 private:
     Ui::InstructorButtonGroupWidget *ui;
-    MainWindow *mainWindow;
 };
 
 #endif // INSTRUCTORBUTTONGROUPWIDGET_H

Widgets/newversionwidget.cpp

@@ -10,9 +10,8 @@ NewVersionWidget::NewVersionWidget(QWidget *parent) :
     setAttribute(Qt::WA_ShowModal,true);
 }
 
-void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName)
+void NewVersionWidget::initialize(QString prevName)
 {
-    this->versionSelectWidget = versionSelectWidget;
     ui->prevVerValue->setText(prevName);
 }
 
@@ -21,7 +20,7 @@ void NewVersionWidget::on_createButton_clicked()
 {
     if(ui->lineEdit->text() != "")
     {
-        versionSelectWidget->sendCopyEmit(ui->lineEdit->text());
+        emit sigSendCopy(ui->lineEdit->text());
         hide();
     }
 }

Widgets/newversionwidget.h

@@ -1,23 +1,24 @@
 #ifndef NEWVERSIONWIDGET_H
 #define NEWVERSIONWIDGET_H
 
-#include <Widgets/versionselectwidget.h>
 #include <QWidget>
 
 namespace Ui {
 class NewVersionWidget;
 }
 
-class VersionSelectWidget;
 class NewVersionWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     explicit NewVersionWidget(QWidget *parent = nullptr);
-    void initialize(VersionSelectWidget *versionSelectWidget,QString prevName);
+    void initialize(QString prevName);
     ~NewVersionWidget();
 
+signals:
+    void sigSendCopy(QString copyName);
+
 private slots:
     void on_createButton_clicked();
 
@@ -25,7 +26,6 @@ private slots:
 
 private:
     Ui::NewVersionWidget *ui;
-    VersionSelectWidget *versionSelectWidget;
 };
 
 #endif // NEWVERSIONWIDGET_H

Widgets/updatenotifywidget.cpp

@@ -1,6 +1,6 @@
 #include "updatenotifywidget.h"
 #include "ui_updatenotifywidget.h"
-#include "mainwindow.h"
+#include "Core/tools.h"
 
 #include <QMessageBox>
 
@@ -12,14 +12,13 @@ UpdateNotifyWidget::UpdateNotifyWidget(QWidget *) :
 //    setAttribute(Qt::WA_ShowModal,true);
 }
 
-void UpdateNotifyWidget::initialize(MainWindow *mainWindow,VersionContainer *verContainer)
+void UpdateNotifyWidget::initialize(VersionContainer *verContainer,QPoint startPos)
 {
-    this->mainWindow = mainWindow;
     this->versionContainer = verContainer;
     currentLoadingCount = 0;
     hide();
 
-    auto pos = mainWindow->pos();
+    QPoint pos = startPos;
     pos.setY(pos.y() + 40);
     move(pos);
 }
@@ -101,17 +100,17 @@ QLabel* UpdateNotifyWidget::createLabel(QString text)
 }
 void UpdateNotifyWidget::on_loadToServerButton_clicked()
 {
-    mainWindow->loadToServer();
+    emit sigLoadToServerBehaviour();
 }
 
 void UpdateNotifyWidget::on_undoChangesButton_clicked()
 {
-    mainWindow->undoCurrentChanges();
+    emit sigUndoCurrentChanges();
 }
 
 void UpdateNotifyWidget::on_startWithCurrentChangesButton_clicked()
 {
-    mainWindow->startUnityClient();
+    emit sigStartUnityClient();
 }
 
 void UpdateNotifyWidget::setUpdateState()
@@ -136,11 +135,6 @@ UpdateNotifyWidget::~UpdateNotifyWidget()
 
 void UpdateNotifyWidget::on_closeButton_clicked()
 {
-    mainWindow->showMainFrame(true);
+    emit sigShowMainFrame(true);
     close();
 }
-
-void UpdateNotifyWidget::on_updateActionListLabel_linkActivated(const QString &link)
-{
-
-}

Widgets/updatenotifywidget.h

@@ -1,22 +1,17 @@
 #ifndef UPDATENOTIFYWIDGET_H
 #define UPDATENOTIFYWIDGET_H
 
-#include "mainwindow.h"
-
 #include <QDialog>
 #include <QWidget>
 #include <QLabel>
 
 #include <Data/FileData.h>
+#include <Core/versioncontainer.h>
 
 namespace Ui {
 class UpdateNotifyWidget;
 }
-
-class MainWindow;
-class UpdateController;
 class InstructorButtonGroupWidget;
-class VersionContainer;
 
 class UpdateNotifyWidget : public QWidget
 {
@@ -24,7 +19,7 @@ class UpdateNotifyWidget : public QWidget
 
 public:
     explicit UpdateNotifyWidget(QWidget *parent = nullptr);
-    void initialize(MainWindow *mainWindow,VersionContainer *versionContainer);
+    void initialize(VersionContainer *versionContainer,QPoint startPos);
     void addToList(FileData fileData);
     void showWithFill();
 
@@ -32,17 +27,20 @@ public:
 
     void showTryChangeBase();
 
+signals:
+    void sigLoadToServerBehaviour();
+    void sigUndoCurrentChanges();
+    void sigStartUnityClient();
+    void sigShowMainFrame(bool flag);
+
 private slots:
     void on_closeButton_clicked();
     void on_loadToServerButton_clicked();
     void on_undoChangesButton_clicked();
     void on_startWithCurrentChangesButton_clicked();
 
-    void on_updateActionListLabel_linkActivated(const QString &link);
-
 private:
     Ui::UpdateNotifyWidget *ui;
-    MainWindow *mainWindow;
     VersionContainer *versionContainer;
     int currentLoadingCount;
     QLabel* createLabel(QString text);

Widgets/versionselectwidget.cpp

@@ -1,6 +1,6 @@
 #include "versionselectwidget.h"
 #include "ui_versionselectwidget.h"
-#include "ui_versionselectwidget.h"
+#include "Widgets/newversionwidget.h"
 
 #include <QMessageBox>
 
@@ -49,12 +49,13 @@ void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item
     }
 }
 
-
 void VersionSelectWidget::on_createDuplicateButton_clicked()
 {
     NewVersionWidget *newVersionWidget = new NewVersionWidget;
-    newVersionWidget->initialize(this,selectedVersion->getViewName());
+    newVersionWidget->initialize(selectedVersion->getViewName());
     newVersionWidget->show();
+
+    connect(newVersionWidget,&NewVersionWidget::sigSendCopy,this,&VersionSelectWidget::sendCopyEmit);
 }
 
 void VersionSelectWidget::sendCopyEmit(QString newName)

Widgets/versionselectwidget.h

@@ -4,10 +4,10 @@
 #include <QListWidget>
 #include <QWidget>
 
+#include <Core/notifycontroller.h>
 #include <Core/sendsystem.h>
+#include <Core/versioncontainer.h>
 #include <Data/streamingversiondata.h>
-#include <Widgets/newversionwidget.h>
-
 namespace Ui {
 class VersionSelectWidget;
 }
@@ -21,7 +21,6 @@ public:
 
     void initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController);
     void fillView(QList<StreamingVersionData*> *serverData);
-    void sendCopyEmit(QString newName);
 
     ~VersionSelectWidget();
 private slots:
@@ -29,6 +28,7 @@ private slots:
     void on_createDuplicateButton_clicked();
     void on_DeleteVersionButton_clicked();
     void on_switchServerVersionButton_clicked();
+    void sendCopyEmit(QString newName);
 
 signals:
     void sigSendDeleteVersion(StreamingVersionData *streaming);