From 24fb521e03e2d1c66cf979e3386bd64a70362f86 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.dinamika-avia.ru>
Date: Thu, 16 Jan 2025 16:46:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B7=D0=BD=D0=B0=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GUIdataBaseLMS/mainwindow.cpp                 |  6 +-
 .../instructorsandtraineeswidget.cpp          | 55 -------------------
 TestServerLMS/mainwindow.cpp                  | 10 ++--
 3 files changed, 9 insertions(+), 62 deletions(-)

diff --git a/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp
index 4413928..5ba4ac0 100644
--- a/GUIdataBaseLMS/mainwindow.cpp
+++ b/GUIdataBaseLMS/mainwindow.cpp
@@ -17,11 +17,11 @@ MainWindow::MainWindow(QWidget *parent)
 
     m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this);
 
-    connect(this, &MainWindow::signal_LanguageChanged, m_instructorsAndTraineesWidget, &InstructorsAndTraineesWidget::slot_LanguageChanged);
-
     ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget);
 
-    this->move(0, 0);
+    connect(this, &MainWindow::signal_LanguageChanged, m_instructorsAndTraineesWidget, &InstructorsAndTraineesWidget::slot_LanguageChanged);
+
+    //this->move(0, 0);
     //this->showNormal();
     this->showMaximized();
 }
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index dc84728..8f2feec 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -211,8 +211,6 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
 {
     if(state)
     {//Сервер подключен
-
-        //ui->btnConnectionToDB->setText(tr("Disconnection DB"));
         ui->btnConnectionToServer->setEnabled(false);
         ui->btnAuthorizationInstructor->setEnabled(true);
 
@@ -220,8 +218,6 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
     }
     else
     {//Сервер отключен
-
-        //ui->btnConnectionToDB->setText(tr("Connection DB"));
         ui->btnConnectionToServer->setEnabled(true);
         ui->btnAuthorizationInstructor->setEnabled(false);
 
@@ -275,51 +271,6 @@ bool InstructorsAndTraineesWidget::authorizationIsCompleted()
 void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
 {
     connectorToServer->SetConnectToServer();
-
-    if(true)
-    {//Подключение к БД
-/*
-        connectorToServer->SetConnectToServer();
-
-
-        if(! dbLMS->DBisConnected())
-        {
-            if(dbLMS->ConnectionToDB())
-            {
-                ui->btnConnectionToDB->setText(tr("Disconnection DB"));
-                ui->btnAuthorizationInstructor->setEnabled(true);
-
-                ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGreen.png")));
-
-                Q_EMIT signal_NeedUpdateUI(true, true);
-
-                Q_EMIT signal_BlockAutorization(false);
-
-                Q_EMIT signal_InitMessanger(dbLMS->getListTrainees());
-            }
-        }*/
-    }
-    else
-    {//Отключение от БД
-        /*
-        bool stateIsCheckedAuthorization = ui->btnAuthorizationInstructor->isChecked();
-        if(stateIsCheckedAuthorization)
-            ui->btnAuthorizationInstructor->click();
-
-        if(dbLMS->DBisConnected())
-        {
-            Q_EMIT signal_BlockAutorization(true);
-
-            dbLMS->DisConnectionFromDB();
-
-            ui->btnConnectionToDB->setText(tr("Connection DB"));
-            ui->btnAuthorizationInstructor->setEnabled(false);
-
-            ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/icons/circleGray.png")));
-
-            Q_EMIT signal_NeedUpdateUI(true, true);
-        }*/
-    }    
 }
 
 void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
@@ -367,11 +318,5 @@ void InstructorsAndTraineesWidget::updateLabelLoggedInInstructor(QString login,
 
 void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked()
 {
-    /*
-    viewerTrainees->updateMyStyleSheet();
-    viewerInstructors->updateMyStyleSheet();
-    messangerWidget->updateMyStyleSheet();
-    */
-
     updateMyStyleSheet();
 }
diff --git a/TestServerLMS/mainwindow.cpp b/TestServerLMS/mainwindow.cpp
index c991e89..5f32e2d 100644
--- a/TestServerLMS/mainwindow.cpp
+++ b/TestServerLMS/mainwindow.cpp
@@ -10,16 +10,18 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    //Задаём два пункта с текстом локалей в комбобоксе
+    ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
+
     m_serverLMSWidget = new ServerLMSWidget(this);
 
     ui->verticalLayout_1->addWidget(m_serverLMSWidget);
 
     connect(this, &MainWindow::signal_LanguageChanged, m_serverLMSWidget, &ServerLMSWidget::slot_LanguageChanged);
 
-    //Задаём два пункта с текстом локалей в комбобоксе
-    ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
-
-    this->showMaximized();
+    this->move(0, 0);
+    this->showNormal();
+    //this->showMaximized();
 }
 
 MainWindow::~MainWindow()