diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index 801dbcb..f117109 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -52,7 +52,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerController, &MessangerController::slot_traineeSelected);
- connect(messangerController, &MessangerController::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged);
connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, this, &InstructorsAndTraineesWidget::slot_traineeSelected);
@@ -82,7 +81,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->btnAuthorizationInstructor->setEnabled(false);
ui->btnEditorTrainees->setEnabled(false);
ui->btnEditorInstructors->setEnabled(false);
- ui->btnSetVersion->hide();
}
InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
@@ -404,11 +402,6 @@ void InstructorsAndTraineesWidget::setLanguageInterfase()
emit signal_LanguageChanged(language);
}
-void InstructorsAndTraineesWidget::on_btnSetVersion_clicked()
-{
- connectorToServer->showVersionSelect();
-}
-
void InstructorsAndTraineesWidget::on_btnSettings_clicked()
{
DialogSettings dlg(connectorToServer, (loginInstructorLoggedInLocal != ""), this);
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h
index 1b5c771..83bae2c 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.h
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h
@@ -61,7 +61,6 @@ Q_SIGNALS:
private Q_SLOTS:
void on_btnConnectionToServer_clicked();
void on_btnAuthorizationInstructor_clicked();
- void on_btnSetVersion_clicked();
void on_btnSettings_clicked();
void on_btnEditorTrainees_clicked();
void on_btnEditorInstructors_clicked();
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
index 51f82a8..287b6df 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
@@ -190,19 +190,6 @@
- -
-
-
-
- 130
- 58
-
-
-
- ChangeVersion
-
-
-
diff --git a/InstructorsAndTrainees/messanger/messangercontroller.cpp b/InstructorsAndTrainees/messanger/messangercontroller.cpp
index c18f053..07f639b 100644
--- a/InstructorsAndTrainees/messanger/messangercontroller.cpp
+++ b/InstructorsAndTrainees/messanger/messangercontroller.cpp
@@ -22,7 +22,6 @@ MessangerWidget *MessangerController::newWidget(QWidget *parent, Trainee* traine
boxLayout->addWidget(msgWdgt);
connect(msgWdgt, &MessangerWidget::signal_sendMessage, this, &MessangerController::slot_sendMessage);
- connect(msgWdgt, &MessangerWidget::signal_tabMessengerChanged, this, &MessangerController::slot_tabMessengerChanged);
msgWdgt->initialize(GUIclientId);
@@ -110,11 +109,6 @@ void MessangerController::slot_sendMessage(ClientMessage clientMessage)
}
}
-void MessangerController::slot_tabMessengerChanged(QString login)
-{
- emit signal_tabMessengerChanged(login);
-}
-
void MessangerController::slot_receiveMessage(ClientMessage clientMessage)
{
int id_user = clientMessage.fromId.toInt();
diff --git a/InstructorsAndTrainees/messanger/messangercontroller.h b/InstructorsAndTrainees/messanger/messangercontroller.h
index 2dd6104..66d2ab5 100644
--- a/InstructorsAndTrainees/messanger/messangercontroller.h
+++ b/InstructorsAndTrainees/messanger/messangercontroller.h
@@ -26,12 +26,8 @@ public:
void setGUIclientId(QString id);
void clearAllWidgets();
-signals:
- void signal_tabMessengerChanged(QString login);
-
public slots:
void slot_sendMessage(ClientMessage clientMessage);
- void slot_tabMessengerChanged(QString login);
void slot_receiveMessage(ClientMessage clientMessage);
void slot_initMessanger(QList listTrainees);
diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/InstructorsAndTrainees/messanger/messangerwidget.cpp
index 034b78e..131e866 100644
--- a/InstructorsAndTrainees/messanger/messangerwidget.cpp
+++ b/InstructorsAndTrainees/messanger/messangerwidget.cpp
@@ -65,7 +65,6 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee)
{//Самая первая вкладка, делаем ее активной
selectedUserLogin = trainee.getLogin();
selectedUserId = QString::number(trainee.getID());
- emit signal_tabMessengerChanged(selectedUserLogin);
ui->btnSend->setEnabled(true);
ui->editMsg->setEnabled(true);
}
@@ -207,22 +206,6 @@ void MessangerWidget::on_btnSend_clicked()
}*/
}
-void MessangerWidget::on_tabWidget_currentChanged(int index)
-{
- //Ищем нужный диалог
- foreach(TabDialogMessenger* tabDialog, listTabDialogMessenger)
- {
-
- if(getIndexTab(tabDialog->getUserLogin()) == index)
- {
- selectedUserLogin = tabDialog->getUserLogin();
- selectedUserId = tabDialog->getUserId();
- emit signal_tabMessengerChanged(selectedUserLogin);
- return;
- }
- }
-}
-
void MessangerWidget::traineeSelected(QString login)
{
//Ищем нужный диалог
diff --git a/InstructorsAndTrainees/messanger/messangerwidget.h b/InstructorsAndTrainees/messanger/messangerwidget.h
index 5827207..f1c5d05 100644
--- a/InstructorsAndTrainees/messanger/messangerwidget.h
+++ b/InstructorsAndTrainees/messanger/messangerwidget.h
@@ -50,18 +50,17 @@ public slots:
private slots:
void on_btnSend_clicked();
- void on_tabWidget_currentChanged(int index);
signals:
//сигнал о готовности нового сообщения на отправку клиенту
void signal_sendMessage(ClientMessage clientMessage);
- //сигнал об изменении вкладки диалога с клиентом (TabDialogMessenger)
- void signal_tabMessengerChanged(QString login);
public:
void showReceivedMessage(ClientMessage clientMessage);
- void initMessangerWidget(QList listTrainees);
- void traineeSelected(QString login);
+
+
+ void initMessangerWidget(QList listTrainees); //?
+ void traineeSelected(QString login); //?
void getTabDialogMessengerByID(QString id_user);
@@ -71,13 +70,13 @@ private:
private:
Ui::MessangerWidget *ui;
QList listTabDialogMessenger;
- QList listTrainees;
+ QList listTrainees; //?
QString selectedUserLogin; //Логин клиента текущего диалога
QString selectedUserId; //id клиента текущего диалога
QString currClientId; //id этого клиента
QTranslator qtLanguageTranslator;
- bool flOneTrainee;
+ bool flOneTrainee; //?
};
#endif // MESSANGERWIDGET_H
diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
index c29eb3d..70c6115 100644
--- a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
+++ b/InstructorsAndTrainees/trainees/personalcardtrainee.cpp
@@ -43,10 +43,6 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
/* Messanger*/
Trainee trainee = connectorToServer->getTrainee(id_trainee);
messangerWidget = messangerController->newWidget(this, &trainee, ui->verticalLayout_Messenger);
-
- //ui->verticalLayout_Messenger->addWidget(messangerWidget);
-
- //messangerWidget->setOneTrainee(trainee);
}
PersonalCardTrainee::~PersonalCardTrainee()
@@ -54,7 +50,6 @@ PersonalCardTrainee::~PersonalCardTrainee()
delete ammTasksWidget_personal;
delete fimTasksWidget_personal;
- //delete messangerWidget;
messangerController->deleteWidget(messangerWidget);
delete ui;
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp
index b6a4eac..a20ab4a 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.cpp
+++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp
@@ -80,57 +80,6 @@ void ViewerTrainees::deactivate()
updateButtons();
}
-/*
-void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column)
-{
- if(item->childCount() == 0)
- {//Выбран обучаемый
- QString login = item->text(ColumnsTreeTrainees::clmn_Login);
- Q_EMIT signal_traineeSelected(login);
- }
-}*/
-
-void ViewerTrainees::slot_tabMessengerChanged(QString login)
-{
- if(login == "")
- return;
-
- for (int i = 0; i < treeWidget->topLevelItemCount(); i++)
- {//Проход по группам
- int countChild = treeWidget->topLevelItem(i)->childCount();
-
- for (int j = 0; j < countChild; j++)
- {//Проход по обучаемым
- QString loginChild = treeWidget->topLevelItem(i)->child(j)->text(ColumnsTreeTrainees::clmn_Login);
- if(loginChild == login)
- {
- treeWidget->setCurrentItem(treeWidget->topLevelItem(i)->child(j));
- typeObject = TypeObject::objTrainee;
- int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
-
- if(newCurrentID == lastCurrentID)
- return;
-
- lastCurrentID = newCurrentID;
- Q_EMIT signal_traineeSelected(login);
- return;
- }
- }
- }
-}
-
-/*
-void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM()
-{
- fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
-}
-
-void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM()
-{
- ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
-}
-*/
-
void ViewerTrainees::changeEvent(QEvent *event)
{
// В случае получения события изменения языка приложения
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h
index 52db2f0..7561879 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.h
+++ b/InstructorsAndTrainees/trainees/viewertrainees.h
@@ -39,13 +39,6 @@ private Q_SLOTS:
void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_itemDoubleClicked(QTreeWidgetItem *item, int column);
-public Q_SLOTS:
- //слот обработки сигнала об изменении вкладки диалога в мессенджере
- void slot_tabMessengerChanged(QString login);
-
- //void slot_waitAnimationWidgetShowWithPlayFIM();
- //void slot_waitAnimationWidgetShowWithPlayAMM();
-
Q_SIGNALS:
//сигнал о выборе обучаемого
void signal_traineeSelected(QString login);