Заменил название функций

pull/27/head
Igor Belitskiy 3 years ago
parent 471a92d7e9
commit 974114be0f

@ -12,9 +12,9 @@ bool flag_lock_help = false;
string version_application = "1.0"; string version_application = "1.0";
MainWindow* obj_main; MainWindow* obj_main;
void wrapper_synopsis_show() { void wrapper_help_show() {
obj_main->aboutWindows->hide(); 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) 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); btnSaveLocalGlob->set_sensitive(false);
} }
if (flag_lock_help == true) { 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<Gtk::ListStore>
cmds += param + " "; cmds += param + " ";
} }
for (size_t i = 0; i < vec_param.size(); i++) { 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]) { if (param == vec_param[i]) {
vec_param.erase(vec_param.begin() + i); vec_param.erase(vec_param.begin() + i);
} }
@ -393,7 +392,7 @@ void MainWindow::get_builder() {
builder->get_widget("boxColor", boxColor); builder->get_widget("boxColor", boxColor);
builder->get_widget("boxWidgetAll", boxWidgetAll); builder->get_widget("boxWidgetAll", boxWidgetAll);
builder->get_widget("aboutWindows", aboutWindows); builder->get_widget("aboutWindows", aboutWindows);
builder->get_widget("btnSynopsis", btnSynopsis); builder->get_widget("btnHelp", btnHelp);
builder->get_widget("btnAbout", btnAbout); builder->get_widget("btnAbout", btnAbout);
builder->get_widget("btnLoadLocal", btnLoadLocal); builder->get_widget("btnLoadLocal", btnLoadLocal);
builder->get_widget("btnLoadGlob", btnLoadGlob); builder->get_widget("btnLoadGlob", btnLoadGlob);
@ -466,7 +465,7 @@ void MainWindow::localization() {
lblInfoInputTerminal->set_text(terminal_for_input); lblInfoInputTerminal->set_text(terminal_for_input);
lblInfoOutputTerminal->set_text(terminal_for_output); lblInfoOutputTerminal->set_text(terminal_for_output);
chbLoadVariantSelectionTimer->set_label(boot_selection_menu_timer); chbLoadVariantSelectionTimer->set_label(boot_selection_menu_timer);
btnSynopsis->set_label(str_help); btnHelp->set_label(str_help);
btnAbout->set_label(str_about_1); btnAbout->set_label(str_about_1);
lblHeadeWndWeb->set_text(name_app); lblHeadeWndWeb->set_text(name_app);
btnSaveLocalGlob->set_label(save_all); 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() { 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();}); btnRemoveUser->signal_clicked().connect([&]() {remove_user();});
btnRemoveMusic->signal_clicked().connect([&]() {remove_melody();}); btnRemoveMusic->signal_clicked().connect([&]() {remove_melody();});
btnAddUser->signal_clicked().connect([&]() {string name = "", passwd = ""; btnAddUser->signal_clicked().connect([&]() {string name = "", passwd = "";
@ -607,7 +606,7 @@ void MainWindow::event() {
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;});
btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); 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();}); btnAbout->signal_activate().connect([&]() {aboutWindows->show();});
btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg)); btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg));
@ -1143,7 +1142,7 @@ void MainWindow::set_row(Glib::RefPtr<Gtk::ListStore> &list_store, int size, str
} }
} }
void MainWindow::synopsis_show() { void MainWindow::help_show() {
if (flag_open_browser == true) { if (flag_open_browser == true) {
this->open_browser(); this->open_browser();
} }

@ -229,7 +229,7 @@ public:
Gtk::Box *boxColor; Gtk::Box *boxColor;
Gtk::AboutDialog *aboutWindows; Gtk::AboutDialog *aboutWindows;
Gtk::MenuItem *btnAbout; Gtk::MenuItem *btnAbout;
Gtk::MenuItem *btnSynopsis; Gtk::MenuItem *btnHelp;
Gtk::MenuItem *btnSaveLocalGlob; Gtk::MenuItem *btnSaveLocalGlob;
Gtk::MenuItem *btnSaveLocal; Gtk::MenuItem *btnSaveLocal;
Gtk::MenuItem *btnSaveGlob; Gtk::MenuItem *btnSaveGlob;
@ -348,7 +348,7 @@ public:
vector<string> pars_os(vector<string> &os_control_list); vector<string> pars_os(vector<string> &os_control_list);
void fn_event_intelMax1(); void fn_event_intelMax1();
void fn_event_intelMax4(); void fn_event_intelMax4();
void synopsis_show(); void help_show();
void set_data_cfg(); void set_data_cfg();
void set_data_csv_melody(); void set_data_csv_melody();
vector<tuple<string, vector<string>>> format_os_list(vector<string> &os_control_list); vector<tuple<string, vector<string>>> format_os_list(vector<string> &os_control_list);
@ -409,4 +409,4 @@ private:
}; };
void help(); void help();
void wrapper_synopsis_show(); void wrapper_help_show();

@ -225,7 +225,7 @@ specified priority</property>
<property name="reserve-toggle-size">False</property> <property name="reserve-toggle-size">False</property>
<property name="rect-anchor-dy">4</property> <property name="rect-anchor-dy">4</property>
<child> <child>
<object class="GtkMenuItem" id="btnSynopsis"> <object class="GtkMenuItem" id="btnHelp">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Help</property> <property name="label" translatable="yes">Help</property>

Loading…
Cancel
Save