pull/34/head
Igor Belitskiy 3 years ago
parent 990e4f254d
commit 3807734088

@ -16,7 +16,6 @@ void Menu_os::set_last_launched_os(string str_last_launched_os) {
void Menu_os::set_builder(Glib::RefPtr<Gtk::Builder>& builder, string path_glade) { void Menu_os::set_builder(Glib::RefPtr<Gtk::Builder>& builder, string path_glade) {
this->builder = builder; this->builder = builder;
this->path_glade = path_glade; this->path_glade = path_glade;
builder->get_widget("popoverMenuOS", popoverMenuOS);
builder->get_widget("revealerL1", revealerL1); builder->get_widget("revealerL1", revealerL1);
builder->get_widget("revealerL2", revealerL2); builder->get_widget("revealerL2", revealerL2);
builder->get_widget("boxALLL3", boxALLL3); builder->get_widget("boxALLL3", boxALLL3);

@ -13,7 +13,6 @@ private:
Glib::RefPtr<Gtk::Builder> builder; Glib::RefPtr<Gtk::Builder> builder;
vector<tuple<string, vector<string>>> vec_list_os; vector<tuple<string, vector<string>>> vec_list_os;
Gtk::Popover *popoverMenuOS;
Gtk::Revealer *revealerL1; Gtk::Revealer *revealerL1;
Gtk::Revealer *revealerL2; Gtk::Revealer *revealerL2;
Gtk::Button *btnToLev1; Gtk::Button *btnToLev1;

@ -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() { 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) + ":"); lblAddEditCheckBox->set_text(string(str_active) + ":");
lblAddEditCol1->set_text(string(str_option) + ":"); lblAddEditCol1->set_text(string(str_option) + ":");
lblAddEditCol2->set_text(string(str_melody_code) + ":"); 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() { 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); btnSaveEditSave->set_sensitive(false);
chkAddEdit->set_active(false); chkAddEdit->set_active(false);
entryCol1->set_text(""); entryCol1->set_text("");
@ -191,6 +193,7 @@ void View_edit_add_table::show_melody_add() {
this->show(); this->show();
} }
void View_edit_add_table::show_user_edit() { 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) + ":"); lblAddEditCheckBox->set_text(string(str_administrator) + ":");
lblAddEditCol1->set_text(string(str_user) + ":"); lblAddEditCol1->set_text(string(str_user) + ":");
lblAddEditCol2->set_text(string(str_password) + ":"); 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() { 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); btnSaveEditSave->set_sensitive(false);
chkAddEdit->set_active(false); chkAddEdit->set_active(false);
entryCol1->set_text(""); entryCol1->set_text("");

@ -9,15 +9,6 @@
</object> </object>
<object class="GtkSizeGroup"/> <object class="GtkSizeGroup"/>
<object class="GtkSizeGroup"/> <object class="GtkSizeGroup"/>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="chbLoadVariantSelectionTimer"/>
<widget name="lblInfoDefaultDonw"/>
<widget name="lblDownloadMode"/>
</widgets>
</object>
<object class="GtkAboutDialog" id="aboutWindows"> <object class="GtkAboutDialog" id="aboutWindows">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="resizable">False</property> <property name="resizable">False</property>
@ -1044,6 +1035,9 @@
<object class="GtkTreeView" id="treeViewKernel"> <object class="GtkTreeView" id="treeViewKernel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1169,6 +1163,9 @@
<object class="GtkTreeView" id="treeViewIPT"> <object class="GtkTreeView" id="treeViewIPT">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1294,6 +1291,9 @@
<object class="GtkTreeView" id="treeViewOTT"> <object class="GtkTreeView" id="treeViewOTT">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1585,6 +1585,15 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="chbLoadVariantSelectionTimer"/>
<widget name="lblInfoDefaultDonw"/>
<widget name="lblDownloadMode"/>
</widgets>
</object>
<object class="GtkSizeGroup"> <object class="GtkSizeGroup">
<property name="mode">both</property> <property name="mode">both</property>
<property name="ignore-hidden">True</property> <property name="ignore-hidden">True</property>

Loading…
Cancel
Save