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

Исправил баг с checkbox в treeView melody

Browse Source
pull/18/head
Igor Belitskiy 3 years ago
parent 5d3180930d
commit 1f4c12ed56
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -97,7 +97,7 @@ void MainWindow::settings() {
this->pars_os(os_control_list);
this->download_local_cfg();
this->download_globl_cfg();
this->view_add_colums_melody(*treeViewMusic);
//this->view_add_colums_melody(*treeViewMelody);
this->view_add_colums_user(*treeViewUser);
std::map<string, vector<string>> map_list_os = format_os_list(os_control_list);
obj_menu_os.set_builder(builder, path_glade);
@ -425,7 +425,7 @@ void MainWindow::get_builder() {
builder->get_widget("btnOpenMenuOS", btnOpenMenuOS);
builder->get_widget("entrListOS", entrListOS);
builder->get_widget("treeViewUser", treeViewUser);
builder->get_widget("treeViewMusic", treeViewMusic);
builder->get_widget("treeViewMelody", treeViewMelody);
builder->get_widget("lblBootMenuUsers", lblBootMenuUsers);
builder->get_widget("lblRingtoneStartup", lblRingtoneStartup);
builder->get_widget("btnAddUser", btnAddUser);
@ -644,10 +644,6 @@ 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_melody));
}
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));
@ -668,7 +664,7 @@ void MainWindow::set_tree_view_user() {
map_cmd_selection[key] = row[m_columns_user.password] + "";
}
else {
map_cmd_selection[key] = "";
// map_cmd_selection[key] = "";
}
if (row[m_columns_user.check_button]) {
if (users_root.length() != 0) {
@ -687,7 +683,7 @@ void MainWindow::set_tree_view_user() {
}
void MainWindow::set_init_data_user(std::map<string, string> &map_temp) {
treeViewUser->reset_expander_column();
treeViewUser->remove_all_columns();
list_store_user = Gtk::ListStore::create(m_columns_user);
treeViewUser->set_model(list_store_user);
vector<string> vec_users;
@ -705,6 +701,9 @@ void MainWindow::set_init_data_user(std::map<string, string> &map_temp) {
}
}
}
Glib::RefPtr<Gtk::TreeModel> treeViewUserModel = treeViewUser->get_model();
treeViewUserModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::remove_line_user));
this->view_add_colums_user(*treeViewUser);
}
void MainWindow::set_init_data_superuser(std::map<string, string> &map_temp) {
@ -735,8 +734,8 @@ void MainWindow::set_data_csv_melody() {
all_melody_old += line + "\n";
}
}
Glib::RefPtr<Gtk::TreeModel> treeViewMusic_model = treeViewMusic->get_model();
Gtk::TreeModel::Children children = treeViewMusic_model->children();
Glib::RefPtr<Gtk::TreeModel> treeViewMelody_model = treeViewMelody->get_model();
Gtk::TreeModel::Children children = treeViewMelody_model->children();
for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) {
Gtk::TreeModel::Row row = *iter;
code_melodyes = row[m_columns_melody.melody_code] + "";
@ -772,9 +771,9 @@ void MainWindow::set_add_data_user(Gtk::TreeModel::Row &row, bool flag, string &
}
void MainWindow::set_init_data_melody(std::map<string, string> &map_temp) {
treeViewMusic->reset_expander_column();
treeViewMelody->remove_all_columns();
list_store_melody = Gtk::ListStore::create(m_columns_melody);
treeViewMusic->set_model(list_store_melody);
treeViewMelody->set_model(list_store_melody);
string path_name = "";
path_name = path_name + path_resources + "/" + "grub-melodylist.csv";
vector<tuple<string, string>> vec_melody = Utils::read_csv_melody(path_name);
@ -786,6 +785,9 @@ void MainWindow::set_init_data_melody(std::map<string, string> &map_temp) {
flag = (cgf_code_melody == code);
this->set_add_data_melody(row_melody, flag, name, code);
}
Glib::RefPtr<Gtk::TreeModel> treeViewMelodyModel = treeViewMelody->get_model();
treeViewMelodyModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::remove_line_melody));
this->view_add_colums_melody(*treeViewMelody);
}
void MainWindow::set_add_data_melody(Gtk::TreeModel::Row &row, bool flag, string &name, string &code) {
@ -845,8 +847,8 @@ void MainWindow::remove_line_melody(const Gtk::TreeModel::Path&, const Gtk::Tree
flag_validate_del_melody = true;
string code_melodyes = "";
bool flag_error = false;
Glib::RefPtr<Gtk::TreeModel> treeViewMusic_model = treeViewMusic->get_model();
Gtk::TreeModel::Children children = treeViewMusic_model->children();
Glib::RefPtr<Gtk::TreeModel> treeViewMelody_model = treeViewMelody->get_model();
Gtk::TreeModel::Children children = treeViewMelody_model->children();
for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) {
Gtk::TreeModel::Row row = *iter;
code_melodyes = row[m_columns_melody.melody_code] + "";

2
source/ubl-settings-bootloader.h
Unescape View File

@ -246,7 +246,7 @@ public:
Gtk::TreeView *treeViewIPT;
Gtk::TreeView *treeViewOTT;
Gtk::TreeView *treeViewUser;
Gtk::TreeView *treeViewMusic;
Gtk::TreeView *treeViewMelody;
Gtk::Image *imgBG;
Gtk::Overlay *overHead;
Gtk::ComboBoxText *cmbDownloadMode;

2
ubl-settings-bootloader.glade
Unescape View File

@ -755,7 +755,7 @@ specified priority</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkTreeView" id="treeViewMusic">
<object class="GtkTreeView" id="treeViewMelody">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">

Write Preview
Loading…
Cancel
Save