pull/11/head
Igor Belitskiy 3 years ago
parent 8a10a9af3c
commit 37512d22f2

File diff suppressed because it is too large Load Diff

@ -91,8 +91,8 @@ void MainWindow::settings(){
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);
one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); one = WEBKIT_WEB_VIEW( webkit_web_view_new() );
three = Glib::wrap( GTK_WIDGET( one ) ); three = Glib::wrap(GTK_WIDGET(one));
wndWeb->add( *three ); wndWeb->add(*three);
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);
@ -949,7 +949,9 @@ void MainWindow::info_warning_error(int mess) {
} }
} }
} }
MainWindow::~MainWindow() {
free(one);
}
void MainWindow::add_CSS(){ void MainWindow::add_CSS(){
Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create(); Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create();
cssProvider->load_from_path(path_css); cssProvider->load_from_path(path_css);

@ -116,7 +116,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Glib::RefPtr<Gtk::ListStore> list_store_OTT; Glib::RefPtr<Gtk::ListStore> list_store_OTT;
Gtk::Window *wndWeb; Gtk::Window *wndWeb;
Gtk::Widget *three; Gtk::Widget *three;
WebKitWebView * one; WebKitWebView *one;
void set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store, Gtk::Entry &entry, std::vector<std::string> &vec_Option, int size); void set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store, Gtk::Entry &entry, std::vector<std::string> &vec_Option, int size);
Gtk::TreeModel::Row row_kernel; Gtk::TreeModel::Row row_kernel;
Gtk::TreeModel::Row row_IPT; Gtk::TreeModel::Row row_IPT;
@ -149,6 +149,7 @@ class MainWindow : public Gtk::ApplicationWindow {
MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder); MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
MainWindow(Glib::RefPtr<Gtk::Builder> const& builder); MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
~MainWindow();
void get_menu_boot(std::map <string, string> &map_temp); void get_menu_boot(std::map <string, string> &map_temp);
void set_row_all(std::map <string, string> &map_cmd, Glib::RefPtr<Gtk::ListStore> &list_store, vector<string> &list_params, size_t size,string key); void set_row_all(std::map <string, string> &map_cmd, Glib::RefPtr<Gtk::ListStore> &list_store, vector<string> &list_params, size_t size,string key);
void set_row(Glib::RefPtr<Gtk::ListStore> &list_store, int size, std::string name, bool flag_chbox); void set_row(Glib::RefPtr<Gtk::ListStore> &list_store, int size, std::string name, bool flag_chbox);

@ -1309,7 +1309,7 @@ specified priority</property>
<object class="GtkLabel" id="lblHeadeWndWeb"> <object class="GtkLabel" id="lblHeadeWndWeb">
<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">ubl-settings-datetime</property> <property name="label" translatable="yes">ubl-settings-bootloader</property>
</object> </object>
</child> </child>
<child> <child>

Loading…
Cancel
Save