diff --git a/source/menu_os.cc b/source/menu_os.cc index e22e32a..365f232 100644 --- a/source/menu_os.cc +++ b/source/menu_os.cc @@ -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 = ""; } diff --git a/source/menu_os.h b/source/menu_os.h index dfda82a..b4e3801 100644 --- a/source/menu_os.h +++ b/source/menu_os.h @@ -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(); diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 3eeda34..5d6e6c8 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -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>> 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); } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 38f86e9..399a601 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -326,6 +326,8 @@ public: Gtk::Window *wndShowWeb; Gtk::Button *btnOpenMenuOS1; Gtk::Entry *entrListOS; + Gtk::Overlay *overMenuOS; + Gtk::Revealer* revilerMenuOS; std::vector vec_Option_kernel; std::vector vec_Option_IPT; diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css index dcc568a..34e17f4 100644 --- a/ubl-settings-bootloader.css +++ b/ubl-settings-bootloader.css @@ -150,4 +150,7 @@ opacity:0.99; } .nobg{ background: none; +} +.addbg * { + background-color: @theme_bg_color; } \ No newline at end of file diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 52146b6..885006e 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -9,6 +9,15 @@ + + both + True + + + + + + False False @@ -409,94 +418,73 @@ False 5 - + True False - vertical - - - True - False - - - Boot selection menu timer - True - True - False - 3 - 5 - 3 - 5 - 5 - 5 - True - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Seconds - - - False - True - 2 - - - - - False - True - 0 - - True False + vertical - + True False - start - 5 - 5 - 5 - 5 - 5 - 5 - Default load - start - 0 + + + Boot selection menu timer + True + True + False + 3 + 5 + 3 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Seconds + + + False + True + 2 + + False @@ -505,81 +493,130 @@ - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 2 - - - - + True - True - True - 5 - 10 - 5 - 10 - 5 - 5 + False - + True False - image-loading-symbolic + start + 5 + 5 + 5 + 5 + 5 + 5 + Default load + start + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + True + True + 2 + + + + + True + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + image-loading-symbolic + + + + + False + True + 3 + False True - 3 + 1 - - - False - True - 1 - - - - - True - False - + True False - start - 5 - 5 - 5 - 5 - 5 - 5 - Load screen display mode: - start - 0 + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Load screen display mode: + start + 0 + + + False + True + 0 + + + + + True + False + 5 + 10 + 5 + 10 + 5 + 5 + + + True + True + 1 + + False True - 0 + 2 - + True False 5 @@ -588,58 +625,35 @@ 10 5 5 - - - True - True - 1 - - - - - False - True - 2 - - - - - True - False - 5 - 10 - 5 - 10 - 5 - 5 - 0.019999999552965164 - in - - - True - False + 0.019999999552965164 + in - + True False - 5 - + True False - vertical + 5 - - 100 + True - True - 3 - 5 - 3 - 5 - in + False + vertical - + + 100 + True + True + 5 + 3 + 5 + 3 + 5 + in + + True False @@ -651,173 +665,174 @@ + + + + False + True + 0 + - - False - True - 0 - - - - - - - True - True - 0 - - - - - True - False - vertical - - - True - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - False - list-add - - False + True True 0 - + True - True - True - 5 - 10 - 5 - 10 - 3 - 5 + False + vertical - + True - False - gtk-select-all + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + list-add + + + + False + True + 0 + - - - False - True - 1 - - - - - True - True - True - 5 - 10 - 5 - 10 - 3 - 10 - + True - False - gtk-remove + True + True + 5 + 10 + 5 + 10 + 3 + 5 + + + True + False + gtk-select-all + + + + False + True + 1 + + + + + True + True + True + 5 + 10 + 5 + 10 + 3 + 10 + + + True + False + gtk-remove + + + + + False + True + 2 + False True - 2 + 1 - - False - True - 1 - + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Boot Menu Users + start + + + False + True + 5 + - - + + True False - start 5 - 5 + 10 5 - 5 + 10 5 5 - Boot Menu Users - start - - - - - False - True - 5 - - - - - True - False - 5 - 10 - 5 - 10 - 5 - 5 - 0.019999999552965164 - in - - - True - False + 0.019999999552965164 + in - + True False - 5 - + True False - vertical + 5 - - 100 + True - True - 5 - 5 - 5 - 5 - in + False + vertical - + + 100 + True + True + 5 + 5 + 5 + 5 + 5 + in + + True False @@ -829,133 +844,138 @@ + + + + False + True + 0 + - - False - True - 0 - - - - - - - True - True - 0 - - - - - True - False - vertical - - - True - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - False - list-add - - False + True True 0 - + True - True - True - 5 - 10 - 5 - 10 - 3 - 5 + False + vertical - + True - False - gtk-select-all + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + list-add + + + + False + True + 0 + + + + + True + True + True + 5 + 10 + 5 + 10 + 3 + 5 + + + True + False + gtk-select-all + + + + + False + True + 1 + - - - False - True - 1 - - - - - True - True - True - 5 - 10 - 5 - 10 - 3 - 10 - + True - False - gtk-remove + True + True + 5 + 10 + 5 + 10 + 3 + 10 + + + True + False + gtk-remove + + + + False + True + 2 + False True - 2 + 1 - - False - True - 1 - + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Ringtone at startup + start + - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Ringtone at startup - start - + + False + True + 5 + - False - True - 5 + -1 @@ -1024,9 +1044,6 @@ True True - - - @@ -1152,9 +1169,6 @@ True True - - - @@ -1280,9 +1294,6 @@ True True - - - @@ -1583,15 +1594,6 @@ - - both - True - - - - - - @@ -1599,109 +1601,6 @@ - - False - btnOpenMenuOS1 - bottom - - - True - False - - - 0 - 0 - True - False - none - - - True - False - vertical - - - - - - - - True - True - 0 - - - - - 0 - 0 - True - False - none - True - - - True - False - vertical - - - 1 - 1 - True - True - True - - - True - True - False - True - left - - - - - - - - - False - True - 0 - - - - - True - False - vertical - - - - - - False - True - 1 - - - - - - - False - True - 1 - - - - - False Внимание! @@ -1804,6 +1703,119 @@ + + True + False + end + start + 5 + 5 + 10 + 10 + slide-right + + + True + False + + + 0 + 0 + True + False + none + + + True + False + vertical + + + + + + + + True + True + 0 + + + + + 0 + 0 + True + False + none + True + + + True + False + vertical + + + 1 + 1 + True + True + True + + + True + True + False + True + 0 + left + + + + + + + + + False + True + 0 + + + + + True + False + vertical + + + + + + False + True + 1 + + + + + + + False + True + 1 + + + + + + False True