From 11c8e217298db421ed29113557820073dba6bd37 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Tue, 2 Dec 2025 18:13:51 +0300 Subject: [PATCH] Naming --- GUIdataBaseLMS/app.rc | 2 +- GUIdataBaseLMS/mainwindow.ui | 2 +- .../translations/GUIdataBaseLMS_ru_RU.qm | Bin 183 -> 293 bytes .../translations/GUIdataBaseLMS_ru_RU.ts | 4 ++-- TrayServerLMS/app.rc | 2 +- TrayServerLMS/mainwindow.cpp | 4 ++-- TrayServerLMS/mainwindow.ui | 2 +- .../translations/TrayServerLMS_ru_RU.qm | Bin 1174 -> 735 bytes .../translations/TrayServerLMS_ru_RU.ts | 16 ++++++++++------ 9 files changed, 18 insertions(+), 14 deletions(-) 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 a3c25fb530d7c3e6370f8e548665d41bc0c94721..f8a5e367cd9864ffc433a4a991e335a8fa1ad7a2 100644 GIT binary patch literal 293 zcmcE7ks@*G{hX<16=n7(EZlq7iGhKEgL%%e3qYD76No=D1Bodt0xSwFG7JhV7A&?b zjx0_r4lK?rRzTVg$TDEi1Ij1?S*Ac)0~RxuKo$p}h&@omj>QcqY64UZ5^(~uU4d#W zSloduN1zFIEXFK$Kp8t0Lm=N8sLl*1YXmd}q{^Q`fguP8y%=;EEE!B0{1{vr!hvi< z1_K5I4v-VsfY{D4JXj$!uehYBG`S?dNKe5xF*C0uH7_wQIaQ&cC_gzhrL-uuSfMyG zw=^das6rtq$V=DK)Xz0s*U-R#9cTm>NK1HTUP^vBV+WAWE6Dg)ll#926U$#6E@1$) Ctvtd2 delta 140 zcmZ3=w4HH+Xg!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 18e37c8684a63a8a8d24d75e3ed326ff7acd18d5..793e669cfaba854bf16dd9d8d7f43e59e805eeeb 100644 GIT binary patch delta 348 zcmbQnd7pKHh@Axk%Xty!Xy|yd{EM_c$U^DE2=Gn2h0Yyz%oWUYaK(;GTjRlK4 zkmbl?1(Y{tu>eNXypq(s#JuEGg@U5|_IA eoWzp+B88wJFI`JhKi6(GcAq5Vm33g^XAR>eecK2z4A`I|MBd}$HeJ3 zH(tE{vPeWL#Jfz?_No2zg#n`WWq$Y6#s0aIy4Q>SW9R<2EK$dYuCd)^*!PaT{r(d6 zpWP3>D%_`@n}zE*zo?0LxC4e?G)98wd4aP$!BbdQd6B0`kV`du71C59Nio)deE4QK zRiAm5)4YrUZy=;FW;l(1m$P;r2j&87S)K--b0|}h%3ugdkw;6GOV%0c^Wi)=9|!Lx ztKG6RVsMQr!)o=Uc@Db_#vF94gCQby)TE;m53_DNYX$@d`p2M-o$%XiDzPhhY#VT3vDY1Q$4uj7&D&IlrUh zR?b5#Z2Ibj&u|WlqVHSO!FzN`L&Gr?z} zXc{FiK*yjhy(!&dqv=emp#kABX-iu8D=Yn%1Cgs}<;P+}S5$;DZ24ZxEcHRI>2(`8 zAQOCshnnF!MHQk>Vs)+9D%Pw2Tu!6q@o3OyMs?0Urxd_vt;RH8fi;UN=I~rhG^ROC zD~{BOX|zdwZl7Ao(AWN^s7haMs;UVpx)a5!Dn=k{w3V)59zbU1!Q%1^7+tV5LPYkG o=4 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 +