Добавил добавление полей user и music

pull/18/head
Igor Belitskiy 3 years ago
parent 58340fdaff
commit cd033aee8b

@ -218,24 +218,31 @@ void MainWindow::fill_in_view() {
void MainWindow::view_add_colums_user(Gtk::TreeView &treeView) { void MainWindow::view_add_colums_user(Gtk::TreeView &treeView) {
treeView.append_column_editable(str_administrator, m_columns_user.check_button); treeView.append_column_editable(str_administrator, m_columns_user.check_button);
treeView.append_column(str_user, m_columns_user.name); treeView.append_column_editable(str_user, m_columns_user.name);
treeView.append_column(str_password, m_columns_user.password); treeView.append_column_editable(str_password, m_columns_user.password);
} }
void MainWindow::view_add_colums_music(Gtk::TreeView &treeView) { void MainWindow::view_add_colums_music(Gtk::TreeView &treeView) {
treeView.append_column_editable(str_active, m_columns_music.check_button); treeView.append_column_editable(str_active, m_columns_music.check_button);
treeView.append_column(str_option, m_columns_music.title); treeView.append_column_editable(str_option, m_columns_music.title);
treeView.append_column(str_melody_code, m_columns_music.melody_code); treeView.append_column_editable(str_melody_code, m_columns_music.melody_code);
} }
/*
void MainWindow::view_add_cell_111(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m) { void MainWindow::view_add_line_music(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m) {
row = *(list_store_m->append());
row[m_columns_music.check_button] = false;
row[m_columns_music.title] = "";
row[m_columns_music.melody_code] = "";
}
void MainWindow::view_add_line_user(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m) {
row = *(list_store_m->append()); row = *(list_store_m->append());
row[m_columns.check_button] = false; row[m_columns_user.check_button] = false;
row[m_columns.name] = ""; row[m_columns_user.name] = "";
row[m_columns.description] = ""; row[m_columns_user.password] = "";
} }
*/
void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&) { void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&) {
auto selection_IPT = treeViewIPT->get_selection(); auto selection_IPT = treeViewIPT->get_selection();
@ -529,6 +536,11 @@ void MainWindow::get_builder() {
builder->get_widget("lblBootMenuUsers", lblBootMenuUsers); builder->get_widget("lblBootMenuUsers", lblBootMenuUsers);
builder->get_widget("lblRingtoneStartup", lblRingtoneStartup); builder->get_widget("lblRingtoneStartup", lblRingtoneStartup);
builder->get_widget("btnAddUser", btnAddUser);
builder->get_widget("btnRemoveUser", btnRemoveUser);
builder->get_widget("btnAddMusic", btnAddMusic);
builder->get_widget("btnRemoveMusic", btnRemoveMusic);
} }
void MainWindow::localization(){ void MainWindow::localization(){
@ -760,7 +772,9 @@ void MainWindow::cmd_entry_all(Gtk::Entry &entry, string cmd_settings, string cm
} }
void MainWindow::event(){ void MainWindow::event() {
btnAddUser->signal_clicked().connect([&]() {view_add_line_user(row_user, list_store_user);});
btnAddMusic->signal_clicked().connect([&]() {view_add_line_music(row_music, list_store_music);});
btnOpenMenuOS->signal_clicked().connect([&]() {obj_menu_os.show();}); btnOpenMenuOS->signal_clicked().connect([&]() {obj_menu_os.show();});
btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();});
chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;});

@ -212,6 +212,10 @@ public:
Gtk::Label *lblInfoOutputTerminal; Gtk::Label *lblInfoOutputTerminal;
Gtk::Label *lblHeaderName; Gtk::Label *lblHeaderName;
Gtk::Label *lblInfoHead; Gtk::Label *lblInfoHead;
Gtk::Button *btnAddUser;
Gtk::Button *btnRemoveUser;
Gtk::Button *btnAddMusic;
Gtk::Button *btnRemoveMusic;
Gtk::CheckButton *chbVgaText; Gtk::CheckButton *chbVgaText;
Gtk::CheckButton *chbLoadVariantSelectionTimer; Gtk::CheckButton *chbLoadVariantSelectionTimer;
Gtk::Entry *entryKernel; Gtk::Entry *entryKernel;
@ -383,6 +387,8 @@ public:
void item_selected_OTT(const Gtk::TreeModel::Path &, const Gtk::TreeModel::iterator &); void item_selected_OTT(const Gtk::TreeModel::Path &, const Gtk::TreeModel::iterator &);
void item_selected_IPT(const Gtk::TreeModel::Path &, const Gtk::TreeModel::iterator &); void item_selected_IPT(const Gtk::TreeModel::Path &, const Gtk::TreeModel::iterator &);
string template_item_selected(int size, Glib::RefPtr<Gtk::ListStore> &list_store, string key); string template_item_selected(int size, Glib::RefPtr<Gtk::ListStore> &list_store, string key);
void view_add_line_user(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m);
void view_add_line_music(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m);
}; };
class SettingsPlug : public Gtk::Plug class SettingsPlug : public Gtk::Plug

@ -741,7 +741,7 @@ specified priority</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton"> <object class="GtkButton" id="btnAddUser">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
@ -766,7 +766,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton" id="btnRemoveUser">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
@ -887,7 +887,7 @@ specified priority</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton"> <object class="GtkButton" id="btnAddMusic">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
@ -912,7 +912,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton" id="btnRemoveMusic">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>

Loading…
Cancel
Save