diff -ur gamepad.orig/gamepadForm.cpp gamepad/gamepadForm.cpp --- gamepad.orig/gamepadForm.cpp 2019-11-21 11:43:42.000000000 +0400 +++ gamepad/gamepadForm.cpp 2020-04-09 17:02:43.928303946 +0400 @@ -25,6 +25,7 @@ #include #include #include +#include GamepadForm::GamepadForm() : mUi(new Ui::GamepadForm()) @@ -580,3 +581,9 @@ const QString about = "TRIK Gamepad 2.1.0\n\n"+tr("This is desktop gamepad for TRIK robots."); QMessageBox::about(this, title, about); } + +void GamepadForm::closeEvent(QCloseEvent *tEvent) +{ + tEvent->ignore(); + qApp->exit(); +} diff -ur gamepad.orig/gamepadForm.h gamepad/gamepadForm.h --- gamepad.orig/gamepadForm.h 2019-11-21 11:43:42.000000000 +0400 +++ gamepad/gamepadForm.h 2020-04-09 17:03:15.635498693 +0400 @@ -130,6 +130,7 @@ void setUpControlButtonsHash(); void setLabels(); void setImageControl(); + void closeEvent(QCloseEvent *); /// Field with GUI automatically generated by gamepadForm.ui. Ui::GamepadForm *mUi; diff --git a/gamepadForm.cpp b/gamepadForm.cpp index 8f419bd..b980a21 100644 --- gamepad.orig/gamepadForm.cpp +++ gamepad/gamepadForm.cpp @@ -241,7 +241,7 @@ void GamepadForm::createConnection() void GamepadForm::createMenu() { // Path to your local directory. Set up if you don't put .qm files into your debug folder. - const QString pathToDir = "languages/trikDesktopGamepad"; + const QString pathToDir = "/usr/share/trikStudio/languages/trikDesktopGamepad"; const QString russian = pathToDir + "_ru"; const QString english = pathToDir + "_en";