Исправлено открытие браузера

pull/34/head
Igor Belitskiy 3 years ago
parent 7684ea96ee
commit cf6cf2a807

@ -247,11 +247,6 @@ void MainWindow::settings() {
overHead->add_overlay(*boxWidget); overHead->add_overlay(*boxWidget);
btnBoxAboutDialog->set_visible(false); btnBoxAboutDialog->set_visible(false);
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
#ifdef WEBKIT_FOUND
one = WEBKIT_WEB_VIEW(webkit_web_view_new());
three = Glib::wrap(GTK_WIDGET(one));
wndWeb->add(*three);
#endif
this->flag_block_gui(); this->flag_block_gui();
if (this->check_root() == 0) { if (this->check_root() == 0) {
spbSecond->set_range(1, 60); spbSecond->set_range(1, 60);
@ -1444,7 +1439,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);
@ -1524,9 +1527,6 @@ void MainWindow::info_warning_error(int mess) {
} }
} }
MainWindow::~MainWindow() { MainWindow::~MainWindow() {
#ifdef WEBKIT_FOUND
free(one);
#endif
} }
void MainWindow::add_CSS() { void MainWindow::add_CSS() {

@ -339,7 +339,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
Gtk::TreeModel::Row row_kernel; Gtk::TreeModel::Row row_kernel;
Gtk::TreeModel::Row row_IPT; Gtk::TreeModel::Row row_IPT;

Loading…
Cancel
Save