IMSProg/IMSProg-1.0.29.patch

diff -ruN a/IMSProg_editor/CMakeLists.txt b/IMSProg_editor/CMakeLists.txt
--- a/IMSProg_editor/CMakeLists.txt	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_editor/CMakeLists.txt	2023-11-07 21:23:01.772564354 +0900
@@ -32,13 +32,13 @@
 target_link_libraries(${PROJECT_NAME} Qt5::Core)
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION /opt/IMSProg)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg_editor.desktop" DESTINATION /usr/share/applications)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/chipEdit64.png" DESTINATION /usr/share/pixmaps)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_ru_RU.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_de_DE.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_es_ES.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_zn_CH.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_uk_UA.qm" DESTINATION /opt/IMSProg/language)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg_editor.desktop" DESTINATION ${SHARE_INSTALL_PREFIX}/applications)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/chipEdit64.png" DESTINATION ${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps RENAME IMSProg_editor.png)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_ru_RU.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_de_DE.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_es_ES.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_zn_CH.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_uk_UA.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
 
 
diff -ruN a/IMSProg_editor/main.cpp b/IMSProg_editor/main.cpp
--- a/IMSProg_editor/main.cpp	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_editor/main.cpp	2023-11-07 21:19:08.168135750 +0900
@@ -8,7 +8,7 @@
     QApplication a(argc, argv);
     QTranslator translator;
     QString translateName = "chipEditor_" + QLocale::system().name();
-    if(translator.load(translateName, "language/")) a.installTranslator(&translator);
+    if(translator.load(translateName, "/usr/share/IMSProg/language/")) a.installTranslator(&translator);
     a.installTranslator(&translator);
     MainWindow w;
     w.show();
diff -ruN a/IMSProg_editor/other/IMSProg_editor.desktop b/IMSProg_editor/other/IMSProg_editor.desktop
--- a/IMSProg_editor/other/IMSProg_editor.desktop	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_editor/other/IMSProg_editor.desktop	2023-11-07 21:45:27.943806599 +0900
@@ -2,10 +2,8 @@
 Version=1.0
 Type=Application
 Name=IMSProg_editor
-Comment=Chip Database Editor 
-Exec=/opt/IMSProg/IMSProg_editor
-Icon=/usr/share/pixmaps/chipEdit64.png
-Path=/opt/IMSProg
+Exec=IMSProg_editor
+Icon=IMSProg_editor
 Terminal=false
 Encoding=UTF-8
 Categories=Electronics;Development;
diff -ruN a/IMSProg_programmer/CMakeLists.txt b/IMSProg_programmer/CMakeLists.txt
--- a/IMSProg_programmer/CMakeLists.txt	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_programmer/CMakeLists.txt	2023-11-07 21:27:22.975283810 +0900
@@ -84,13 +84,13 @@
 target_link_libraries(${PROJECT_NAME} Qt5::Core)
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets ${LibUSB_LIBRARIES})
 
-install(TARGETS ${PROJECT_NAME} DESTINATION /opt/IMSProg)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg.desktop" DESTINATION /usr/share/applications)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/IMSProg64.png" DESTINATION /usr/share/pixmaps)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/database/IMSProg.Dat" DESTINATION /opt/IMSProg)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg.desktop" DESTINATION ${SHARE_INSTALL_PREFIX}/applications)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/IMSProg64.png" DESTINATION ${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps RENAME IMSProg.png)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/database/IMSProg.Dat" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg)
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/99-CH341.rules" DESTINATION /etc/udev/rules.d)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_ru_RU.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_es_ES.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_de_DE.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_zn_CH.qm" DESTINATION /opt/IMSProg/language)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_uk_UA.qm" DESTINATION /opt/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_ru_RU.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_es_ES.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_de_DE.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_zn_CH.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_uk_UA.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language)
diff -ruN a/IMSProg_programmer/main.cpp b/IMSProg_programmer/main.cpp
--- a/IMSProg_programmer/main.cpp	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_programmer/main.cpp	2023-11-07 21:19:08.168135750 +0900
@@ -25,7 +25,7 @@
     QApplication a(argc, argv);
     QTranslator translator;
         QString translateName = "chipProgrammer_" + QLocale::system().name();
-        if(translator.load(translateName, "language/")) a.installTranslator(&translator);
+        if(translator.load(translateName, "/usr/share/IMSProg/language/")) a.installTranslator(&translator);
         a.installTranslator(&translator);
     MainWindow w;
     w.show();
diff -ruN a/IMSProg_programmer/mainwindow.cpp b/IMSProg_programmer/mainwindow.cpp
--- a/IMSProg_programmer/mainwindow.cpp	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_programmer/mainwindow.cpp	2023-11-07 21:30:10.844815660 +0900
@@ -1125,15 +1125,7 @@
 
 void MainWindow::on_actionEdit_chips_Database_triggered()
 {
-    if(QFileInfo::exists("IMSProg_editor") && !QDir("IMSProg_editor").exists()){
-        //The file exists and is not a folder
-        QProcess::execute("./IMSProg_editor");
-        progInit();
-    }
-    else {
-        //The file doesn't exist, either the path doesn't exist or is the path of a folder
-         QMessageBox::about(this, tr("Error"), tr("Not found file `IMSProg_editor`!"));
-    }
+    QProcess::execute("IMSProg_editor");
 }
 
 void MainWindow::doNotDisturb()
@@ -1240,7 +1232,7 @@
     int index2;
     //opening chip database file
     ui->statusBar->showMessage(tr("Opening DAT file"));
-    QFile datfile("IMSProg.Dat");
+    QFile datfile("/usr/share/IMSProg/IMSProg.Dat");
     QByteArray dataChips;
     if (!datfile.open(QIODevice::ReadOnly))
     {
diff -ruN a/IMSProg_programmer/other/IMSProg.desktop b/IMSProg_programmer/other/IMSProg.desktop
--- a/IMSProg_programmer/other/IMSProg.desktop	2023-11-02 18:41:23.000000000 +0900
+++ b/IMSProg_programmer/other/IMSProg.desktop	2023-11-07 21:30:52.035663782 +0900
@@ -2,9 +2,8 @@
 Version=1.0
 Type=Application
 Name=IMSProg
-Icon=/usr/share/pixmaps/IMSProg64.png
-Exec=/opt/IMSProg/IMSProg
-Path=/opt/IMSProg/
+Icon=IMSProg
+Exec=IMSProg
 NoDisplay=false
 Categories=Electronics;Development;
 StartupNotify=true