|
|
|
|
@ -98,9 +98,9 @@ void MainWindow::settings() {
|
|
|
|
|
this->download_local_cfg();
|
|
|
|
|
this->download_globl_cfg();
|
|
|
|
|
//this->view_add_colums_melody(*treeViewMelody);
|
|
|
|
|
std::map<string, vector<string>> map_list_os = format_os_list(os_control_list);
|
|
|
|
|
vector<tuple<string, vector<string>>> vec_list_os = format_os_list(os_control_list);
|
|
|
|
|
obj_menu_os.set_builder(builder, path_glade);
|
|
|
|
|
obj_menu_os.set_map(map_list_os);
|
|
|
|
|
obj_menu_os.set_map(vec_list_os);
|
|
|
|
|
obj_menu_os.set_entry(entrListOS);
|
|
|
|
|
// obj_menu_os.set_last_launched_os(map_global_cmd_selection["GRUB_DEFAULT"]);
|
|
|
|
|
obj_menu_os.set_last_launched_os(this->str_last_launched_os);
|
|
|
|
|
@ -120,8 +120,8 @@ void MainWindow::settings() {
|
|
|
|
|
this->event();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
map<string, vector<string>> MainWindow::format_os_list(vector<string> &os_control_list) {
|
|
|
|
|
std::map<string, vector<string>> map_list_os;
|
|
|
|
|
vector<tuple<string, vector<string>>> MainWindow::format_os_list(vector<string> &os_control_list) {
|
|
|
|
|
vector<tuple<string, vector<string>>> vec_list_os;
|
|
|
|
|
set<string> set_key;
|
|
|
|
|
for (string& name_os : os_control_list) {
|
|
|
|
|
if (name_os.find(">") != string::npos) {
|
|
|
|
|
@ -130,7 +130,8 @@ map<string, vector<string>> MainWindow::format_os_list(vector<string> &os_contro
|
|
|
|
|
else {
|
|
|
|
|
vector<string> vec_os;
|
|
|
|
|
//vec_os.push_back(" ");
|
|
|
|
|
map_list_os[name_os] = vec_os;
|
|
|
|
|
tuple<string, vector<string>> t1(name_os, vec_os);
|
|
|
|
|
vec_list_os.push_back(t1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
set<string>::iterator it = set_key.begin();
|
|
|
|
|
@ -146,10 +147,11 @@ map<string, vector<string>> MainWindow::format_os_list(vector<string> &os_contro
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (flag) {
|
|
|
|
|
map_list_os[name_os_buff] = vec_os_values;
|
|
|
|
|
tuple<string, vector<string>> t1(name_os_buff, vec_os_values);
|
|
|
|
|
vec_list_os.push_back(t1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return map_list_os;
|
|
|
|
|
return vec_list_os;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vector<string> MainWindow::pars_os(vector<string> &os_control_list) {
|
|
|
|
|
|