diff --git a/GUIdataBaseLMS/app.rc b/GUIdataBaseLMS/app.rc index 37f5cba..4ddee7f 100644 --- a/GUIdataBaseLMS/app.rc +++ b/GUIdataBaseLMS/app.rc @@ -1 +1 @@ -IDI_APP_ICON ICON "resources\IcoGUIRRJ.ico" +IDI_APP_ICON ICON "resources/IcoGUIRRJ.ico" diff --git a/GUIdataBaseLMS/mainwindow.ui b/GUIdataBaseLMS/mainwindow.ui index 4ea6216..392f94d 100644 --- a/GUIdataBaseLMS/mainwindow.ui +++ b/GUIdataBaseLMS/mainwindow.ui @@ -16,7 +16,7 @@ - Learning management system (LMS) + AWS instructor. Maintenance procedures simulator RRJ-95NEW-100 diff --git a/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.qm b/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.qm index a3c25fb..f8a5e36 100644 Binary files a/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.qm and b/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.qm differ diff --git a/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.ts b/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.ts index a29e418..e153d4d 100644 --- a/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.ts +++ b/GUIdataBaseLMS/translations/GUIdataBaseLMS_ru_RU.ts @@ -5,8 +5,8 @@ MainWindow - Learning management system (LMS) - Система управления обучением (СУО) + AWS instructor. Maintenance procedures simulator RRJ-95NEW-100 + АРМ инструктора. Тренажёр процедур технического обслуживания RRJ-95NEW-100 diff --git a/TrayServerLMS/app.rc b/TrayServerLMS/app.rc index 927cf9a..abfa25a 100644 --- a/TrayServerLMS/app.rc +++ b/TrayServerLMS/app.rc @@ -1 +1 @@ -IDI_APP_ICON ICON "resources\IcoServerRRJ.ico" +IDI_APP_ICON ICON "resources/IcoServerRRJ.ico" diff --git a/TrayServerLMS/mainwindow.cpp b/TrayServerLMS/mainwindow.cpp index 9403b9d..a1740dc 100644 --- a/TrayServerLMS/mainwindow.cpp +++ b/TrayServerLMS/mainwindow.cpp @@ -167,7 +167,7 @@ void MainWindow::slot_TrayMenu_Exit() void MainWindow::slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg) { QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(iconMsg); - trayIcon->showMessage(tr("Server LMS"), + trayIcon->showMessage(tr("Server MPS"), textMsg, icon, 100); } @@ -215,7 +215,7 @@ void MainWindow::errorCheck() void MainWindow::updateTrayTitles() { - trayIcon->setToolTip(tr("Server LMS")); + trayIcon->setToolTip(tr("Server MPS")); action_ShowWindow->setText(tr("Expand window")); action_HideWindow->setText(tr("Minimize window")); action_Exit->setText(tr("Exit")); diff --git a/TrayServerLMS/mainwindow.ui b/TrayServerLMS/mainwindow.ui index 8c4a832..dd076ab 100644 --- a/TrayServerLMS/mainwindow.ui +++ b/TrayServerLMS/mainwindow.ui @@ -17,7 +17,7 @@ - Server Learning management system (LMS) + Server. Maintenance procedures simulator RRJ-95NEW-100 diff --git a/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm b/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm index 18e37c8..793e669 100644 Binary files a/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm and b/TrayServerLMS/translations/TrayServerLMS_ru_RU.qm differ diff --git a/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts b/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts index 88709f4..e2ccf90 100644 --- a/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts +++ b/TrayServerLMS/translations/TrayServerLMS_ru_RU.ts @@ -3,17 +3,16 @@ MainWindow - - - Server Learning management system (LMS) - Сервер Системы управления обучением (СУО) - - Server LMS Сервер СУО + + + Server MPS + Сервер ТПТО + Expand window @@ -34,5 +33,10 @@ Starting the server... Запуск сервера... + + + Server. Maintenance procedures simulator RRJ-95NEW-100 + Сервер. Тренажёр процедур технического обслуживания самолета RRJ-95NEW-100 +