mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Корректировка поведения GUI
This commit is contained in:
@@ -35,7 +35,7 @@ public:
|
|||||||
{
|
{
|
||||||
this->adminMode = adminMode;
|
this->adminMode = adminMode;
|
||||||
}
|
}
|
||||||
void clearTree()
|
void deactivate()
|
||||||
{
|
{
|
||||||
treeWidget->clear();
|
treeWidget->clear();
|
||||||
lastCurrentID = 0;
|
lastCurrentID = 0;
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
isConnected = false;
|
isConnected = false;
|
||||||
|
emit signal_ConnectedToServer(false);
|
||||||
emit sigServerDisconnect();
|
emit sigServerDisconnect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -383,7 +383,8 @@ void ConnectorToServer::initialize()
|
|||||||
|
|
||||||
emit sigInitializeClient(recognizeSystem,sendSystem,connectionThread);
|
emit sigInitializeClient(recognizeSystem,sendSystem,connectionThread);
|
||||||
|
|
||||||
emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
|
SetConnectToServer();
|
||||||
|
//emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
|
||||||
|
|
||||||
// QByteArray answer = dataParser->xmlAnswer_notify()
|
// QByteArray answer = dataParser->xmlAnswer_notify()
|
||||||
// sendSystem->sendXMLAnswer()
|
// sendSystem->sendXMLAnswer()
|
||||||
|
|||||||
@@ -28,6 +28,12 @@ void ViewerInstructors::setAuthComplited(bool authComplited)
|
|||||||
updateButtons();
|
updateButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ViewerInstructors::deactivate()
|
||||||
|
{
|
||||||
|
CommonView::deactivate();
|
||||||
|
updateButtons();
|
||||||
|
}
|
||||||
|
|
||||||
void ViewerInstructors::changeEvent(QEvent *event)
|
void ViewerInstructors::changeEvent(QEvent *event)
|
||||||
{
|
{
|
||||||
// В случае получения события изменения языка приложения
|
// В случае получения события изменения языка приложения
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ public:
|
|||||||
public:
|
public:
|
||||||
void setAuthComplited(bool authComplited);
|
void setAuthComplited(bool authComplited);
|
||||||
|
|
||||||
|
void deactivate();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void changeEvent(QEvent * event) override;
|
void changeEvent(QEvent * event) override;
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
|
|||||||
messangerWidget->setMinimumSize(400, 500);
|
messangerWidget->setMinimumSize(400, 500);
|
||||||
messangerWidget->setMaximumWidth(500);
|
messangerWidget->setMaximumWidth(500);
|
||||||
|
|
||||||
//ui->btnAuthorizationInstructor->setEnabled(false);
|
ui->btnAuthorizationInstructor->setEnabled(false);
|
||||||
|
|
||||||
ui->btnAssignTask->setEnabled(false);
|
ui->btnAssignTask->setEnabled(false);
|
||||||
|
|
||||||
@@ -263,13 +263,19 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
|
|||||||
ui->btnSetVersion->hide();
|
ui->btnSetVersion->hide();
|
||||||
ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
|
ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
|
||||||
|
|
||||||
viewerTrainees->clearTree();
|
viewerInstructors->setAuthComplited(false);
|
||||||
viewerInstructors->clearTree();
|
viewerTrainees->setAuthComplited(false);
|
||||||
|
|
||||||
ammTasksWidget->clearTree();
|
viewerTrainees->deactivate();
|
||||||
fimTasksWidget->clearTree();
|
viewerInstructors->deactivate();
|
||||||
|
|
||||||
|
ammTasksWidget->deactivate();
|
||||||
|
fimTasksWidget->deactivate();
|
||||||
|
ui->btnAssignTask->setEnabled(false);
|
||||||
|
|
||||||
messangerWidget->clear();
|
messangerWidget->clear();
|
||||||
|
|
||||||
|
QMessageBox::warning(this, tr("Warning!"), tr("The server is disabled"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -366,11 +372,12 @@ void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
|
|||||||
disconnect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI);
|
disconnect(connectorToServer,&ConnectorToServer::signal_UpdateDB,viewerTrainees,&ViewerTrainees::slot_NeedUpdateUI);
|
||||||
disconnect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger);
|
disconnect(connectorToServer,&ConnectorToServer::signal_InitMessanger,messangerWidget,&MessangerWidget::slot_InitMessanger);
|
||||||
|
|
||||||
viewerTrainees->clearTree();
|
viewerTrainees->deactivate();
|
||||||
viewerInstructors->clearTree();
|
viewerInstructors->deactivate();
|
||||||
|
|
||||||
ammTasksWidget->clearTree();
|
ammTasksWidget->deactivate();
|
||||||
fimTasksWidget->clearTree();
|
fimTasksWidget->deactivate();
|
||||||
|
ui->btnAssignTask->setEnabled(false);
|
||||||
|
|
||||||
messangerWidget->clear();
|
messangerWidget->clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,8 +29,10 @@ public:
|
|||||||
~AMMtasksWidget();
|
~AMMtasksWidget();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void clearTree()
|
void deactivate()
|
||||||
{
|
{
|
||||||
|
accessAssignTask = false;
|
||||||
|
//taskTreePreparation->stopParser();
|
||||||
treeWidget->clear();
|
treeWidget->clear();
|
||||||
loginTraineeSelected = "";
|
loginTraineeSelected = "";
|
||||||
idTraineeSelected = 0;
|
idTraineeSelected = 0;
|
||||||
|
|||||||
@@ -33,8 +33,9 @@ public:
|
|||||||
~FIMtasksWidget();
|
~FIMtasksWidget();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void clearTree()
|
void deactivate()
|
||||||
{
|
{
|
||||||
|
accessAssignTask = false;
|
||||||
treeWidget->clear();
|
treeWidget->clear();
|
||||||
loginTraineeSelected = "";
|
loginTraineeSelected = "";
|
||||||
idTraineeSelected = 0;
|
idTraineeSelected = 0;
|
||||||
|
|||||||
@@ -41,6 +41,14 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
|
|||||||
updateButtons();
|
updateButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ViewerTrainees::deactivate()
|
||||||
|
{
|
||||||
|
CommonView::deactivate();
|
||||||
|
ammTasksWidget->deactivate();
|
||||||
|
fimTasksWidget->deactivate();
|
||||||
|
updateButtons();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column)
|
void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,12 +22,7 @@ public:
|
|||||||
public:
|
public:
|
||||||
void setAuthComplited(bool authComplited);
|
void setAuthComplited(bool authComplited);
|
||||||
|
|
||||||
void clearTree()
|
void deactivate();
|
||||||
{
|
|
||||||
CommonView::clearTree();
|
|
||||||
ammTasksWidget->clearTree();
|
|
||||||
fimTasksWidget->clearTree();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void changeEvent(QEvent * event) override;
|
void changeEvent(QEvent * event) override;
|
||||||
|
|||||||
Reference in New Issue
Block a user