Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact 2

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-20 17:11:01 +03:00
parent e7e719bc84
commit fe75f2c6ca
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LibInstructorsAndTrainees/instructors/dialogredactorinstructors.cpp
View File

@@ -17,7 +17,8 @@ DialogRedactorInstructors::DialogRedactorInstructors(ConnectorToServer* connecto
QHBoxLayout *layout = new QHBoxLayout(this); QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(editorInstructors); layout->addWidget(editorInstructors);
this->setWindowTitle(tr("Editor of instructors")); this->setWindowTitle(tr("Editor of instructors"));
this->setMinimumSize(1400, 700); this->setMinimumSize(1400, 700);
this->setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
//this->setWindowState(Qt::WindowMaximized); //this->setWindowState(Qt::WindowMaximized);
this->setModal(true); this->setModal(true);
} }

1
LibInstructorsAndTrainees/trainees/dialogredactortrainees.cpp
View File

@@ -18,6 +18,7 @@ DialogRedactorTrainees::DialogRedactorTrainees(ConnectorToServer* connectorToSer
layout->addWidget(editorTraineesGroups); layout->addWidget(editorTraineesGroups);
this->setWindowTitle(tr("Editor of trainees")); this->setWindowTitle(tr("Editor of trainees"));
this->setMinimumSize(1400, 700); this->setMinimumSize(1400, 700);
this->setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
//this->setWindowState(Qt::WindowMaximized); //this->setWindowState(Qt::WindowMaximized);
this->setModal(true); this->setModal(true);
} }

2
LibInstructorsAndTrainees/trainees/editortrainees.cpp
View File

@@ -11,7 +11,7 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminM
dlgEditTrainee(nullptr), dlgEditTrainee(nullptr),
dlgEditGroup(nullptr) dlgEditGroup(nullptr)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorTrainees::on_treeWidgetCurrentItemChanged); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorTrainees::on_treeWidgetCurrentItemChanged);

18
LibServer/settings/dialogsettingstray.cpp
View File

@@ -23,7 +23,8 @@ DialogSettingsTray::DialogSettingsTray(ProviderDBLMS* providerDBLMS, QWidget *pa
#ifndef PROJECT_TYPE_DEBUG #ifndef PROJECT_TYPE_DEBUG
ui->checkLocalhost->setEnabled(false); ui->checkLocalhost->setEnabled(false);
#endif ui->btnUpdateDocs->setVisible(false);
#endif
/* Создаем строку для регулярного выражения */ /* Создаем строку для регулярного выражения */
QString ipRange = "(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])"; QString ipRange = "(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])";
@@ -333,6 +334,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
case QDialog::Accepted: case QDialog::Accepted:
ui->btnSave->setEnabled(true); ui->btnSave->setEnabled(true);
flSettingsServerChanged = true; flSettingsServerChanged = true;
on_btnSave_clicked();
break; break;
case QDialog::Rejected: case QDialog::Rejected:
break; break;
@@ -345,17 +347,17 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
if(settings->HostName == "localhost") if(settings->HostName == "localhost")
SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" + SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
tr("Possible reasons:") + "\n" + tr("Possible reasons:") + "\n" +
tr("superuser PostgreSQL login or password is incorrect;") + "\n" + "- " + tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("port is incorrect;") + "\n" + "- " + tr("port is incorrect;") + "\n" +
tr("PostgreSQL is not installed.") "- " + tr("PostgreSQL is not installed.")
); );
else else
SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" + SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
tr("Possible reasons:") + "\n" + tr("Possible reasons:") + "\n" +
tr("superuser PostgreSQL login or password is incorrect;") + "\n" + "- " + tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
tr("port is incorrect;") + "\n" + "- " + tr("port is incorrect;") + "\n" +
tr("file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ";" + "\n" + "- " + tr("file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ";" + "\n" +
tr("PostgreSQL is not installed.") "- " + tr("PostgreSQL is not installed.")
); );
return; return;
} }