Applications
/
ubl-settings-bootloader
10
0
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fixed action block after first deletion

Browse Source
pull/55/head
Ivan Dmitrievich Yartsev 2 years ago
parent 15c6a4b29d
commit 2b6f714470
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
source/ubl-settings-bootloader.cc
Unescape View File

@ -253,7 +253,7 @@ void MainWindow::settings() {
btnBoxAboutDialog->set_visible(false); btnBoxAboutDialog->set_visible(false);
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
this->flag_block_gui(); this->flag_block_gui();
if (this->check_root() == 0) { if (this->check_root() == 1) {
spbSecond->set_range(1, 60); spbSecond->set_range(1, 60);
spbSecond->set_increments(1.0, 1.0); spbSecond->set_increments(1.0, 1.0);
spbSecond->set_value(1); spbSecond->set_value(1);
@ -836,7 +836,7 @@ void MainWindow::event() {
entryKernel->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel)); entryKernel->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel));
entryIPT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT)); entryIPT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT));
entryOTT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT)); entryOTT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT));
if (this->check_root() == 0) { if (this->check_root() == 1) {
Glib::RefPtr<Gtk::TreeModel> treeViewKernelModel = treeViewKernel->get_model(); Glib::RefPtr<Gtk::TreeModel> treeViewKernelModel = treeViewKernel->get_model();
treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel));
Glib::RefPtr<Gtk::TreeModel> treeViewIPTModel = treeViewIPT->get_model(); Glib::RefPtr<Gtk::TreeModel> treeViewIPTModel = treeViewIPT->get_model();
@ -1123,6 +1123,7 @@ void MainWindow::wrapper_add_data_melody() {
} }
void MainWindow::remove_user() { void MainWindow::remove_user() {
iter_user_del = this->treeViewUser->get_selection()->get_selected();
if (flag_validate_del_user && list_store_user->iter_is_valid(iter_user_del)) { if (flag_validate_del_user && list_store_user->iter_is_valid(iter_user_del)) {
Gtk::TreeModel::Row row = *iter_user_del; Gtk::TreeModel::Row row = *iter_user_del;
if(row) { if(row) {
@ -1131,25 +1132,24 @@ void MainWindow::remove_user() {
map_cmd_selection[key] = ""; map_cmd_selection[key] = "";
} }
list_store_user->erase(iter_user_del); list_store_user->erase(iter_user_del);
flag_validate_del_user = false; flag_validate_del_user = true;
info_status_app(info_box_ok_css); info_status_app(info_box_ok_css);
imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU); imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU);
lblWarning->set_text(str_del_user); lblWarning->set_text(str_del_user);
} }
flag_validate_del_user = false; flag_validate_del_user = true;
} }
void MainWindow::remove_melody() { void MainWindow::remove_melody() {
iter_user_del = this->treeViewUser->get_selection()->get_selected();
iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); iter_melody_del = this->treeViewMelody->get_selection()->get_selected();
if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) {
list_store_melody->erase(iter_melody_del); list_store_melody->erase(iter_melody_del);
flag_validate_del_melody = false; flag_validate_del_melody = true;
info_status_app(info_box_ok_css); info_status_app(info_box_ok_css);
imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU); imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU);
lblWarning->set_text(str_del_melody); lblWarning->set_text(str_del_melody);
} }
flag_validate_del_melody = false; flag_validate_del_melody = true;
} }
void MainWindow::select_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) { void MainWindow::select_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) {

Write Preview
Loading…
Cancel
Save