Исправил отступ в дочернем окне, исправил название главного окна

pull/13/head
Igor Belitskiy 2 years ago
parent e85b866f74
commit 208060bb7b

@ -22,7 +22,6 @@ private:
map_str_str map_global_cfg; map_str_str map_global_cfg;
map_str_str map_system_cfg; map_str_str map_system_cfg;
public: public:
Controller(/* args */);
~Controller(); ~Controller();
void settings(); void settings();
View_open_browser* obj_open_browser = new View_open_browser(); View_open_browser* obj_open_browser = new View_open_browser();

@ -46,7 +46,7 @@ int main(int argc, char** argv) {
auto builder = Gtk::Builder::create_from_file(path_glade); auto builder = Gtk::Builder::create_from_file(path_glade);
pars_flag(1, argc, argv); pars_flag(1, argc, argv);
Controller* wnd = nullptr; Controller* wnd = nullptr;
builder->get_widget_derived("MainWindow", wnd); builder->get_widget_derived("window", wnd);
auto r = app->run(*wnd); auto r = app->run(*wnd);
delete wnd; delete wnd;
return r; return r;

@ -57,6 +57,10 @@ void MainWindow::set_obj_view_edit_project(View_edit_project* obj_view_edit_proj
void MainWindow::settings() { void MainWindow::settings() {
this->get_builder(); this->get_builder();
this->lacalization(); this->lacalization();
Gtk::Widget *boxWidget;
builder->get_widget("boxColor", boxWidget);
HeadOverlay->add_overlay(*boxWidget);
ubl_make_plugs(boxSave, boxButton, (*socket_ext_id_I), (*socket_trd_id_I));
this->add_CSS(); this->add_CSS();
this->flag_block_gui(); this->flag_block_gui();
this->init_tree_view(); this->init_tree_view();
@ -74,10 +78,7 @@ void MainWindow::settings() {
info_status_app(info_box_error_css); info_status_app(info_box_error_css);
lblWarning->set_text(program_as_root); lblWarning->set_text(program_as_root);
} }
Gtk::Widget *boxWidget;
builder->get_widget("boxColor", boxWidget);
HeadOverlay->add_overlay(*boxWidget);
ubl_make_plugs(boxSave, boxButton, (*socket_ext_id_I), (*socket_trd_id_I));
} }

@ -75,8 +75,8 @@ class MainWindow {
Gtk::Label *headerTopic; Gtk::Label *headerTopic;
Gtk::Overlay *HeadOverlay; Gtk::Overlay *HeadOverlay;
Gtk::HeaderBar *headerBar; Gtk::HeaderBar *headerBar;
Gtk::Box *boxSave; Gtk::Widget *boxSave;
Gtk::Box *boxButton; Gtk::Widget *boxButton;
Gtk::Box *boxFuncs; Gtk::Box *boxFuncs;
Gtk::MenuButton *btnSave; Gtk::MenuButton *btnSave;
Gtk::MenuButton *btnLoad; Gtk::MenuButton *btnLoad;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save