mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
незначительные корректировки
This commit is contained in:
@@ -17,11 +17,11 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
|
|
||||||
m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this);
|
m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this);
|
||||||
|
|
||||||
connect(this, &MainWindow::signal_LanguageChanged, m_instructorsAndTraineesWidget, &InstructorsAndTraineesWidget::slot_LanguageChanged);
|
|
||||||
|
|
||||||
ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget);
|
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->showNormal();
|
||||||
this->showMaximized();
|
this->showMaximized();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -211,8 +211,6 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
|
|||||||
{
|
{
|
||||||
if(state)
|
if(state)
|
||||||
{//Сервер подключен
|
{//Сервер подключен
|
||||||
|
|
||||||
//ui->btnConnectionToDB->setText(tr("Disconnection DB"));
|
|
||||||
ui->btnConnectionToServer->setEnabled(false);
|
ui->btnConnectionToServer->setEnabled(false);
|
||||||
ui->btnAuthorizationInstructor->setEnabled(true);
|
ui->btnAuthorizationInstructor->setEnabled(true);
|
||||||
|
|
||||||
@@ -220,8 +218,6 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//Сервер отключен
|
{//Сервер отключен
|
||||||
|
|
||||||
//ui->btnConnectionToDB->setText(tr("Connection DB"));
|
|
||||||
ui->btnConnectionToServer->setEnabled(true);
|
ui->btnConnectionToServer->setEnabled(true);
|
||||||
ui->btnAuthorizationInstructor->setEnabled(false);
|
ui->btnAuthorizationInstructor->setEnabled(false);
|
||||||
|
|
||||||
@@ -275,51 +271,6 @@ bool InstructorsAndTraineesWidget::authorizationIsCompleted()
|
|||||||
void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
|
void InstructorsAndTraineesWidget::on_btnConnectionToServer_clicked()
|
||||||
{
|
{
|
||||||
connectorToServer->SetConnectToServer();
|
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()
|
void InstructorsAndTraineesWidget::on_btnAuthorizationInstructor_clicked()
|
||||||
@@ -367,11 +318,5 @@ void InstructorsAndTraineesWidget::updateLabelLoggedInInstructor(QString login,
|
|||||||
|
|
||||||
void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked()
|
void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked()
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
viewerTrainees->updateMyStyleSheet();
|
|
||||||
viewerInstructors->updateMyStyleSheet();
|
|
||||||
messangerWidget->updateMyStyleSheet();
|
|
||||||
*/
|
|
||||||
|
|
||||||
updateMyStyleSheet();
|
updateMyStyleSheet();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,16 +10,18 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
//Задаём два пункта с текстом локалей в комбобоксе
|
||||||
|
ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
|
||||||
|
|
||||||
m_serverLMSWidget = new ServerLMSWidget(this);
|
m_serverLMSWidget = new ServerLMSWidget(this);
|
||||||
|
|
||||||
ui->verticalLayout_1->addWidget(m_serverLMSWidget);
|
ui->verticalLayout_1->addWidget(m_serverLMSWidget);
|
||||||
|
|
||||||
connect(this, &MainWindow::signal_LanguageChanged, m_serverLMSWidget, &ServerLMSWidget::slot_LanguageChanged);
|
connect(this, &MainWindow::signal_LanguageChanged, m_serverLMSWidget, &ServerLMSWidget::slot_LanguageChanged);
|
||||||
|
|
||||||
//Задаём два пункта с текстом локалей в комбобоксе
|
this->move(0, 0);
|
||||||
ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
|
this->showNormal();
|
||||||
|
//this->showMaximized();
|
||||||
this->showMaximized();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
|
|||||||
Reference in New Issue
Block a user