Частично исправлен баг с entryKernel

pull/18/head
Igor Belitskiy 3 years ago
parent 9a1d19b52e
commit cd8b5de821

@ -391,8 +391,6 @@ string MainWindow::template_item_selected(int size, Glib::RefPtr<Gtk::ListStore>
cmds += " " + param + " "; cmds += " " + param + " ";
} }
if (row[m_columns.check_button] == false && cmds.find(param) != string::npos) { 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); Utils::str_remove(cmds, param);
} }
} }
@ -404,6 +402,7 @@ string MainWindow::template_item_selected(int size, Glib::RefPtr<Gtk::ListStore>
} }
} }
cmds = "\"" + cmds + "\""; cmds = "\"" + cmds + "\"";
cout << cmds << endl;
return cmds; return cmds;
} }
@ -613,15 +612,21 @@ bool MainWindow::focus_out_txt_login(GdkEventFocus*) {
bool MainWindow::focus_out_txt_kernel(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_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; return true;
} }
bool MainWindow::focus_out_txt_IPT(GdkEventFocus*) { 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_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; return true;
} }
bool MainWindow::focus_out_txt_OTT(GdkEventFocus*) { 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_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; return true;
} }
@ -637,7 +642,7 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store
for (auto &name: vec_params) { for (auto &name: vec_params) {
this->set_row(list_store, size, name, true); this->set_row(list_store, size, name, true);
} }
Utils::str_remove(text, ","); Utils::str_replace_all(text, ",", " ");
if (text.length() > 0) { if (text.length() > 0) {
if (text[0] == ' ') { if (text[0] == ' ') {
text = text.substr(1, text.length() - 1); text = text.substr(1, text.length() - 1);
@ -648,9 +653,7 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store
} }
map_cmd_selection[key] = text; map_cmd_selection[key] = text;
flag_blocked_tree_view = false; cout << text << endl;
} }
void MainWindow::get_menu_boot(std::map <string, string> &map_temp) { void MainWindow::get_menu_boot(std::map <string, string> &map_temp) {
@ -718,12 +721,12 @@ void MainWindow::event(){
treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT)); treeViewIPTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_IPT));
Glib::RefPtr<Gtk::TreeModel> treeViewOTTModel = treeViewOTT->get_model(); Glib::RefPtr<Gtk::TreeModel> treeViewOTTModel = treeViewOTT->get_model();
treeViewOTTModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_OTT)); 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)); // 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)); // 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)); // 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)); // 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)); // 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)); // 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)); this->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit));

@ -133,7 +133,7 @@ specified priority</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">****</property> <property name="label" translatable="yes">****</property>
<property name="xalign">0</property> <property name="xalign">0.009999999776482582</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

@ -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
Loading…
Cancel
Save