From cd033aee8b0102e1bad59e338205593b8e8fecde Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 2 May 2023 16:02:26 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20user=20=D0=B8=20music?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-bootloader.cc | 36 +++++++++++++++++++++---------- source/ubl-settings-bootloader.h | 6 ++++++ ubl-settings-bootloader.glade | 8 +++---- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index b44f98b..0c6a3fe 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -218,24 +218,31 @@ void MainWindow::fill_in_view() { void MainWindow::view_add_colums_user(Gtk::TreeView &treeView) { treeView.append_column_editable(str_administrator, m_columns_user.check_button); - treeView.append_column(str_user, m_columns_user.name); - treeView.append_column(str_password, m_columns_user.password); + treeView.append_column_editable(str_user, m_columns_user.name); + treeView.append_column_editable(str_password, m_columns_user.password); } void MainWindow::view_add_colums_music(Gtk::TreeView &treeView) { treeView.append_column_editable(str_active, m_columns_music.check_button); - treeView.append_column(str_option, m_columns_music.title); - treeView.append_column(str_melody_code, m_columns_music.melody_code); + treeView.append_column_editable(str_option, m_columns_music.title); + treeView.append_column_editable(str_melody_code, m_columns_music.melody_code); } -/* -void MainWindow::view_add_cell_111(Gtk::TreeModel::Row &row, Glib::RefPtr list_store_m) { + +void MainWindow::view_add_line_music(Gtk::TreeModel::Row &row, Glib::RefPtr 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 list_store_m) { row = *(list_store_m->append()); - row[m_columns.check_button] = false; - row[m_columns.name] = ""; - row[m_columns.description] = ""; + row[m_columns_user.check_button] = false; + row[m_columns_user.name] = ""; + row[m_columns_user.password] = ""; } -*/ + void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&) { auto selection_IPT = treeViewIPT->get_selection(); @@ -528,6 +535,11 @@ void MainWindow::get_builder() { builder->get_widget("treeViewMusic", treeViewMusic); builder->get_widget("lblBootMenuUsers", lblBootMenuUsers); 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); } @@ -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();}); btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 85d8e10..51d825d 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -212,6 +212,10 @@ public: Gtk::Label *lblInfoOutputTerminal; Gtk::Label *lblHeaderName; Gtk::Label *lblInfoHead; + Gtk::Button *btnAddUser; + Gtk::Button *btnRemoveUser; + Gtk::Button *btnAddMusic; + Gtk::Button *btnRemoveMusic; Gtk::CheckButton *chbVgaText; Gtk::CheckButton *chbLoadVariantSelectionTimer; Gtk::Entry *entryKernel; @@ -383,6 +387,8 @@ public: void item_selected_OTT(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 &list_store, string key); + void view_add_line_user(Gtk::TreeModel::Row &row, Glib::RefPtr list_store_m); + void view_add_line_music(Gtk::TreeModel::Row &row, Glib::RefPtr list_store_m); }; class SettingsPlug : public Gtk::Plug diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 2494146..6120f8a 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -741,7 +741,7 @@ specified priority False vertical - + True True True @@ -766,7 +766,7 @@ specified priority - + True True True @@ -887,7 +887,7 @@ specified priority False vertical - + True True True @@ -912,7 +912,7 @@ specified priority - + True True True