Applications
/
ubl-settings-bootloader
10
0
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
pull/34/head
Igor Belitskiy 3 years ago
parent d8a7b177cd
commit 990e4f254d
6 changed files with 543 additions and 517 deletions
Show Stats Download Patch File Download Diff File

11
source/menu_os.cc
Unescape View File

@ -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 = "";
}

2
source/menu_os.h
Unescape View File

@ -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();

4
source/ubl-settings-bootloader.cc
Unescape View File

@ -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);
}

2
source/ubl-settings-bootloader.h
Unescape View File

@ -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;

3
ubl-settings-bootloader.css
Unescape View File

@ -151,3 +151,6 @@ opacity:0.99;
.nobg{
background: none;
}
.addbg * {
background-color: @theme_bg_color;
}

254
ubl-settings-bootloader.glade
Unescape View File

@ -9,6 +9,15 @@
</object>
<object class="GtkSizeGroup"/>
<object class="GtkSizeGroup"/>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="chbLoadVariantSelectionTimer"/>
<widget name="lblInfoDefaultDonw"/>
<widget name="lblDownloadMode"/>
</widgets>
</object>
<object class="GtkAboutDialog" id="aboutWindows">
<property name="can-focus">False</property>
<property name="resizable">False</property>
@ -408,6 +417,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="left-padding">5</property>
<child>
<object class="GtkOverlay" id="overMenuOS">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -633,6 +646,7 @@
<property name="height-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-left">5</property>
<property name="margin-right">3</property>
<property name="margin-start">5</property>
<property name="margin-end">3</property>
@ -811,6 +825,7 @@
<property name="height-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@ -959,6 +974,11 @@
</packing>
</child>
</object>
<packing>
<property name="index">-1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
@ -1024,9 +1044,6 @@
<object class="GtkTreeView" id="treeViewKernel">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
</child>
</object>
@ -1152,9 +1169,6 @@
<object class="GtkTreeView" id="treeViewIPT">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
</child>
</object>
@ -1280,9 +1294,6 @@
<object class="GtkTreeView" id="treeViewOTT">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
</child>
</object>
@ -1583,15 +1594,6 @@
<widget name="entryOTT"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="chbLoadVariantSelectionTimer"/>
<widget name="lblInfoDefaultDonw"/>
<widget name="lblDownloadMode"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="treeViewKernel"/>
@ -1599,109 +1601,6 @@
<widget name="treeViewOTT"/>
</widgets>
</object>
<object class="GtkPopover" id="popoverMenuOS">
<property name="can-focus">False</property>
<property name="relative-to">btnOpenMenuOS1</property>
<property name="position">bottom</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkRevealer" id="revealerL1">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<child>
<object class="GtkBox" id="boxLevel1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRevealer" id="revealerL2">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<property name="reveal-child">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="btnToLev1">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkMenuButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="direction">left</property>
<child>
<placeholder/>
</child>
<style>
<class name="thin"/>
<class name="nobg"/>
<class name="noborder"/>
</style>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="boxALLL3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="mess_sudo">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
@ -1804,6 +1703,119 @@
</object>
</child>
</object>
<object class="GtkRevealer" id="revilerMenuOS">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<property name="transition-type">slide-right</property>
<child>
<object class="GtkBox" id="popoverMenuOS">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkRevealer" id="revealerL1">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<child>
<object class="GtkBox" id="boxLevel1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRevealer" id="revealerL2">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<property name="reveal-child">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="btnToLev1">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkMenuButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="xalign">0</property>
<property name="direction">left</property>
<child>
<placeholder/>
</child>
<style>
<class name="thin"/>
<class name="nobg"/>
<class name="noborder"/>
</style>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="boxALLL3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<style>
<class name="addbg"/>
</style>
</object>
<object class="GtkWindow" id="wndAddEditData">
<property name="can-focus">False</property>
<property name="hexpand">True</property>

Write Preview
Loading…
Cancel
Save