diff --git a/source/menu_os.cc b/source/menu_os.cc index 365f232..46378a9 100644 --- a/source/menu_os.cc +++ b/source/menu_os.cc @@ -16,7 +16,6 @@ void Menu_os::set_last_launched_os(string str_last_launched_os) { void Menu_os::set_builder(Glib::RefPtr& builder, string path_glade) { this->builder = builder; this->path_glade = path_glade; - builder->get_widget("popoverMenuOS", popoverMenuOS); builder->get_widget("revealerL1", revealerL1); builder->get_widget("revealerL2", revealerL2); builder->get_widget("boxALLL3", boxALLL3); diff --git a/source/menu_os.h b/source/menu_os.h index b4e3801..01e3051 100644 --- a/source/menu_os.h +++ b/source/menu_os.h @@ -13,7 +13,6 @@ private: Glib::RefPtr builder; vector>> vec_list_os; - Gtk::Popover *popoverMenuOS; Gtk::Revealer *revealerL1; Gtk::Revealer *revealerL2; Gtk::Button *btnToLev1; diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 5d6e6c8..331071d 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -167,6 +167,7 @@ void View_edit_add_table::set_data(bool check, string column1, string column2) { } void View_edit_add_table::show_melody_edit() { + gtk_entry_set_input_purpose(GTK_ENTRY(entryCol2->gobj()) ,GTK_INPUT_PURPOSE_FREE_FORM); lblAddEditCheckBox->set_text(string(str_active) + ":"); lblAddEditCol1->set_text(string(str_option) + ":"); lblAddEditCol2->set_text(string(str_melody_code) + ":"); @@ -177,6 +178,7 @@ void View_edit_add_table::show_melody_edit() { } void View_edit_add_table::show_melody_add() { + gtk_entry_set_input_purpose(GTK_ENTRY(entryCol2->gobj()),GTK_INPUT_PURPOSE_FREE_FORM); btnSaveEditSave->set_sensitive(false); chkAddEdit->set_active(false); entryCol1->set_text(""); @@ -191,6 +193,7 @@ void View_edit_add_table::show_melody_add() { this->show(); } void View_edit_add_table::show_user_edit() { + gtk_entry_set_input_purpose(GTK_ENTRY(entryCol2->gobj()),GTK_INPUT_PURPOSE_PASSWORD); lblAddEditCheckBox->set_text(string(str_administrator) + ":"); lblAddEditCol1->set_text(string(str_user) + ":"); lblAddEditCol2->set_text(string(str_password) + ":"); @@ -201,6 +204,7 @@ void View_edit_add_table::show_user_edit() { } void View_edit_add_table::show_user_add() { + gtk_entry_set_input_purpose(GTK_ENTRY(entryCol2->gobj()),GTK_INPUT_PURPOSE_PASSWORD); btnSaveEditSave->set_sensitive(false); chkAddEdit->set_active(false); entryCol1->set_text(""); diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 885006e..9ffb834 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -9,15 +9,6 @@ - - both - True - - - - - - False False @@ -1044,6 +1035,9 @@ True True + + + @@ -1169,6 +1163,9 @@ True True + + + @@ -1294,6 +1291,9 @@ True True + + + @@ -1585,6 +1585,15 @@ + + both + True + + + + + + both True