From 974114be0fa313500aacee89f1efbc14c7812497 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 12 May 2023 16:28:42 +0600 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-bootloader.cc | 17 ++++++++--------- source/ubl-settings-bootloader.h | 6 +++--- ubl-settings-bootloader.glade | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index b7b8ee4..05d66ee 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -12,9 +12,9 @@ bool flag_lock_help = false; string version_application = "1.0"; MainWindow* obj_main; -void wrapper_synopsis_show() { +void wrapper_help_show() { obj_main->aboutWindows->hide(); - obj_main->synopsis_show(); + obj_main->help_show(); } CmdArgParser::CmdArgParser(const string& p_name, const string& p_description, const string& p_help) @@ -189,7 +189,7 @@ void MainWindow::flag_block_gui() { btnSaveLocalGlob->set_sensitive(false); } if (flag_lock_help == true) { - btnSynopsis->set_sensitive(false); + btnHelp->set_sensitive(false); } } @@ -328,7 +328,6 @@ string MainWindow::template_item_selected(int size, Glib::RefPtr cmds += param + " "; } for (size_t i = 0; i < vec_param.size(); i++) { - // cout << (param == vec_param[i]) << " " << param << " " << vec_param[i] << endl; if (param == vec_param[i]) { vec_param.erase(vec_param.begin() + i); } @@ -393,7 +392,7 @@ void MainWindow::get_builder() { builder->get_widget("boxColor", boxColor); builder->get_widget("boxWidgetAll", boxWidgetAll); builder->get_widget("aboutWindows", aboutWindows); - builder->get_widget("btnSynopsis", btnSynopsis); + builder->get_widget("btnHelp", btnHelp); builder->get_widget("btnAbout", btnAbout); builder->get_widget("btnLoadLocal", btnLoadLocal); builder->get_widget("btnLoadGlob", btnLoadGlob); @@ -466,7 +465,7 @@ void MainWindow::localization() { lblInfoInputTerminal->set_text(terminal_for_input); lblInfoOutputTerminal->set_text(terminal_for_output); chbLoadVariantSelectionTimer->set_label(boot_selection_menu_timer); - btnSynopsis->set_label(str_help); + btnHelp->set_label(str_help); btnAbout->set_label(str_about_1); lblHeadeWndWeb->set_text(name_app); btnSaveLocalGlob->set_label(save_all); @@ -596,7 +595,7 @@ void MainWindow::cmd_entry_all(Gtk::Entry &entry, string cmd_settings, string cm } void MainWindow::event() { - g_signal_connect(G_OBJECT(aboutWindows->gobj()), "activate-link", G_CALLBACK(wrapper_synopsis_show), this); + g_signal_connect(G_OBJECT(aboutWindows->gobj()), "activate-link", G_CALLBACK(wrapper_help_show), this); btnRemoveUser->signal_clicked().connect([&]() {remove_user();}); btnRemoveMusic->signal_clicked().connect([&]() {remove_melody();}); btnAddUser->signal_clicked().connect([&]() {string name = "", passwd = ""; @@ -607,7 +606,7 @@ void MainWindow::event() { btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); - btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); + btnHelp->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::help_show)); btnAbout->signal_activate().connect([&]() {aboutWindows->show();}); btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg)); @@ -1143,7 +1142,7 @@ void MainWindow::set_row(Glib::RefPtr &list_store, int size, str } } -void MainWindow::synopsis_show() { +void MainWindow::help_show() { if (flag_open_browser == true) { this->open_browser(); } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 92fa7d8..0664385 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -229,7 +229,7 @@ public: Gtk::Box *boxColor; Gtk::AboutDialog *aboutWindows; Gtk::MenuItem *btnAbout; - Gtk::MenuItem *btnSynopsis; + Gtk::MenuItem *btnHelp; Gtk::MenuItem *btnSaveLocalGlob; Gtk::MenuItem *btnSaveLocal; Gtk::MenuItem *btnSaveGlob; @@ -348,7 +348,7 @@ public: vector pars_os(vector &os_control_list); void fn_event_intelMax1(); void fn_event_intelMax4(); - void synopsis_show(); + void help_show(); void set_data_cfg(); void set_data_csv_melody(); vector>> format_os_list(vector &os_control_list); @@ -409,4 +409,4 @@ private: }; void help(); -void wrapper_synopsis_show(); +void wrapper_help_show(); diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 0ee2ca6..fd90be3 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -225,7 +225,7 @@ specified priority False 4 - + True False Help