Merge pull request 'Исправил открытие ссылки в окне "О программе"' (#37) from Igor1/ublexec:master into develop

Reviewed-on: #37
pull/38/head
Dmitry Razumov 3 years ago
commit a059d4a3e8

@ -8,6 +8,12 @@ string version_application = "2.24";
int socket_ext_id_I = 0; int socket_ext_id_I = 0;
int socket_trd_id_I = 0; int socket_trd_id_I = 0;
MainWindow* obj_main;
void wrapper_synopsis_show() {
obj_main->aboutWindows->hide();
obj_main->synopsis_show();
}
CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help) CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help)
: Glib::OptionGroup{p_name, p_description, p_help} { : Glib::OptionGroup{p_name, p_description, p_help} {
Glib::OptionEntry socketIDArg; Glib::OptionEntry socketIDArg;
@ -217,6 +223,7 @@ void MainWindow::localization() {
} }
void MainWindow::event() { void MainWindow::event() {
g_signal_connect(G_OBJECT(aboutWindows->gobj()), "activate-link", G_CALLBACK(wrapper_synopsis_show), this);
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));
@ -363,6 +370,7 @@ void MainWindow::open_browser() {
#else #else
this->template_open_browser(); this->template_open_browser();
#endif #endif
wndShowWeb->hide();
} }
void MainWindow::template_open_browser() { void MainWindow::template_open_browser() {
@ -466,6 +474,7 @@ void MainWindow::unselect_icon(Gtk::IconView *icon_entry) {
} }
void MainWindow::settings() { void MainWindow::settings() {
obj_main = this;
if (flag_prog_file == 1){ if (flag_prog_file == 1){
user_cmd = name_app_cmd; user_cmd = name_app_cmd;
} }

@ -335,5 +335,6 @@ private:
Gtk::Widget *parent; Gtk::Widget *parent;
}; };
void help(); void help();
void wrapper_synopsis_show();

Loading…
Cancel
Save