diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e5b419..33b160b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,4 +41,3 @@ add_dependencies(GUIdataBaseLMS InstructorsAndTrainees)
add_dependencies(ServerLMS DataBaseLMS)
add_dependencies(ServerLMS InstructorsAndTrainees)
add_dependencies(TrayServerLMS ServerLMS)
-add_dependencies(TrayServerLMS InstructorsAndTrainees)
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index 7234dfe..de504e8 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -387,7 +387,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
if(cntTryConnectToServer < 10)
{
cntTryConnectToServer++;
- QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
+ QTimer::singleShot(1000, this, SLOT(slot_TryConnectToServer()));
}
else
{
@@ -460,7 +460,7 @@ void InstructorsAndTraineesWidget::slot_AnswerDocsChanged()
viewerTrainees->getAmmTasksWidgetCommon()->setDocsActualed(false);
}
-void InstructorsAndTraineesWidget::slot_ConnectToServer()
+void InstructorsAndTraineesWidget::slot_TryConnectToServer()
{
updateLabelServer();
connectorToServer->SetConnectToServer();
@@ -540,7 +540,7 @@ void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
updateLabelServer();
- QTimer::singleShot(1000, this, SLOT(slot_ConnectToServer()));
+ QTimer::singleShot(1000, this, SLOT(slot_TryConnectToServer()));
}
void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h
index 747ffd6..36c4046 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.h
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h
@@ -65,7 +65,7 @@ public Q_SLOTS:
void slot_AnswerDocsChanged();
- void slot_ConnectToServer();
+ void slot_TryConnectToServer();
Q_SIGNALS:
//сигнал смены языка
@@ -79,19 +79,15 @@ private Q_SLOTS:
void on_btnSettings_clicked();
void on_btnEditorTrainees_clicked();
void on_btnEditorInstructors_clicked();
-
void on_btnPersonalCard_clicked();
-
void on_btnTasksCommon_clicked();
private:
- //Авторизация инструктора локальная (на ГУИ)
bool authorizationInstructorDialog(QWidget* parent = nullptr);
bool deAuthorizationInstructor(QString login);
bool authorizationIsCompleted();
void updateLabelLoggedInInstructor(QString login, QString name);
void updateLabelServer();
-
void setLanguageInterfase();
private:
@@ -113,6 +109,8 @@ private:
QString nameInstructorLoggedInLocal;
QString idInstructorLoggedInLocal;
+ Instructor instructorLoggedInLocal;
+
QTranslator qtLanguageTranslator;
QString language;
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
index f6b7147..ed5730c 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
@@ -6,8 +6,8 @@
0
0
- 1314
- 901
+ 1300
+ 900