Merge pull request 'Исправил очистку браузера' (#41) from Igor1/ublexec:master into develop

Reviewed-on: #41
pull/42/head
Dmitry Razumov 3 years ago
commit 57474bcdf9

@ -373,7 +373,15 @@ void MainWindow::open_help() {
void MainWindow::open_browser() { void MainWindow::open_browser() {
#ifdef WEBKIT_FOUND #ifdef WEBKIT_FOUND
webkit_web_view_load_uri(one, _(global_lick_doc.c_str())); if (my_web_kit) {
gtk_widget_destroy(GTK_WIDGET(my_web_kit));
}
my_web_kit = WEBKIT_WEB_VIEW(webkit_web_view_new());
three = Glib::wrap(GTK_WIDGET(my_web_kit));
wndWeb->add(*three);
webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str()));
wndWeb->show_all();
webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str()));
wndWeb->show_all(); wndWeb->show_all();
#else #else
this->template_open_browser(global_lick_doc); this->template_open_browser(global_lick_doc);
@ -521,11 +529,6 @@ void MainWindow::settings() {
btnBoxAboutDialog->set_visible(false); btnBoxAboutDialog->set_visible(false);
cmbTerminal->set_sensitive(false); cmbTerminal->set_sensitive(false);
ubl_make_plugs(boxAbout, boxAbout, socket_ext_id_I, 0); ubl_make_plugs(boxAbout, boxAbout, socket_ext_id_I, 0);
#ifdef WEBKIT_FOUND
one = WEBKIT_WEB_VIEW( webkit_web_view_new() );
three = Glib::wrap(GTK_WIDGET(one));
wndWeb->add(*three);
#endif
} }
void MainWindow::close_entry_app() { void MainWindow::close_entry_app() {

@ -294,7 +294,7 @@ public:
#ifdef WEBKIT_FOUND #ifdef WEBKIT_FOUND
Gtk::Window *wndWeb; Gtk::Window *wndWeb;
Gtk::Widget *three; Gtk::Widget *three;
WebKitWebView *one; WebKitWebView *my_web_kit = NULL;
#endif #endif
public: public:
string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "}; string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "};

Loading…
Cancel
Save