From becde5183886b4399bf237bdb145e599a5498a73 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 10 May 2023 09:30:38 +0600
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                    | 4 ++--
 cmdline-linux.csv => grub-cmdline-linux.csv | 0
 grub-melodylist.csv => grub-play.csv        | 0
 source/ubl-settings-bootloader.cc           | 4 ++--
 source/ubl-settings-bootloader.h            | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename cmdline-linux.csv => grub-cmdline-linux.csv (100%)
 rename grub-melodylist.csv => grub-play.csv (100%)

diff --git a/Makefile b/Makefile
index cf46ddb..eaaad3a 100644
--- a/Makefile
+++ b/Makefile
@@ -123,10 +123,10 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
-	@install -Dm644 -t /usr/share/${PKGNAME}/ cmdline-linux.csv
+	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-cmdline-linux.csv
 	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-terminal-input.csv
 	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-terminal-output.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-melodylist.csv
+	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-play.csv
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
diff --git a/cmdline-linux.csv b/grub-cmdline-linux.csv
similarity index 100%
rename from cmdline-linux.csv
rename to grub-cmdline-linux.csv
diff --git a/grub-melodylist.csv b/grub-play.csv
similarity index 100%
rename from grub-melodylist.csv
rename to grub-play.csv
diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc
index 7ab2130..596b3af 100755
--- a/source/ubl-settings-bootloader.cc
+++ b/source/ubl-settings-bootloader.cc
@@ -717,7 +717,7 @@ void MainWindow::set_init_data_superuser(std::map<string, string> &map_temp) {
 
 void MainWindow::set_data_csv_melody() {
     string path_name = "";
-    path_name = path_name + path_resources + "/" + "grub-melodylist.csv";
+    path_name = path_name + path_resources + "/" + path_melody;
     string line;
     string all_melody = "";
     string all_melody_old = "";
@@ -769,7 +769,7 @@ void MainWindow::set_init_data_melody(std::map<string, string> &map_temp) {
     list_store_melody = Gtk::ListStore::create(m_columns_melody);
     treeViewMelody->set_model(list_store_melody);
     string path_name = "";
-    path_name = path_name + path_resources + "/" + "grub-melodylist.csv";
+    path_name = path_name + path_resources + "/" + path_melody;
     vector<tuple<string, string>> vec_melody = Utils::read_csv_melody(path_name);
     bool flag = false;
     string cgf_code_melody = map_temp["GRUB_PLAY"];
diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h
index 21ec440..86092c9 100644
--- a/source/ubl-settings-bootloader.h
+++ b/source/ubl-settings-bootloader.h
@@ -129,7 +129,8 @@ void me_thread(string cmd);
 #define cmd_execute "su -l %s -c \" DISPLAY=$DISPLAY %s \""
 #define icon_checked "com.ublinux.ubl-settings-bootloader.checked"
 #define icon_warning "com.ublinux.ubl-settings-bootloader.warning"
-#define kernel_csv "cmdline-linux.csv"
+#define kernel_csv "grub-cmdline-linux.csv"
+#define path_melody "grub-play.csv"
 #define IPT_csv "grub-terminal-input.csv"
 #define OTT_csv "grub-terminal-output.csv"
 #define path_app "/usr/bin/"