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

Merge pull request 'master' (#38) from Igor1/ubl-settings-bootloader:master into develop

Browse Source 
Reviewed-on: #38
pull/39/head
Dmitry Razumov 3 years ago
parent 1a41a84398 5144a2ae25
commit b11e4c4f9a
6 changed files with 215 additions and 110 deletions
Show Stats Download Patch File Download Diff File

7
source/menu_os.cc
Unescape View File

@ -66,6 +66,13 @@ void Menu_os::init() {
map_menu_level_1[key]->boxLevel3 = NULL; map_menu_level_1[key]->boxLevel3 = NULL;
} }
size_t index_l3 = 0; size_t index_l3 = 0;
if (vec_value.size() == 0) {
builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
map_menu_level_1[key]->btnToL2AndLv3Image->hide();
}
else {
builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
}
for (string& str_level_3: vec_value) { for (string& str_level_3: vec_value) {
auto builder_level_3 = Gtk::Builder::create_from_file(path_glade); auto builder_level_3 = Gtk::Builder::create_from_file(path_glade);
map_menu_level_1[key]->vec_menu_level_3.push_back(new struct_menu_level_3); map_menu_level_1[key]->vec_menu_level_3.push_back(new struct_menu_level_3);

1
source/menu_os.h
Unescape View File

@ -36,6 +36,7 @@ private:
struct struct_menu_level1 { struct struct_menu_level1 {
Gtk::Label *lblRevL1; Gtk::Label *lblRevL1;
Gtk::Button *btnToL2AndLv3; Gtk::Button *btnToL2AndLv3;
Gtk::MenuButton* btnToL2AndLv3Image;
Gtk::Revealer *revealer; Gtk::Revealer *revealer;
Gtk::Box *boxLevel3; Gtk::Box *boxLevel3;
Gtk::Box *boxMenuLevel1; Gtk::Box *boxMenuLevel1;

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

@ -443,6 +443,7 @@ void MainWindow::get_download_mode(std::map <string, string> &map_temp) {
string value = iter_map_data->second; string value = iter_map_data->second;
if (value.length() != 0) { if (value.length() != 0) {
Utils::str_replace_all(value, "\"",""); Utils::str_replace_all(value, "\"","");
if (value == "splash") { if (value == "splash") {
cmbDownloadMode->set_active(0); cmbDownloadMode->set_active(0);
} }
@ -923,6 +924,7 @@ void MainWindow::check_resize_window() {
cmbDownloadMode->append(loading_animation_without); cmbDownloadMode->append(loading_animation_without);
cmbDownloadMode->append(no_loading_animation_800_600); cmbDownloadMode->append(no_loading_animation_800_600);
cmbDownloadMode->append(lack_loading_animation_800_600); cmbDownloadMode->append(lack_loading_animation_800_600);
this->get_download_mode(map_cmd_selection);
} }
else { else {
cmbDownloadMode->remove_all(); cmbDownloadMode->remove_all();
@ -930,6 +932,7 @@ void MainWindow::check_resize_window() {
cmbDownloadMode->append(loading_animation_without); cmbDownloadMode->append(loading_animation_without);
cmbDownloadMode->append(no_loading_animation); cmbDownloadMode->append(no_loading_animation);
cmbDownloadMode->append(lack_loading_animation); cmbDownloadMode->append(lack_loading_animation);
this->get_download_mode(map_cmd_selection);
} }
} }
old_height = height; old_height = height;

11
ubl-settings-bootloader.css
Unescape View File

@ -142,8 +142,6 @@ border:none;
background-color: transparent; background-color: transparent;
opacity:0.99; opacity:0.99;
} }
.thin{ .thin{
margin:0px; margin:0px;
padding: 0px; padding: 0px;
@ -153,4 +151,13 @@ opacity:0.99;
} }
.addbg * { .addbg * {
background-color: @theme_bg_color; background-color: @theme_bg_color;
}
.addbg_revealer * {
background-color: @theme_base_color;
}
.offset_revealer{
border-width: 1px;
border-style: solid;
border-color: @theme_text_color;
} }

10
ubl-settings-bootloader.desktop
Unescape View File

@ -1,11 +1,11 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=ubl-settings-bootloader Name=ubl-settings-bootloader
Name[ru]=Настройка загрузки системы Name[ru]=Загрузка системы
GenericName=Настройка загрузки системы GenericName=ubl-settings-bootloader
GenericName[ru]=Настройка загрузки системы GenericName[ru]=Загрузка системы
Comment=Bootloader setup application Comment=Configuring system boot parameters
Comment[ru]=Приложение для настройки параметров загрузки системы Comment[ru]=Настройка параметров загрузки системы
Type=Application Type=Application
Exec=pkexec ubl-settings-bootloader Exec=pkexec ubl-settings-bootloader
Icon=com.ublinux.ubl-settings-bootloader Icon=com.ublinux.ubl-settings-bootloader

293
ubl-settings-bootloader.glade
Unescape View File

@ -83,14 +83,15 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="width-request">90</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">5</property> <property name="margin-top">6</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">6</property>
<property name="pixel-size">69</property> <property name="pixel-size">69</property>
<property name="icon-name">com.ublinux.ubl-settings-bootloader</property> <property name="icon-name">com.ublinux.ubl-settings-bootloader</property>
</object> </object>
@ -101,24 +102,76 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="lblInfoHead"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">start</property> <child>
<property name="margin-left">5</property> <object class="GtkBox">
<property name="margin-right">5</property> <property name="visible">True</property>
<property name="margin-start">5</property> <property name="can-focus">False</property>
<property name="margin-end">5</property> <child>
<property name="margin-top">5</property> <object class="GtkBox">
<property name="margin-bottom">5</property> <property name="visible">True</property>
<property name="label" translatable="yes">ubl-settings-bootloader</property> <property name="can-focus">False</property>
<attributes> <property name="orientation">vertical</property>
<attribute name="weight" value="bold"/> <child>
<attribute name="size" value="15360"/> <object class="GtkLabel" id="lblInfoHead">
</attributes> <property name="width-request">255</property>
<style> <property name="visible">True</property>
<class name="textHead"/> <property name="can-focus">False</property>
</style> <property name="valign">end</property>
<property name="label" translatable="yes">ubl-settings-bootloader</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="15360"/>
</attributes>
<style>
<class name="textHead"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="headInfoLabel">
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="label" translatable="yes">Configuring system boot parameters</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="12288"/>
</attributes>
<style>
<class name="textHead"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -130,21 +183,6 @@
<object class="GtkBox" id="boxMenuLevel1"> <object class="GtkBox" id="boxMenuLevel1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child>
<object class="GtkLabel" id="lblRevL1">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">****</property>
<property name="xalign">0.009999999776482582</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="btnToL2AndLv3"> <object class="GtkButton" id="btnToL2AndLv3">
<property name="width-request">1</property> <property name="width-request">1</property>
@ -153,25 +191,52 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<child> <child>
<object class="GtkMenuButton"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="direction">right</property>
<child> <child>
<placeholder/> <object class="GtkLabel" id="lblRevL1">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">****</property>
<property name="wrap">True</property>
<property name="xalign">0.009999999776482582</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkMenuButton" id="btnToL2AndLv3Image">
<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">right</property>
<child>
<placeholder/>
</child>
<style>
<class name="noborder"/>
<class name="thin"/>
<class name="nobg"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<style>
<class name="noborder"/>
<class name="thin"/>
<class name="nobg"/>
</style>
</object> </object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -189,6 +254,7 @@
<property name="height-request">1</property> <property name="height-request">1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
</child> </child>
@ -1723,85 +1789,104 @@
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="transition-type">slide-right</property> <property name="transition-type">slide-right</property>
<child> <child>
<object class="GtkBox" id="popoverMenuOS"> <object class="GtkFrame">
<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-xalign">0</property>
<property name="shadow-type">in</property>
<child> <child>
<object class="GtkRevealer" id="revealerL1"> <object class="GtkAlignment">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="transition-type">none</property>
<child> <child>
<object class="GtkBox" id="boxLevel1"> <object class="GtkBox" id="popoverMenuOS">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<placeholder/> <object class="GtkRevealer" id="revealerL1">
</child> <property name="width-request">0</property>
</object> <property name="height-request">0</property>
</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="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="transition-type">none</property>
<child> <child>
<object class="GtkMenuButton"> <object class="GtkBox" id="boxLevel1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="focus-on-click">False</property> <property name="orientation">vertical</property>
<property name="receives-default">True</property>
<property name="xalign">0</property>
<property name="direction">left</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<style>
<class name="thin"/>
<class name="nobg"/>
<class name="noborder"/>
</style>
</object> </object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="boxALLL3"> <object class="GtkRevealer" id="revealerL2">
<property name="width-request">0</property>
<property name="height-request">0</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="transition-type">none</property>
<property name="reveal-child">True</property>
<child> <child>
<placeholder/> <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> </child>
</object> </object>
<packing> <packing>
@ -1813,16 +1898,18 @@
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child type="label_item">
<placeholder/>
</child>
<style>
<class name="offset_revealer"/>
</style>
</object> </object>
</child> </child>
<style> <style>
<class name="addbg"/> <class name="offset_revealer"/>
<class name="addbg_revealer"/>
</style> </style>
</object> </object>
<object class="GtkWindow" id="wndAddEditData"> <object class="GtkWindow" id="wndAddEditData">

Write Preview
Loading…
Cancel
Save