mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
Убрал кнопки Справка из диалогов ГУИ
This commit is contained in:
@@ -311,6 +311,7 @@ bool EditorInstructors::verifyInstructor(Instructor instructor)
|
|||||||
bool EditorInstructors::editInstructor(Instructor instructor, Instructor* instructor_edit)
|
bool EditorInstructors::editInstructor(Instructor instructor, Instructor* instructor_edit)
|
||||||
{
|
{
|
||||||
DialogEditInstructor dlg(this);
|
DialogEditInstructor dlg(this);
|
||||||
|
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
dlg.setInstructor(instructor);
|
dlg.setInstructor(instructor);
|
||||||
|
|
||||||
|
|||||||
@@ -16,22 +16,22 @@ void InstructorsView::resizeEvent(QResizeEvent *event)
|
|||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 100);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 100);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 120);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 140);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 80);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 100);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 120);
|
||||||
|
|
||||||
int widthInstructor;
|
int widthInstructor;
|
||||||
|
|
||||||
if(typeView == TypeView::onlyView)
|
if(typeView == TypeView::onlyView)
|
||||||
{//onlyView
|
{//onlyView
|
||||||
widthInstructor = width - (230 + 10);
|
widthInstructor = width - (290 + 10);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//control
|
{//control
|
||||||
if(adminMode)
|
if(adminMode)
|
||||||
widthInstructor = width - (550 + 10);
|
widthInstructor = width - (610 + 10);
|
||||||
else
|
else
|
||||||
widthInstructor = width - (420 + 10);
|
widthInstructor = width - (480 + 10);
|
||||||
}
|
}
|
||||||
if(widthInstructor < 250)
|
if(widthInstructor < 250)
|
||||||
widthInstructor = 250;
|
widthInstructor = 250;
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ void ViewerInstructors::on_btnEditorInstructors_clicked()
|
|||||||
layout->addWidget(&editorInstructors);
|
layout->addWidget(&editorInstructors);
|
||||||
dialog->setWindowTitle(tr("Editor of instructors"));
|
dialog->setWindowTitle(tr("Editor of instructors"));
|
||||||
dialog->setMinimumSize(1600, 800);
|
dialog->setMinimumSize(1600, 800);
|
||||||
dialog->setStyleSheet(this->styleSheet());
|
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
|
|
||||||
loadInstructorsFromDB();
|
loadInstructorsFromDB();
|
||||||
|
|||||||
@@ -288,6 +288,7 @@ bool InstructorsAndTraineesWidget::authorizationInstructorDialog(QWidget* parent
|
|||||||
{
|
{
|
||||||
DialogAuthorizationInstructor dlg(parent);
|
DialogAuthorizationInstructor dlg(parent);
|
||||||
dlg.setWindowTitle(tr("Instructor authorization"));
|
dlg.setWindowTitle(tr("Instructor authorization"));
|
||||||
|
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
@@ -424,6 +425,7 @@ void InstructorsAndTraineesWidget::setLanguageInterfase()
|
|||||||
void InstructorsAndTraineesWidget::on_btnSettings_clicked()
|
void InstructorsAndTraineesWidget::on_btnSettings_clicked()
|
||||||
{
|
{
|
||||||
DialogSettings dlg(connectorToServer, (loginInstructorLoggedInLocal != ""), this);
|
DialogSettings dlg(connectorToServer, (loginInstructorLoggedInLocal != ""), this);
|
||||||
|
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
connect(&dlg, &DialogSettings::signal_LanguageChanged, this, &InstructorsAndTraineesWidget::slot_LanguageChanged);
|
connect(&dlg, &DialogSettings::signal_LanguageChanged, this, &InstructorsAndTraineesWidget::slot_LanguageChanged);
|
||||||
connect(&dlg, &DialogSettings::signal_UpdateStyleSheet, this, &InstructorsAndTraineesWidget::slot_UpdateStyleSheet);
|
connect(&dlg, &DialogSettings::signal_UpdateStyleSheet, this, &InstructorsAndTraineesWidget::slot_UpdateStyleSheet);
|
||||||
|
|||||||
@@ -314,7 +314,7 @@ void AMMtasksWidget::on_btnCheck_clicked()
|
|||||||
if(!task.getID())
|
if(!task.getID())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DialogCheckTask dlg(connectorToServer, "amm", this);
|
DialogCheckTask dlg(connectorToServer, "amm", this);
|
||||||
|
|
||||||
dlg.setTask(&task);
|
dlg.setTask(&task);
|
||||||
|
|
||||||
@@ -323,7 +323,8 @@ void AMMtasksWidget::on_btnCheck_clicked()
|
|||||||
layout->addWidget(&dlg);
|
layout->addWidget(&dlg);
|
||||||
dialog->setWindowTitle(tr("Status Task"));
|
dialog->setWindowTitle(tr("Status Task"));
|
||||||
dialog->setMinimumSize(200, 100);
|
dialog->setMinimumSize(200, 100);
|
||||||
dialog->setStyleSheet(this->styleSheet());
|
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
//dialog->setStyleSheet(this->styleSheet());
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
|
|
||||||
if(dlg.getFlChanged())
|
if(dlg.getFlChanged())
|
||||||
|
|||||||
@@ -373,7 +373,8 @@ void FIMtasksWidget::on_btnCheck_clicked()
|
|||||||
layout->addWidget(&dlg);
|
layout->addWidget(&dlg);
|
||||||
dialog->setWindowTitle(tr("Check Task"));
|
dialog->setWindowTitle(tr("Check Task"));
|
||||||
dialog->setMinimumSize(1600, 800);
|
dialog->setMinimumSize(1600, 800);
|
||||||
dialog->setStyleSheet(this->styleSheet());
|
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
//dialog->setStyleSheet(this->styleSheet());
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
|
|
||||||
if(dlg.getFlChanged())
|
if(dlg.getFlChanged())
|
||||||
|
|||||||
@@ -129,6 +129,8 @@ QTreeWidgetItem *TaskAMMFIMTreePreparation::addModuleToTreeWidgetAMM(Module *mod
|
|||||||
|
|
||||||
void TaskAMMFIMTreePreparation::loadAMMtasksFromXML(QByteArray array)
|
void TaskAMMFIMTreePreparation::loadAMMtasksFromXML(QByteArray array)
|
||||||
{
|
{
|
||||||
|
qDebug() << "TaskAMMFIMTreePreparation::loadAMMtasksFromXML thread ID " << QThread::currentThreadId();
|
||||||
|
|
||||||
mtxAccess.lock();
|
mtxAccess.lock();
|
||||||
|
|
||||||
deleteAllModulsAMM();
|
deleteAllModulsAMM();
|
||||||
@@ -152,6 +154,8 @@ void TaskAMMFIMTreePreparation::loadAMMtasksFromXML(QByteArray array)
|
|||||||
|
|
||||||
void TaskAMMFIMTreePreparation::loadFIMtasksFromXML(QByteArray array)
|
void TaskAMMFIMTreePreparation::loadFIMtasksFromXML(QByteArray array)
|
||||||
{
|
{
|
||||||
|
qDebug() << "TaskAMMFIMTreePreparation::loadFIMtasksFromXML thread ID " << QThread::currentThreadId();
|
||||||
|
|
||||||
mtxAccess.lock();
|
mtxAccess.lock();
|
||||||
|
|
||||||
listTasksFIM.clear();
|
listTasksFIM.clear();
|
||||||
|
|||||||
@@ -492,6 +492,7 @@ bool EditorTrainees::verifyTrainee(Trainee trainee)
|
|||||||
bool EditorTrainees::editGroup(Group group, Group *group_edit)
|
bool EditorTrainees::editGroup(Group group, Group *group_edit)
|
||||||
{
|
{
|
||||||
DialogEditGroup dlg(this);
|
DialogEditGroup dlg(this);
|
||||||
|
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
dlg.setGroup(group);
|
dlg.setGroup(group);
|
||||||
|
|
||||||
@@ -522,6 +523,7 @@ bool EditorTrainees::editGroup(Group group, Group *group_edit)
|
|||||||
bool EditorTrainees::editTrainee(Trainee trainee, Trainee *trainee_edit)
|
bool EditorTrainees::editTrainee(Trainee trainee, Trainee *trainee_edit)
|
||||||
{
|
{
|
||||||
DialogEditTrainee dlg(this);
|
DialogEditTrainee dlg(this);
|
||||||
|
dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
|
|
||||||
dlg.setTrainee(trainee);
|
dlg.setTrainee(trainee);
|
||||||
|
|
||||||
|
|||||||
@@ -18,21 +18,21 @@ void TraineesView::resizeEvent(QResizeEvent *event)
|
|||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 80);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 100);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 120);
|
||||||
|
|
||||||
int widthTrainee;
|
int widthTrainee;
|
||||||
|
|
||||||
if(typeView == TypeView::onlyView)
|
if(typeView == TypeView::onlyView)
|
||||||
{//onlyView
|
{//onlyView
|
||||||
widthTrainee = width - (230 + 10);
|
widthTrainee = width - (270 + 10);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//control
|
{//control
|
||||||
if(adminMode)
|
if(adminMode)
|
||||||
widthTrainee = width - (760 + 10);
|
widthTrainee = width - (800 + 10);
|
||||||
else
|
else
|
||||||
widthTrainee = width - (630 + 10);
|
widthTrainee = width - (670 + 10);
|
||||||
}
|
}
|
||||||
if(widthTrainee < 250)
|
if(widthTrainee < 250)
|
||||||
widthTrainee = 250;
|
widthTrainee = 250;
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ void ViewerTrainees::on_btnEditorTrainees_clicked()
|
|||||||
layout->addWidget(&editorTraineesGroups);
|
layout->addWidget(&editorTraineesGroups);
|
||||||
dialog->setWindowTitle(tr("Editor of trainees"));
|
dialog->setWindowTitle(tr("Editor of trainees"));
|
||||||
dialog->setMinimumSize(1600, 800);
|
dialog->setMinimumSize(1600, 800);
|
||||||
|
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
|
|
||||||
loadTraineesFromDB();
|
loadTraineesFromDB();
|
||||||
|
|||||||
Reference in New Issue
Block a user