Исправлено меню со списком ос

pull/34/head
Igor Belitskiy 3 years ago
parent d8a7b177cd
commit 990e4f254d

@ -99,11 +99,15 @@ void Menu_os::close_revealer() {
}
}
void Menu_os::set_main_revealer(Gtk::Revealer *revealer) {
this->main_revealer = revealer;
}
void Menu_os::show() {
revealerL1->set_reveal_child(true);
revealerL2->set_reveal_child(false);
this->close_revealer();
popoverMenuOS->show_all();
main_revealer->set_reveal_child(true);
}
void Menu_os::event() {
btnToLev1->signal_clicked().connect(sigc::mem_fun(*this, &Menu_os::to_l1));
@ -130,10 +134,10 @@ void Menu_os::event_template(Gtk::Label* label, string& name_level, string& key)
else if (map_menu_level_1[key]->vec_menu_level_3.size() == 0) {
entry->set_text(name_level_1);
name_level_3 = "";
popoverMenuOS->hide();
main_revealer->set_reveal_child(false);
}
else {
popoverMenuOS->hide();
main_revealer->set_reveal_child(false);
entry->set_text(name_level_1 + name_level_3);
}
}
@ -141,7 +145,6 @@ void Menu_os::to_l1() {
revealerL1->set_reveal_child(true);
revealerL2->set_reveal_child(false);
map_menu_level_1[key_global]->revealer->set_reveal_child(false);
btnOpenMenuOS->signal_clicked().connect([&]() {popoverMenuOS->show_all();});
key_global = "";
}

@ -17,6 +17,7 @@ private:
Gtk::Revealer *revealerL1;
Gtk::Revealer *revealerL2;
Gtk::Button *btnToLev1;
Gtk::Revealer *main_revealer;
string str_last_launched_os = "";
private:
string name_level_1 = "";
@ -61,6 +62,7 @@ public:
void set_entry(Gtk::Entry *entry);
void event_template(Gtk::Label* label, string& name_level, string& key);
void event();
void set_main_revealer(Gtk::Revealer *revealer);
void set_btnOpenMenuOS(Gtk::Button *btnOpenMenuOS);
void to_l1();
~Menu_os();

@ -245,6 +245,7 @@ void MainWindow::settings() {
Gtk::Widget *boxWidget;
builder->get_widget("boxColor", boxWidget);
overHead->add_overlay(*boxWidget);
overMenuOS->add_overlay(*revilerMenuOS);
btnBoxAboutDialog->set_visible(false);
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
this->flag_block_gui();
@ -260,6 +261,7 @@ void MainWindow::settings() {
this->download_local_cfg();
this->download_globl_cfg();
vector<tuple<string, vector<string>>> vec_list_os = format_os_list(os_control_list);
obj_menu_os.set_main_revealer(revilerMenuOS);
obj_menu_os.set_builder(builder, path_glade);
obj_menu_os.set_map(vec_list_os);
obj_menu_os.set_entry(entrListOS);
@ -644,6 +646,8 @@ void MainWindow::get_builder() {
builder->get_widget("btnRemoveMusic", btnRemoveMusic);
builder->get_widget("btnEditMusic", btnEditMusic);
builder->get_widget("btnEditUser", btnEditUser);
builder->get_widget("revilerMenuOS", revilerMenuOS);
builder->get_widget("overMenuOS", overMenuOS);
}

@ -326,6 +326,8 @@ public:
Gtk::Window *wndShowWeb;
Gtk::Button *btnOpenMenuOS1;
Gtk::Entry *entrListOS;
Gtk::Overlay *overMenuOS;
Gtk::Revealer* revilerMenuOS;
std::vector<std::string> vec_Option_kernel;
std::vector<std::string> vec_Option_IPT;

@ -150,4 +150,7 @@ opacity:0.99;
}
.nobg{
background: none;
}
.addbg * {
background-color: @theme_bg_color;
}

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