Исправлен баг с удаление пользователя

pull/18/head
Igor Belitskiy 3 years ago
parent cd033aee8b
commit 7f4a63c763

@ -773,6 +773,8 @@ void MainWindow::cmd_entry_all(Gtk::Entry &entry, string cmd_settings, string cm
}
void MainWindow::event() {
btnRemoveUser->signal_clicked().connect([&]() {remove_user();});
btnRemoveMusic->signal_clicked().connect([&]() {remove_music();});
btnAddUser->signal_clicked().connect([&]() {view_add_line_user(row_user, list_store_user);});
btnAddMusic->signal_clicked().connect([&]() {view_add_line_music(row_music, list_store_music);});
btnOpenMenuOS->signal_clicked().connect([&]() {obj_menu_os.show();});
@ -806,11 +808,41 @@ void MainWindow::event() {
entryKernel->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_in_txt_kernel));
entryIPT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_in_txt_IPT));
entryOTT->signal_focus_in_event().connect(sigc::mem_fun(*this, &MainWindow::focus_in_txt_OTT));
Glib::RefPtr<Gtk::TreeModel> treeViewUserModel = treeViewUser->get_model();
treeViewUserModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::remove_line_user));
Glib::RefPtr<Gtk::TreeModel> treeViewMusicModel = treeViewMusic->get_model();
treeViewMusicModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::remove_line_music));
}
this->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit));
chbLoadVariantSelectionTimer->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::set_active_boot_second));
}
void MainWindow::remove_user() {
if (flag_valide_del_user) {
list_store_user->erase(iter_user_del);
flag_valide_del_user = false;
}
flag_valide_del_user = false;
}
void MainWindow::remove_music() {
if (flag_valide_del_music) {
list_store_user->erase(iter_music_del);
flag_valide_del_music = false;
}
flag_valide_del_music = false;
}
void MainWindow::remove_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) {
iter_user_del = iter;
flag_valide_del_user = true;
}
void MainWindow::remove_line_music(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) {
iter_music_del = iter;
flag_valide_del_music = true;
}
bool MainWindow::focus_tree_view(GdkEventFocus*) {
treeViewKernel->set_can_focus(false);
treeViewIPT->set_can_focus(false);

@ -286,6 +286,10 @@ public:
std::map<string, string> map_cmd_selection;
std::map<string, string> map_global_cmd_selection;
std::map<string, string> map_local_cmd_selection;
Gtk::TreeModel::iterator iter_user_del;
Gtk::TreeModel::iterator iter_music_del;
bool flag_valide_del_user = false;
bool flag_valide_del_music = false;
Gtk::Label *lblDownloadMode;
Lib_save::Save obj_save = Lib_save::Save();
@ -318,6 +322,7 @@ public:
MainWindow(Glib::RefPtr<Gtk::Builder> const &builder);
~MainWindow();
void open_browser();
void remove_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter);
void set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store, Gtk::Entry &entry, std::vector<std::string> &vec_Option, int size, string key);
void get_menu_boot(std::map<string, string> &map_temp);
void set_row_all(std::map<string, string> &map_cmd, Glib::RefPtr<Gtk::ListStore> &list_store, vector<string> &list_params, size_t size, string key);
@ -329,7 +334,10 @@ public:
void show_pass();
void localization();
void event();
void remove_user();
void remove_music();
void settings();
void remove_line_music(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter);
void view_add_colums_user(Gtk::TreeView &treeView);
void view_add_colums_music(Gtk::TreeView &treeView);
void set_bat_save(Gtk::Button *btnSave);

Loading…
Cancel
Save