From cd8b5de821d0b0ae03d859e93b2fd0779ae7584c Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 2 May 2023 12:37:45 +0600 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B0=D1=81=D1=82=D0=B8=D1=87=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B3=20=D1=81=20entryKernel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-bootloader.cc | 27 +++++++++++++++------------ ubl-settings-bootloader.glade | 2 +- Загрузка | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 Загрузка diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 486b2da..0421df7 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -391,8 +391,6 @@ string MainWindow::template_item_selected(int size, Glib::RefPtr cmds += " " + param + " "; } if (row[m_columns.check_button] == false && cmds.find(param) != string::npos) { - string param_del = " " + param; - Utils::str_remove(cmds, param_del); Utils::str_remove(cmds, param); } } @@ -404,6 +402,7 @@ string MainWindow::template_item_selected(int size, Glib::RefPtr } } cmds = "\"" + cmds + "\""; + cout << cmds << endl; return cmds; } @@ -613,15 +612,21 @@ bool MainWindow::focus_out_txt_login(GdkEventFocus*) { bool MainWindow::focus_out_txt_kernel(GdkEventFocus*) { this->set_entry_to_tree_view(list_store_kernel, *entryKernel, vec_Option_kernel, size_kernel, "GRUB_CMDLINE_LINUX"); + this->set_row_all(map_cmd_selection, list_store_kernel, vec_Option_kernel, size_kernel, "GRUB_CMDLINE_LINUX"); + flag_blocked_tree_view = false; return true; } bool MainWindow::focus_out_txt_IPT(GdkEventFocus*) { this->set_entry_to_tree_view(list_store_IPT, *entryIPT, vec_Option_IPT, size_IPT, "GRUB_TERMINAL_INPUT"); + this->set_row_all(map_cmd_selection, list_store_IPT, vec_Option_IPT, size_IPT, "GRUB_TERMINAL_INPUT"); + flag_blocked_tree_view = false; return true; } bool MainWindow::focus_out_txt_OTT(GdkEventFocus*) { this->set_entry_to_tree_view(list_store_OTT, *entryOTT, vec_Option_OTT, size_OTT, "GRUB_TERMINAL_OUTPUT"); + this->set_row_all(map_cmd_selection, list_store_OTT, vec_Option_OTT, size_OTT, "GRUB_TERMINAL_OUTPUT"); + flag_blocked_tree_view = false; return true; } @@ -637,7 +642,7 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store for (auto &name: vec_params) { this->set_row(list_store, size, name, true); } - Utils::str_remove(text, ","); + Utils::str_replace_all(text, ",", " "); if (text.length() > 0) { if (text[0] == ' ') { text = text.substr(1, text.length() - 1); @@ -648,9 +653,7 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store } map_cmd_selection[key] = text; - flag_blocked_tree_view = false; - - + cout << text << endl; } void MainWindow::get_menu_boot(std::map &map_temp) { @@ -718,12 +721,12 @@ void MainWindow::event(){ treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT)); Glib::RefPtr treeViewOTTModel = treeViewOTT->get_model(); treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT)); - entryKernel->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel)); - entryIPT->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT)); - entryOTT->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT)); - entryKernel->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); - entryIPT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); - entryOTT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); + // entryKernel->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel)); + // entryIPT->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT)); + // entryOTT->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT)); + // entryKernel->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); + // entryIPT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); + // entryOTT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_tree_view)); } this->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit)); diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 563022b..760c6d7 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -133,7 +133,7 @@ specified priority True False **** - 0 + 0.009999999776482582 True diff --git a/Загрузка b/Загрузка new file mode 100644 index 0000000..6011cfa --- /dev/null +++ b/Загрузка @@ -0,0 +1,14 @@ +GRUB_CMDLINE_LINUX variable added to system configuration /etc/ublinux/boot +GRUB_DEFAULT variable added to system configuration /etc/ublinux/boot +загрузки variable added to system configuration /etc/ublinux/boot +с variable added to system configuration /etc/ublinux/boot +другого variable added to system configuration /etc/ublinux/boot +диска variable added to system configuration /etc/ublinux/boot +с variable added to system configuration /etc/ublinux/boot +диска variable added to system configuration /etc/ublinux/boot +№2, variable added to system configuration /etc/ublinux/boot +маскируем variable added to system configuration /etc/ublinux/boot +диск variable added to system configuration /etc/ublinux/boot +под variable added to system configuration /etc/ublinux/boot +первый variable added to system configuration /etc/ublinux/boot +загрузочный variable added to system configuration /etc/ublinux/boot