diff --git a/source/menu_os.cc b/source/menu_os.cc index 46378a9..3d5c578 100644 --- a/source/menu_os.cc +++ b/source/menu_os.cc @@ -66,6 +66,13 @@ void Menu_os::init() { map_menu_level_1[key]->boxLevel3 = NULL; } 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) { 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); diff --git a/source/menu_os.h b/source/menu_os.h index 01e3051..29e3508 100644 --- a/source/menu_os.h +++ b/source/menu_os.h @@ -36,6 +36,7 @@ private: struct struct_menu_level1 { Gtk::Label *lblRevL1; Gtk::Button *btnToL2AndLv3; + Gtk::MenuButton* btnToL2AndLv3Image; Gtk::Revealer *revealer; Gtk::Box *boxLevel3; Gtk::Box *boxMenuLevel1; diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 71aa11a..78d173f 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -443,6 +443,7 @@ void MainWindow::get_download_mode(std::map &map_temp) { string value = iter_map_data->second; if (value.length() != 0) { Utils::str_replace_all(value, "\"",""); + if (value == "splash") { cmbDownloadMode->set_active(0); } @@ -923,6 +924,7 @@ void MainWindow::check_resize_window() { cmbDownloadMode->append(loading_animation_without); cmbDownloadMode->append(no_loading_animation_800_600); cmbDownloadMode->append(lack_loading_animation_800_600); + this->get_download_mode(map_cmd_selection); } else { cmbDownloadMode->remove_all(); @@ -930,6 +932,7 @@ void MainWindow::check_resize_window() { cmbDownloadMode->append(loading_animation_without); cmbDownloadMode->append(no_loading_animation); cmbDownloadMode->append(lack_loading_animation); + this->get_download_mode(map_cmd_selection); } } old_height = height; diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css index 34e17f4..b9558d6 100644 --- a/ubl-settings-bootloader.css +++ b/ubl-settings-bootloader.css @@ -142,8 +142,6 @@ border:none; background-color: transparent; opacity:0.99; } - - .thin{ margin:0px; padding: 0px; @@ -153,4 +151,13 @@ opacity:0.99; } .addbg * { 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; } \ No newline at end of file diff --git a/ubl-settings-bootloader.desktop b/ubl-settings-bootloader.desktop index 6d7e1d8..f7ad492 100644 --- a/ubl-settings-bootloader.desktop +++ b/ubl-settings-bootloader.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Name=ubl-settings-bootloader -Name[ru]=Настройка загрузки системы -GenericName=Настройка загрузки системы -GenericName[ru]=Настройка загрузки системы -Comment=Bootloader setup application -Comment[ru]=Приложение для настройки параметров загрузки системы +Name[ru]=Загрузка системы +GenericName=ubl-settings-bootloader +GenericName[ru]=Загрузка системы +Comment=Configuring system boot parameters +Comment[ru]=Настройка параметров загрузки системы Type=Application Exec=pkexec ubl-settings-bootloader Icon=com.ublinux.ubl-settings-bootloader diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 9ffb834..2457e21 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -83,14 +83,15 @@ False + 90 True False 5 5 5 5 - 5 - 5 + 6 + 6 69 com.ublinux.ubl-settings-bootloader @@ -101,24 +102,76 @@ - + True False - start - 5 - 5 - 5 - 5 - 5 - 5 - ubl-settings-bootloader - - - - - + + + True + False + + + True + False + vertical + + + 255 + True + False + end + ubl-settings-bootloader + 0 + + + + + + + + True + True + 0 + + + + + 255 + True + False + start + Configuring system boot parameters + 0 + + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + True + 0 + + True @@ -130,21 +183,6 @@ True False - - - 1 - 1 - True - False - **** - 0.009999999776482582 - - - True - True - 0 - - 1 @@ -153,25 +191,52 @@ True True - + True - True - False - True - right + False - + + 1 + 1 + True + False + **** + True + 0.009999999776482582 + + + True + True + 0 + + + + + True + True + False + True + right + + + + + + + False + True + 1 + - - False + True True 1 @@ -189,6 +254,7 @@ 1 True False + True 0 @@ -1723,85 +1789,104 @@ 10 slide-right - + True False + 0 + in - - 0 - 0 + True False - none - + True False - vertical - - - - - - - True - True - 0 - - - - - 0 - 0 - True - False - none - True - - - True - False - vertical - - - 1 - 1 + + 0 + 0 True - True - True + False + none - + True - True - False - True - 0 - left + False + vertical - - False + True True 0 - + + 0 + 0 True False - vertical + 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 + + + @@ -1813,16 +1898,18 @@ - - False - True - 1 - + + + +