diff --git a/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp index c53dba2..8aa61d9 100644 --- a/GUIdataBaseLMS/mainwindow.cpp +++ b/GUIdataBaseLMS/mainwindow.cpp @@ -8,21 +8,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), - m_instructorsAndTraineesWidget(nullptr) + instructorsAndTraineesWidget(nullptr) { ui->setupUi(this); - m_instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this); + instructorsAndTraineesWidget = new InstructorsAndTraineesWidget(this); - connect(m_instructorsAndTraineesWidget,&InstructorsAndTraineesWidget::signal_LanguageChanged,this,&MainWindow::slot_LanguageChanged); + connect(instructorsAndTraineesWidget,&InstructorsAndTraineesWidget::signal_LanguageChanged,this,&MainWindow::slot_LanguageChanged); - ui->horizontalLayout->addWidget(m_instructorsAndTraineesWidget); + ui->horizontalLayout->addWidget(instructorsAndTraineesWidget); this->move(0, 0); this->showNormal(); //this->showMaximized(); - if(m_instructorsAndTraineesWidget->getLanguage() == "ENG") + if(instructorsAndTraineesWidget->getLanguage() == "ENG") { qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + "en_EN", "."); qApp->installTranslator(&qtLanguageTranslator); @@ -36,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { - delete m_instructorsAndTraineesWidget; + delete instructorsAndTraineesWidget; delete ui; } diff --git a/GUIdataBaseLMS/mainwindow.h b/GUIdataBaseLMS/mainwindow.h index 3d720c7..b6e7afe 100644 --- a/GUIdataBaseLMS/mainwindow.h +++ b/GUIdataBaseLMS/mainwindow.h @@ -30,6 +30,6 @@ private: Ui::MainWindow *ui; QTranslator qtLanguageTranslator; - InstructorsAndTraineesWidget* m_instructorsAndTraineesWidget; + InstructorsAndTraineesWidget* instructorsAndTraineesWidget; }; #endif // MAINWINDOW_H diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 589c05d..025eaf8 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -379,10 +379,19 @@ void InstructorsAndTraineesWidget::setLanguageInterfase() DialogSettings::loadSettings(&settings); if(settings.Language == "ENG") + { qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "en_EN", "."); + language = "en_EN"; + } else + { qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + "ru_RU", "."); + language = "ru_RU"; + } + qApp->installTranslator(&qtLanguageTranslator); + + emit signal_LanguageChanged(language); } void InstructorsAndTraineesWidget::on_btnSetVersion_clicked()