From ff4051d9a29f006bcbc87c692cce5844e5ef6f66 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 10:58:39 +0600 Subject: [PATCH 1/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B2=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=8E=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-bootloader.glade | 65 ++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 9ffb834..1477787 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -130,21 +130,6 @@ True False - - - 1 - 1 - True - False - **** - 0.009999999776482582 - - - True - True - 0 - - 1 @@ -153,25 +138,51 @@ True True - + True - True - False - True - right + False - + + 1 + 1 + True + False + **** + 0.009999999776482582 + + + True + True + 0 + + + + + True + True + False + True + right + + + + + + + False + True + 1 + - - False + True True 1 From 594ed6f847f625a488fe2b81bf1a329703ed3c76 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 11:07:07 +0600 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-bootloader.glade | 89 ++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 18 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 1477787..ecee026 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 From 6ae0a60b61922eab2b8d0703f2fc0b6b84eceb20 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 12:00:34 +0600 Subject: [PATCH 3/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B2=20.desktop=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-bootloader.css | 10 +++++++--- ubl-settings-bootloader.desktop | 10 +++++----- ubl-settings-bootloader.glade | 3 +++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css index 34e17f4..5c7c820 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,10 @@ opacity:0.99; } .addbg * { background-color: @theme_bg_color; -} \ No newline at end of file +} + +.offset_revealer{ + background-color: green; + margin:0 2px 0 2px; + padding: 3px 10px 3px 5px; + } \ No newline at end of file diff --git a/ubl-settings-bootloader.desktop b/ubl-settings-bootloader.desktop index 9bdf501..98c2654 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 ecee026..b128898 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -201,6 +201,7 @@ True False **** + True 0.009999999776482582 @@ -253,6 +254,7 @@ 1 True False + True 0 @@ -1887,6 +1889,7 @@ From db23b59fbacd8caddc810c81611514c34c8fb798 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 13:50:18 +0600 Subject: [PATCH 4/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20comboBox=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=B7=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- #ubl-settings-bootloader.glade# | 2398 +++++++++++++++++++++++++++++ source/ubl-settings-bootloader.cc | 3 + 2 files changed, 2401 insertions(+) create mode 100644 #ubl-settings-bootloader.glade# diff --git a/#ubl-settings-bootloader.glade# b/#ubl-settings-bootloader.glade# new file mode 100644 index 0000000..06d1178 --- /dev/null +++ b/#ubl-settings-bootloader.glade# @@ -0,0 +1,2398 @@ + + + + + + + both + True + + + + + False + False + True + center + com.ublinux.ubl-settings-diskquota + dialog + True + True + ubl-settings-bootloader + 1.0 + Copyright © 2022 - 2023, UBSoft LLC + ubl-settings-bootloader + https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ + Project Home Page + Это приложение распространяется без каких-либо гарантий. +Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. + UBGroup + UBGroup + UBGroup + UBGroup + com.ublinux.ubl-settings-bootloader + True + gpl-2-0 + + + True + False + vertical + 2 + + + False + end + + + False + False + 1 + + + + + + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + ubl-settings-bootloader + + + + + + + + + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + com.ublinux.ubl-settings-bootloader + + + False + True + 0 + + + + + True + False + + + 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 + True + 1 + + + + + True + False + + + 1 + 1 + True + True + True + + + True + False + + + 1 + 1 + True + False + **** + True + 0.009999999776482582 + + + True + True + 0 + + + + + True + True + False + True + right + + + + + + + False + True + 1 + + + + + + + True + True + 1 + + + + + 1 + 1 + True + True + True + + + 1 + 1 + True + False + True + 0 + + + + + True + False + + + True + False + False + False + 4 + + + True + False + Load global configuration + + + + + + True + False + Load local configuration + + + + + + True + False + False + False + 4 + + + True + False + Help + + + + + + True + False + About + + + + + + True + False + False + False + 4 + + + True + False + Save to global and local configuration + + + + + + True + False + Save global configuration + + + + + + True + False + Save local configuration + + + + + + 650 + 500 + False + com.ublinux.ubl-settings-bootloader + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + 1 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + + + 81 + True + False + start + + + -1 + + + + + False + True + 1 + + + + + True + True + in + + + True + False + + + True + False + vertical + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + + + True + False + + + 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 + + + True + False + 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 + 1 + + + + + True + False + + + 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 + + dzfbfb + + + + True + True + 1 + + + + + False + True + 2 + + + + + True + False + 5 + 10 + 5 + 10 + 5 + 5 + 0.019999999552965164 + in + + + True + False + + + True + False + 5 + + + True + False + vertical + + + 100 + True + True + 5 + 3 + 5 + 3 + 5 + in + + + True + False + + + True + True + + + + + + + + + + False + True + 0 + + + + + + + True + True + 0 + + + + + True + False + vertical + + + True + 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 + + + + + True + True + True + 5 + 10 + 5 + 10 + 3 + 10 + + + True + False + gtk-remove + + + + + False + True + 2 + + + + + False + True + 1 + + + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Boot Menu Users + start + + + + + False + True + 5 + + + + + True + False + 5 + 10 + 5 + 10 + 5 + 5 + 0.019999999552965164 + in + + + True + False + + + True + False + 5 + + + True + False + vertical + + + 100 + True + True + 5 + 5 + 5 + 5 + 5 + in + + + True + False + + + True + True + + + + + + + + + + False + True + 0 + + + + + + + True + True + 0 + + + + + True + False + vertical + + + True + 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 + + + + + True + True + True + 5 + 10 + 5 + 10 + 3 + 10 + + + True + False + gtk-remove + + + + + False + True + 2 + + + + + False + True + 1 + + + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Ringtone at startup + start + + + + + False + True + 5 + + + + + -1 + + + + + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Download menu + + + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + + + True + False + vertical + + + 140 + True + True + 5 + 10 + 5 + 10 + 5 + 5 + in + + + True + False + + + True + True + + + + + + + + + + False + True + 0 + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 1 + 5 + Command line parameters: + + + False + True + 0 + + + + + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + True + 1 + + + + + False + True + 10 + + + + + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Parameters passed to the kernel + start + + + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + + + True + False + vertical + + + 140 + True + True + 5 + 10 + 5 + 10 + 5 + 5 + in + + + True + False + + + True + True + + + + + + + + + + False + True + 1 + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 1 + 5 + Command line parameters: + + + False + True + 0 + + + + + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + True + 1 + + + + + False + True + 7 + + + + + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Terminal for input + start + + + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + + + True + False + vertical + + + 140 + True + True + 5 + 10 + 5 + 10 + 5 + 5 + in + + + True + False + + + True + True + + + + + + + + + + False + True + 0 + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 1 + 5 + Command line parameters: + + + False + True + 0 + + + + + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + True + 1 + + + + + False + True + 7 + + + + + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + Terminal for output + start + + + + + False + True + 3 + + + + + False + True + 5 + + + + + + + + + True + True + 2 + + + + + + + True + False + True + + + True + False + ubl-settings-bootloader + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-bootloader + + + + + True + False + + + True + False + + + True + True + False + True + True + menu2 + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Save + + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + True + True + False + True + True + menu1 + none + + + True + False + open-menu-symbolic + + + + + False + True + 1 + + + + + + False + True + 0 + + + + + end + 1 + + + + + True + False + + + True + True + False + True + True + menu + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Load + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + + 2 + + + + + + + both + True + + + + + + + + both + True + + + + + + + + + + + + + + + False + Внимание! + center + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 5 + 5 + 5 + 5 + 5 + 5 + Warning! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + + + True + False + none + + + True + False + vertical + + + + + + + + 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 + True + com.ublinux.ubl-settings-datetime + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + label + 0 + + + False + True + 0 + + + + + True + True + False + 5 + 5 + 5 + 5 + 7 + 5 + True + + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + label + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + label + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 1 + + + + + False + True + 1 + + + + + True + True + 1 + + + + + True + False + + + True + False + + + False + True + 0 + + + + + gtk-cancel + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + end + 1 + + + + + gtk-save + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + end + 1 + + + + + False + True + 3 + + + + + + + True + False + True + + + True + False + ubl-settings-bootloader + + + + + True + False + 32 + com.ublinux.ubl-settings-bootloader + 5 + + + + + + + + + + + + + + + False + start + start + False + 450 + 250 + dialog-question-symbolic + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 5 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + 0 + + + + True + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 30 + True + + + Cancel + True + True + True + + + + True + True + 0 + + + + + Read Online + True + True + True + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + ubl-settings-bootloader + + + + + + + + True + False + 32 + dialog-question-symbolic + + + + + + + 800 + 600 + False + True + True + com.ublinux.ubl-settings-datetime + + + + + + True + False + True + + + True + False + ubl-settings-bootloader + + + + + True + False + 32 + com.ublinux.ubl-settings-bootloader + 5 + + + + + + diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 331071d..74f85c6 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; From 8ff7905271896a6eedc3879ed5807d76a2a7caa1 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 13:51:21 +0600 Subject: [PATCH 5/6] fix --- #ubl-settings-bootloader.glade# | 2398 ------------------------------- 1 file changed, 2398 deletions(-) delete mode 100644 #ubl-settings-bootloader.glade# diff --git a/#ubl-settings-bootloader.glade# b/#ubl-settings-bootloader.glade# deleted file mode 100644 index 06d1178..0000000 --- a/#ubl-settings-bootloader.glade# +++ /dev/null @@ -1,2398 +0,0 @@ - - - - - - - both - True - - - - - False - False - True - center - com.ublinux.ubl-settings-diskquota - dialog - True - True - ubl-settings-bootloader - 1.0 - Copyright © 2022 - 2023, UBSoft LLC - ubl-settings-bootloader - https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ - Project Home Page - Это приложение распространяется без каких-либо гарантий. -Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. - UBGroup - UBGroup - UBGroup - UBGroup - com.ublinux.ubl-settings-bootloader - True - gpl-2-0 - - - True - False - vertical - 2 - - - False - end - - - False - False - 1 - - - - - - - - - - True - False - True - - - True - False - 5 - 5 - 5 - 5 - 2 - ubl-settings-bootloader - - - - - - - - - - True - False - - - 90 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - com.ublinux.ubl-settings-bootloader - - - False - True - 0 - - - - - True - False - - - 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 - True - 1 - - - - - True - False - - - 1 - 1 - True - True - True - - - True - False - - - 1 - 1 - True - False - **** - True - 0.009999999776482582 - - - True - True - 0 - - - - - True - True - False - True - right - - - - - - - False - True - 1 - - - - - - - True - True - 1 - - - - - 1 - 1 - True - True - True - - - 1 - 1 - True - False - True - 0 - - - - - True - False - - - True - False - False - False - 4 - - - True - False - Load global configuration - - - - - - True - False - Load local configuration - - - - - - True - False - False - False - 4 - - - True - False - Help - - - - - - True - False - About - - - - - - True - False - False - False - 4 - - - True - False - Save to global and local configuration - - - - - - True - False - Save global configuration - - - - - - True - False - Save local configuration - - - - - - 650 - 500 - False - com.ublinux.ubl-settings-bootloader - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - 1 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - - - 81 - True - False - start - - - -1 - - - - - False - True - 1 - - - - - True - True - in - - - True - False - - - True - False - vertical - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - - - True - False - - - 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 - - - True - False - 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 - 1 - - - - - True - False - - - 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 - - dzfbfb - - - - True - True - 1 - - - - - False - True - 2 - - - - - True - False - 5 - 10 - 5 - 10 - 5 - 5 - 0.019999999552965164 - in - - - True - False - - - True - False - 5 - - - True - False - vertical - - - 100 - True - True - 5 - 3 - 5 - 3 - 5 - in - - - True - False - - - True - True - - - - - - - - - - False - True - 0 - - - - - - - True - True - 0 - - - - - True - False - vertical - - - True - 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 - - - - - True - True - True - 5 - 10 - 5 - 10 - 3 - 10 - - - True - False - gtk-remove - - - - - False - True - 2 - - - - - False - True - 1 - - - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Boot Menu Users - start - - - - - False - True - 5 - - - - - True - False - 5 - 10 - 5 - 10 - 5 - 5 - 0.019999999552965164 - in - - - True - False - - - True - False - 5 - - - True - False - vertical - - - 100 - True - True - 5 - 5 - 5 - 5 - 5 - in - - - True - False - - - True - True - - - - - - - - - - False - True - 0 - - - - - - - True - True - 0 - - - - - True - False - vertical - - - True - 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 - - - - - True - True - True - 5 - 10 - 5 - 10 - 3 - 10 - - - True - False - gtk-remove - - - - - False - True - 2 - - - - - False - True - 1 - - - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Ringtone at startup - start - - - - - False - True - 5 - - - - - -1 - - - - - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Download menu - - - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - - - True - False - vertical - - - 140 - True - True - 5 - 10 - 5 - 10 - 5 - 5 - in - - - True - False - - - True - True - - - - - - - - - - False - True - 0 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 1 - 5 - Command line parameters: - - - False - True - 0 - - - - - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - True - 1 - - - - - False - True - 10 - - - - - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Parameters passed to the kernel - start - - - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - - - True - False - vertical - - - 140 - True - True - 5 - 10 - 5 - 10 - 5 - 5 - in - - - True - False - - - True - True - - - - - - - - - - False - True - 1 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 1 - 5 - Command line parameters: - - - False - True - 0 - - - - - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - True - 1 - - - - - False - True - 7 - - - - - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Terminal for input - start - - - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - - - True - False - vertical - - - 140 - True - True - 5 - 10 - 5 - 10 - 5 - 5 - in - - - True - False - - - True - True - - - - - - - - - - False - True - 0 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 1 - 5 - Command line parameters: - - - False - True - 0 - - - - - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - True - 1 - - - - - False - True - 7 - - - - - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - Terminal for output - start - - - - - False - True - 3 - - - - - False - True - 5 - - - - - - - - - True - True - 2 - - - - - - - True - False - True - - - True - False - ubl-settings-bootloader - - - - - - - - True - False - 32 - com.ublinux.ubl-settings-bootloader - - - - - True - False - - - True - False - - - True - True - False - True - True - menu2 - none - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Save - - - - False - True - 0 - - - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - - False - True - 0 - - - - - True - True - False - True - True - menu1 - none - - - True - False - open-menu-symbolic - - - - - False - True - 1 - - - - - - False - True - 0 - - - - - end - 1 - - - - - True - False - - - True - True - False - True - True - menu - none - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Load - - - False - True - 0 - - - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - - False - True - 0 - - - - - - 2 - - - - - - - both - True - - - - - - - - both - True - - - - - - - - - - - - - - - False - Внимание! - center - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 5 - 5 - 5 - 5 - 5 - 5 - Warning! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - - - True - False - none - - - True - False - vertical - - - - - - - - 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 - True - com.ublinux.ubl-settings-datetime - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - label - 0 - - - False - True - 0 - - - - - True - True - False - 5 - 5 - 5 - 5 - 7 - 5 - True - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - label - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - label - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 1 - - - - - False - True - 1 - - - - - True - True - 1 - - - - - True - False - - - True - False - - - False - True - 0 - - - - - gtk-cancel - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - end - 1 - - - - - gtk-save - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - end - 1 - - - - - False - True - 3 - - - - - - - True - False - True - - - True - False - ubl-settings-bootloader - - - - - True - False - 32 - com.ublinux.ubl-settings-bootloader - 5 - - - - - - - - - - - - - - - False - start - start - False - 450 - 250 - dialog-question-symbolic - - - True - False - vertical - - - True - False - - - True - False - start - 20 - 20 - dialog-question-symbolic - 5 - - - False - True - 0 - - - - - True - False - vertical - - - True - False - start - 10 - 5 - Would you like to read documentation in the Web? - True - 0 - - - - - - - False - True - 0 - - - - - True - False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is translated and supported by community. - True - 0 - - - - True - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - 10 - True - - - - False - True - 2 - - - - - - True - True - 1 - - - - - - True - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 30 - True - - - Cancel - True - True - True - - - - True - True - 0 - - - - - Read Online - True - True - True - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - ubl-settings-bootloader - - - - - - - - True - False - 32 - dialog-question-symbolic - - - - - - - 800 - 600 - False - True - True - com.ublinux.ubl-settings-datetime - - - - - - True - False - True - - - True - False - ubl-settings-bootloader - - - - - True - False - 32 - com.ublinux.ubl-settings-bootloader - 5 - - - - - - From 5144a2ae2592e002b9a7f9721e5f3a22d49418d4 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 14:27:47 +0600 Subject: [PATCH 6/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20css=20=D0=BE=D0=BA=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/menu_os.cc | 7 ++ source/menu_os.h | 1 + ubl-settings-bootloader.css | 11 ++- ubl-settings-bootloader.glade | 138 +++++++++++++++++++--------------- 4 files changed, 94 insertions(+), 63 deletions(-) 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/ubl-settings-bootloader.css b/ubl-settings-bootloader.css index 5c7c820..b9558d6 100644 --- a/ubl-settings-bootloader.css +++ b/ubl-settings-bootloader.css @@ -153,8 +153,11 @@ opacity:0.99; background-color: @theme_bg_color; } +.addbg_revealer * { + background-color: @theme_base_color; +} .offset_revealer{ - background-color: green; - margin:0 2px 0 2px; - padding: 3px 10px 3px 5px; - } \ No newline at end of file + border-width: 1px; + border-style: solid; + border-color: @theme_text_color; +} \ No newline at end of file diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index b128898..2457e21 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -211,7 +211,7 @@ - + True True False @@ -1789,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 + + + @@ -1879,17 +1898,18 @@ - - False - True - 1 - + + + +