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 &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 &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> 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/"