Заменил comboBox на entry для выбора загрузки ОС

pull/18/head
Igor Belitskiy 3 years ago
parent 63de4f5246
commit bc230da507

@ -105,7 +105,6 @@ void MainWindow::settings(){
obj_menu_os.set_entry(entrListOS);
obj_menu_os.init();
obj_menu_os.event();
this->write_list_entry_os(os_control_list);
this->download_local_cfg();
this->download_globl_cfg();
}
@ -166,12 +165,6 @@ string MainWindow::pars_last_launched_os() {
return str_list_os;
}
void MainWindow::write_list_entry_os(vector<string> &os_control_list) {
for (string &name_os: os_control_list) {
cmbDefaultDonw->append(name_os);
}
}
void MainWindow::flag_block_gui() {
if (flag_load_global == true) {
btnLoadGlob->set_sensitive(false);
@ -488,7 +481,6 @@ void MainWindow::get_builder() {
builder->get_widget("chbPasswordProtecc", chbPasswordProtecc);
builder->get_widget("entryPasswordProtecc", entryPasswordProtecc);
builder->get_widget("entrySecurityLogin", entrySecurityLogin);
builder->get_widget("cmbDefaultDonw", cmbDefaultDonw);
#ifdef WEBKIT_FOUND
builder->get_widget("wndWeb", wndWeb);
#endif
@ -553,8 +545,7 @@ void MainWindow::localization(){
cmbDownloadMode->append(loading_animation_without);
cmbDownloadMode->append(no_loading_animation);
cmbDownloadMode->append(lack_loading_animation);
cmbDefaultDonw->append(last_successful_upload);
lblhelpHeader->set_text(read_documentation_web);
lblhelpText->set_text(_(redirected_documentation));
btnReadHelp->set_label(read_online);
@ -775,14 +766,14 @@ void MainWindow::get_default_load(std::map <string, string> &map_temp) {
if (iter_map_data != map_temp.end()) {
string value = iter_map_data->second;
if (value.length() != 0) {
cmbDefaultDonw->set_active_text(value);
entrListOS->set_text(value);
}
else {
cmbDefaultDonw->set_active(0);
entrListOS->set_text("");
}
}
else {
cmbDefaultDonw->set_active(-1);
entrListOS->set_text("");
}
}
@ -897,9 +888,9 @@ void MainWindow::set_data_cfg() {
else {
map_cmd_selection["GRUB_TIMEOUT"] = "";
}
int index = cmbDefaultDonw->get_active_row_number();
if (index != 0 && index != -1) {
map_cmd_selection["GRUB_DEFAULT"] = cmbDefaultDonw->get_active_text();
string name_os = entrListOS->get_text();
if (name_os.length() != 0) {
map_cmd_selection["GRUB_DEFAULT"] = name_os;
}
else {
map_cmd_selection["GRUB_DEFAULT"] = "";
@ -950,10 +941,10 @@ void MainWindow::load_template(std::map<string, string>* map_temp, string cmd) {
this->set_entry(entryOTT, *map_temp, "GRUB_TERMINAL_OUTPUT");
string str_last_launched_os_ubconfig = (*map_temp)["GRUB_DEFAULT"];
if (str_last_launched_os_ubconfig.length() != 0) {
cmbDefaultDonw->set_active_text(str_last_launched_os_ubconfig);
entrListOS->set_text(str_last_launched_os_ubconfig);
}
else {
cmbDefaultDonw->set_active_text(str_last_launched_os);
entrListOS->set_text(str_last_launched_os);
}
}

@ -201,7 +201,6 @@ public:
Gtk::TreeView *treeViewOTT;
Gtk::Image *imgBG;
Gtk::Overlay *overHead;
Gtk::ComboBoxText *cmbDefaultDonw;
Gtk::ComboBoxText *cmbDownloadMode;
Gtk::CheckButton *chbSecurityLogin;
Gtk::CheckButton *chbPasswordProtecc;
@ -286,7 +285,6 @@ public:
string pars_last_launched_os();
vector<string> pars_os(vector<string> &os_control_list);
void fn_event_intelMax1();
void write_list_entry_os(vector<string> &os_control_list);
void fn_event_intelMax4();
void synopsis_show();
void set_data_cfg();

@ -481,23 +481,6 @@ specified priority</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cmbDefaultDonw">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entrListOS">
<property name="visible">True</property>

Loading…
Cancel
Save