From 1a8c26ede7fd20eb8ab62c679ded483b82ff384c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 10:46:38 +0600 Subject: [PATCH 01/25] Fixed bugged windows --- ubl-settings-bootloader.glade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 2457e21..69a86ce 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -760,7 +760,7 @@ True False - list-add + value-increase-symbolic @@ -785,7 +785,7 @@ True False - gtk-select-all + document-edit-symbolic @@ -810,7 +810,7 @@ True False - gtk-remove + user-trash-symbolic @@ -939,7 +939,7 @@ True False - list-add + value-increase-symbolic @@ -964,7 +964,7 @@ True False - gtk-select-all + document-edit-symbolic @@ -989,7 +989,7 @@ True False - gtk-remove + user-trash-symbolic @@ -1705,7 +1705,7 @@ 5 5 50 - gtk-dialog-warning + dialog-information-symbolic True -- 2.35.1 From 760028f187f7b3d2f9c373d77ff0dd515edb3ec6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 10:50:45 +0600 Subject: [PATCH 02/25] Fixed main window size --- ubl-settings-bootloader.glade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 69a86ce..d063a77 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -16,7 +16,6 @@ center com.ublinux.ubl-settings-diskquota dialog - True True ubl-settings-bootloader 1.0 @@ -355,8 +354,8 @@ - 650 - 500 + 800 + 600 False com.ublinux.ubl-settings-bootloader @@ -1679,6 +1678,8 @@ False Внимание! + False + True center dialog @@ -2180,9 +2181,8 @@ False - start - start False + True 450 250 dialog-question-symbolic -- 2.35.1 From 0b535a2afb92ca79486aaaa066538e69da583c2d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 12:52:24 +0600 Subject: [PATCH 03/25] Fixed editing latest user and melody instead of chosen --- source/main.cc | 10 +++++----- source/ubl-settings-bootloader.cc | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/source/main.cc b/source/main.cc index fc2d996..a5891ca 100644 --- a/source/main.cc +++ b/source/main.cc @@ -9,11 +9,11 @@ int main(int argc, char** argv) { for (int i=1; i 1){ str_argv = argv[1]; } diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 5164cfc..a460bf4 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -857,6 +857,7 @@ void MainWindow::event() { } } void MainWindow::wrapper_edit_user(bool check, string column1, string column2) { + iter_user_del = this->treeViewUser->get_selection()->get_selected(); if (flag_validate_del_user && list_store_user->iter_is_valid(iter_user_del)) { Gtk::TreeModel::Row row = *iter_user_del; if(row) { @@ -867,6 +868,7 @@ void MainWindow::wrapper_edit_user(bool check, string column1, string column2) { } } void MainWindow::wrapper_edit_melody(bool check, string column1, string column2) { + iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { Gtk::TreeModel::Row row = *iter_melody_del; if(row) { @@ -878,6 +880,7 @@ void MainWindow::wrapper_edit_melody(bool check, string column1, string column2) } void MainWindow::wrapper_edit_show_user() { + iter_user_del = this->treeViewUser->get_selection()->get_selected(); if (flag_validate_del_user && list_store_user->iter_is_valid(iter_user_del)) { Gtk::TreeModel::Row row = *iter_user_del; if(row) { @@ -892,6 +895,7 @@ void MainWindow::wrapper_edit_show_user() { } void MainWindow::wrapper_edit_show_melody() { + iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { Gtk::TreeModel::Row row = *iter_melody_del; if(row) { -- 2.35.1 From 667226f5c08988f56477ed73404e1bd858fe3c87 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 13:21:29 +0600 Subject: [PATCH 04/25] Fixed deleting latest user and melody instead of chosen --- source/ubl-settings-bootloader.cc | 1 + ubl-settings-bootloader.glade | 1 + 2 files changed, 2 insertions(+) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index a460bf4..9ebca50 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -1140,6 +1140,7 @@ void MainWindow::remove_user() { } void MainWindow::remove_melody() { + iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { list_store_melody->erase(iter_melody_del); flag_validate_del_melody = false; diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index d063a77..e2536a5 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -1922,6 +1922,7 @@ True False + 5 vertical -- 2.35.1 From 15c6a4b29d86e88f545987cdcbef392cb6132d06 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 13:21:58 +0600 Subject: [PATCH 05/25] Fixed deleting latest user and melody instead of chosen --- source/ubl-settings-bootloader.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 9ebca50..d5d5e4b 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -1140,6 +1140,7 @@ void MainWindow::remove_user() { } void MainWindow::remove_melody() { + iter_user_del = this->treeViewUser->get_selection()->get_selected(); iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { list_store_melody->erase(iter_melody_del); -- 2.35.1 From 2b6f7144705ed07dd527a72287f40e292f790394 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:04:14 +0600 Subject: [PATCH 06/25] Fixed action block after first deletion --- source/ubl-settings-bootloader.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index d5d5e4b..ce059ed 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -253,7 +253,7 @@ void MainWindow::settings() { btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); this->flag_block_gui(); - if (this->check_root() == 0) { + if (this->check_root() == 1) { spbSecond->set_range(1, 60); spbSecond->set_increments(1.0, 1.0); spbSecond->set_value(1); @@ -836,7 +836,7 @@ void MainWindow::event() { entryKernel->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel)); entryIPT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT)); entryOTT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT)); - if (this->check_root() == 0) { + if (this->check_root() == 1) { Glib::RefPtr treeViewKernelModel = treeViewKernel->get_model(); treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); Glib::RefPtr treeViewIPTModel = treeViewIPT->get_model(); @@ -1123,6 +1123,7 @@ void MainWindow::wrapper_add_data_melody() { } void MainWindow::remove_user() { + iter_user_del = this->treeViewUser->get_selection()->get_selected(); if (flag_validate_del_user && list_store_user->iter_is_valid(iter_user_del)) { Gtk::TreeModel::Row row = *iter_user_del; if(row) { @@ -1131,25 +1132,24 @@ void MainWindow::remove_user() { map_cmd_selection[key] = ""; } list_store_user->erase(iter_user_del); - flag_validate_del_user = false; + flag_validate_del_user = true; info_status_app(info_box_ok_css); imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU); lblWarning->set_text(str_del_user); } - flag_validate_del_user = false; + flag_validate_del_user = true; } void MainWindow::remove_melody() { - iter_user_del = this->treeViewUser->get_selection()->get_selected(); iter_melody_del = this->treeViewMelody->get_selection()->get_selected(); if (flag_validate_del_melody && list_store_melody->iter_is_valid(iter_melody_del)) { list_store_melody->erase(iter_melody_del); - flag_validate_del_melody = false; + flag_validate_del_melody = true; info_status_app(info_box_ok_css); imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU); lblWarning->set_text(str_del_melody); } - flag_validate_del_melody = false; + flag_validate_del_melody = true; } void MainWindow::select_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) { -- 2.35.1 From b190902c20007229cfd28a2fda952f259bb3c83a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:11:51 +0600 Subject: [PATCH 07/25] Fixed documentation confirmation window size --- source/ubl-settings-bootloader.cc | 4 ++-- ubl-settings-bootloader.glade | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index ce059ed..64d8e8f 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -253,7 +253,7 @@ void MainWindow::settings() { btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); this->flag_block_gui(); - if (this->check_root() == 1) { + if (this->check_root() == 0) { spbSecond->set_range(1, 60); spbSecond->set_increments(1.0, 1.0); spbSecond->set_value(1); @@ -836,7 +836,7 @@ void MainWindow::event() { entryKernel->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_kernel)); entryIPT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_IPT)); entryOTT->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::focus_out_txt_OTT)); - if (this->check_root() == 1) { + if (this->check_root() == 0) { Glib::RefPtr treeViewKernelModel = treeViewKernel->get_model(); treeViewKernelModel->signal_row_changed().connect(sigc::mem_fun(*this, &MainWindow::item_selected_kernel)); Glib::RefPtr treeViewIPTModel = treeViewIPT->get_model(); diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index e2536a5..00d5c57 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -2185,7 +2185,6 @@ False True 450 - 250 dialog-question-symbolic -- 2.35.1 From f42ac419598c87d69c37124e00fd31e2a69d7286 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:19:48 +0600 Subject: [PATCH 08/25] Window minimum size reduced --- ubl-settings-bootloader.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 00d5c57..9902e49 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -354,8 +354,8 @@ - 800 - 600 + 784 + 556 False com.ublinux.ubl-settings-bootloader -- 2.35.1 From 11b549cb502f3b9456541e4c02353411f921bce7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:27:28 +0600 Subject: [PATCH 09/25] Fixed Save and Load buttons style --- source/ubl-settings-bootloader.cc | 2 -- ubl-settings-bootloader.css | 3 +++ ubl-settings-bootloader.glade | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 64d8e8f..315341c 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -690,8 +690,6 @@ void MainWindow::localization() { btnSaveGlob->set_label(save_global); btnLoadGlob->set_label(load_global); btnLoadLocal->set_label(load_local); - btnSave->set_label(str_save); - btnLoad->set_label(str_load); this->set_title(name_app); cmbDownloadMode->append(loading_animation_with); cmbDownloadMode->append(loading_animation_without); diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css index b9558d6..7ee9ef8 100644 --- a/ubl-settings-bootloader.css +++ b/ubl-settings-bootloader.css @@ -160,4 +160,7 @@ opacity:0.99; border-width: 1px; border-style: solid; border-color: @theme_text_color; +} +.bultar { + border:none; } \ No newline at end of file diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 9902e49..3910de8 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -1,6 +1,6 @@ - + -- 2.35.1 From 55d7e83ffdcbb9725e6548a0f2a35d7cc421de1e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:27:53 +0600 Subject: [PATCH 10/25] Fixed Save and Load buttons style --- ubl-settings-bootloader.glade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 3910de8..cee12b7 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -1571,6 +1571,7 @@ @@ -1641,6 +1642,7 @@ -- 2.35.1 From 35d794ca4ed555266659bdd6284f08595eeba529 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:36:18 +0600 Subject: [PATCH 11/25] English localisation fixes --- source/ubl-settings-bootloader.h | 4 ++-- ubl-settings-bootloader.pot | 4 ++-- ubl-settings-bootloader_ru.po | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 49c2281..cbe4980 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -44,12 +44,12 @@ void me_thread(string cmd); #define str_tooltip_del_melody _("Delete melody") #define str_tooltip_boot_menu _("Selecting the loading mode option") #define copyright _("Copyright © UBSoft LLC, 2022 - ") -#define name_app _("ubl-settings-bootloader") +#define name_app _("System boot") #define website _("https://wiki.ublinux.com") #define project_Home_page _("Project Home Page") #define configuring_system_boot _("Configuring system boot parameters") #define system_boot _("System boot setup") -#define str_about _("About ubl-settings-bootloader") +#define str_about _("About System boot") #define command_line_parameters _("Command line parameters:") #define load_default _("Load default:") #define seconds _("seconds") diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot index 7b40070..ef45bb8 100644 --- a/ubl-settings-bootloader.pot +++ b/ubl-settings-bootloader.pot @@ -92,7 +92,7 @@ msgid "About" msgstr "" #: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.h:43 -msgid "About ubl-settings-bootloader" +msgid "About System boot" msgstr "" #: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.h:91 @@ -568,7 +568,7 @@ msgstr "" #: source/ubl-settings-bootloader.cc:413 source/ubl-settings-bootloader.cc:418 #: source/ubl-settings-bootloader.cc:439 source/ubl-settings-bootloader.cc:281 #: source/ubl-settings-bootloader.cc:286 source/ubl-settings-bootloader.cc:309 -msgid "ubl-settings-bootloader" +msgid "System boot" msgstr "" #: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.h:78 diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po index 952e3ff..e1d4849 100644 --- a/ubl-settings-bootloader_ru.po +++ b/ubl-settings-bootloader_ru.po @@ -44,7 +44,7 @@ msgid "About" msgstr "О программе" #: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.h:43 -msgid "About ubl-settings-bootloader" +msgid "About System boot" msgstr "О программе Загрузка системы" #: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.h:91 @@ -605,7 +605,7 @@ msgstr "splash (Показать окно приветствия)" #: source/ubl-settings-bootloader.cc:413 source/ubl-settings-bootloader.cc:418 #: source/ubl-settings-bootloader.cc:439 source/ubl-settings-bootloader.cc:281 #: source/ubl-settings-bootloader.cc:286 source/ubl-settings-bootloader.cc:309 -msgid "ubl-settings-bootloader" +msgid "System boot" msgstr "Загрузка системы" #: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.h:78 -- 2.35.1 From 66328e25473c742aa562097f2b3276e009c74e11 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 10 Aug 2023 14:40:31 +0600 Subject: [PATCH 12/25] Localisation update --- source/ubl-settings-bootloader.h | 2 +- ubl-settings-bootloader.pot | 2 +- ubl-settings-bootloader_ru.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index cbe4980..afdb0e5 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -56,7 +56,7 @@ void me_thread(string cmd); #define download_menu _("Download menu") #define terminal_for_input _("Terminal for input") #define terminal_for_output _("Terminal for output") -#define boot_selection_menu_timer _("Boot selection menu timer") +#define boot_selection_menu_timer _("Boot selection menu timer:") #define str_help _("Help") #define str_about_1 _("About") #define str_save _("Save") diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot index ef45bb8..0b1739b 100644 --- a/ubl-settings-bootloader.pot +++ b/ubl-settings-bootloader.pot @@ -121,7 +121,7 @@ msgid "Boot screen display mode:" msgstr "" #: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.h:50 -msgid "Boot selection menu timer" +msgid "Boot selection menu timer:" msgstr "" #: source/ubl-settings-bootloader.h:62 source/ubl-settings-bootloader.h:61 diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po index e1d4849..2765046 100644 --- a/ubl-settings-bootloader_ru.po +++ b/ubl-settings-bootloader_ru.po @@ -73,8 +73,8 @@ msgid "Boot screen display mode:" msgstr "Режим отображения экрана загрузки:" #: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.h:50 -msgid "Boot selection menu timer" -msgstr "Таймер меню выбора варианта загрузки" +msgid "Boot selection menu timer:" +msgstr "Таймер меню выбора варианта загрузки:" #: source/ubl-settings-bootloader.h:62 source/ubl-settings-bootloader.h:61 msgid "Cancel" -- 2.35.1 From b18fe7a5a44688c6702399217acccb79ccabeb33 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 11 Aug 2023 09:37:42 +0600 Subject: [PATCH 13/25] Fixed duplicating of table rows --- source/ubl-settings-bootloader.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 315341c..f969815 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -862,6 +862,8 @@ void MainWindow::wrapper_edit_user(bool check, string column1, string column2) { row[m_columns_user.check_button] = check; row[m_columns_user.name] = column1; row[m_columns_user.password] = column2; + obj_view_edit_add_table.old_data.column1=""; + obj_view_edit_add_table.old_data.column2=""; } } } @@ -873,6 +875,8 @@ void MainWindow::wrapper_edit_melody(bool check, string column1, string column2) row[m_columns_user.check_button] = check; row[m_columns_user.name] = column1; row[m_columns_user.password] = column2; + obj_view_edit_add_table.old_data.column1=""; + obj_view_edit_add_table.old_data.column2=""; } } } -- 2.35.1 From a0597defc8c5793841dcce5772584cc12b895a86 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 10:25:41 +0600 Subject: [PATCH 14/25] Fixed global configuration loading at startup --- source/CMakeLists.txt | 2 +- source/ubl-settings-bootloader.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 67df707..2ea7fee 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -71,7 +71,7 @@ add_custom_target( set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection") + -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES menu_os.h diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index f969815..bb96791 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -263,7 +263,7 @@ void MainWindow::settings() { vector os_control_list; this->pars_os(os_control_list); this->download_local_cfg(); - this->download_globl_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); -- 2.35.1 From 809ad1964349b8b1a34d6caba3285197beaa0a79 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 10:33:01 +0600 Subject: [PATCH 15/25] localisation update --- source/ubl-settings-bootloader.h | 6 +++--- ubl-settings-bootloader.glade | 12 ++++++------ ubl-settings-bootloader.pot | 6 +++--- ubl-settings-bootloader_ru.po | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index afdb0e5..70e1555 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -46,7 +46,7 @@ void me_thread(string cmd); #define copyright _("Copyright © UBSoft LLC, 2022 - ") #define name_app _("System boot") #define website _("https://wiki.ublinux.com") -#define project_Home_page _("Project Home Page") +#define project_Home_page _("Project homepage") #define configuring_system_boot _("Configuring system boot parameters") #define system_boot _("System boot setup") #define str_about _("About System boot") @@ -81,8 +81,8 @@ void me_thread(string cmd); #define redirected_documentation _("You will be redirected to documentation website where documentation is\n""translated and supported by community.") #define user_name_configuration_editing_code _("User name to enter boot configuration editing mode") #define user_password_configuration_edit_mode _("User password to enter boot configuration edit mode") -#define loading_animation_with _("Loading animation with the magazine") -#define loading_animation_without _("Loading animation without a magazine") +#define loading_animation_with _("Loading animation with the journal") +#define loading_animation_without _("Loading animation without a journal") #define lack_loading_animation_800_600 _("Lack of loading animation with the\noutput of the abbreviated log") #define lack_loading_animation _("Lack of loading animation with the output of the abbreviated log") #define web_url _("https://wiki.ublinux.com") diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index cee12b7..ac9e773 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -68,7 +68,7 @@ 5 5 2 - ubl-settings-bootloader + System boot @@ -119,7 +119,7 @@ True False end - ubl-settings-bootloader + System boot 0 @@ -1471,7 +1471,7 @@ True False - ubl-settings-bootloader + System boot @@ -2159,7 +2159,7 @@ True False - ubl-settings-bootloader + System boot @@ -2363,7 +2363,7 @@ True False - ubl-settings-bootloader + System boot @@ -2399,7 +2399,7 @@ True False - ubl-settings-bootloader + System boot diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot index 0b1739b..c6dabe2 100644 --- a/ubl-settings-bootloader.pot +++ b/ubl-settings-bootloader.pot @@ -308,12 +308,12 @@ msgstr "" #: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 #: source/ubl-settings-bootloader.cc:448 -msgid "Loading animation with the magazine" +msgid "Loading animation with the journal" msgstr "" #: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 #: source/ubl-settings-bootloader.cc:449 -msgid "Loading animation without a magazine" +msgid "Loading animation without a journal" msgstr "" #: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 @@ -387,7 +387,7 @@ msgstr "" #: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.h:40 #: source/ubl-settings-bootloader.cc:416 source/ubl-settings-bootloader.cc:420 #: source/ubl-settings-bootloader.cc:284 source/ubl-settings-bootloader.cc:288 -msgid "Project Home Page" +msgid "Project homepage" msgstr "" #: source/ubl-settings-bootloader.h:61 source/ubl-settings-bootloader.h:60 diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po index 2765046..92d6c26 100644 --- a/ubl-settings-bootloader_ru.po +++ b/ubl-settings-bootloader_ru.po @@ -282,12 +282,12 @@ msgstr "Режим отображения экрана загрузки:" #: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 #: source/ubl-settings-bootloader.cc:448 -msgid "Loading animation with the magazine" +msgid "Loading animation with the journal" msgstr "Анимация загрузки с журналом" #: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 #: source/ubl-settings-bootloader.cc:449 -msgid "Loading animation without a magazine" +msgid "Loading animation without a journal" msgstr "Анимация загрузки без журнала" #: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 @@ -364,7 +364,7 @@ msgstr "Предотвращает переход процессора в сос #: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.h:40 #: source/ubl-settings-bootloader.cc:416 source/ubl-settings-bootloader.cc:420 #: source/ubl-settings-bootloader.cc:284 source/ubl-settings-bootloader.cc:288 -msgid "Project Home Page" +msgid "Project homepage" msgstr "Домашняя страница проекта" #: source/ubl-settings-bootloader.h:61 source/ubl-settings-bootloader.h:60 -- 2.35.1 From 666c1949eb54a63c257659fd3b64373d2b45ebbe Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 10:36:16 +0600 Subject: [PATCH 16/25] About window rename --- source/ubl-settings-bootloader.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index bb96791..73698ec 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -670,7 +670,6 @@ void MainWindow::localization() { aboutWindows->set_website_label(project_Home_page); lblInfoHead->set_text(name_app); lblHeaderName->set_text(name_app); - lblHeaderAboutTopic->set_label(str_about); lblBootMenuUsers->set_text(str_title_Boot_Menu_Users); lblRingtoneStartup->set_text(str_title_Ringtone_Startup); lblInfoCommand->set_text(command_line_parameters); -- 2.35.1 From 5927867ed63f74c7cb219f5c6361d941e804f7b7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 10:41:42 +0600 Subject: [PATCH 17/25] Properly icons are shown --- ubl-settings-bootloader.glade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index ac9e773..8463bbc 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -1683,6 +1683,7 @@ False True center + com.ublinux.ubl-settings-bootloader dialog @@ -1919,7 +1920,7 @@ False True True - com.ublinux.ubl-settings-datetime + com.ublinux.ubl-settings-bootloader True @@ -2187,7 +2188,7 @@ False True 450 - dialog-question-symbolic + com.ublinux.ubl-settings-bootloader True @@ -2386,7 +2387,7 @@ False True True - com.ublinux.ubl-settings-datetime + com.ublinux.ubl-settings-bootloader -- 2.35.1 From c5d36221278ec9f114f497c1b8aa63643de73981 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 10:45:42 +0600 Subject: [PATCH 18/25] Removed commentaries --- source/main.cc | 5 ----- source/menu_os.cc | 1 - source/ubl-settings-bootloader.cc | 13 ------------- 3 files changed, 19 deletions(-) diff --git a/source/main.cc b/source/main.cc index a5891ca..1c54a46 100644 --- a/source/main.cc +++ b/source/main.cc @@ -9,11 +9,6 @@ int main(int argc, char** argv) { for (int i=1; i 1){ str_argv = argv[1]; } diff --git a/source/menu_os.cc b/source/menu_os.cc index faee722..5e2bf02 100644 --- a/source/menu_os.cc +++ b/source/menu_os.cc @@ -135,7 +135,6 @@ void Menu_os::event_template(Gtk::Label* label, string& name_level, string& key) this->close_revealer(); revealer->set_reveal_child(true); name_level_3 = ""; - //entry->set_text(name_level_1); } else if (map_menu_level_1[key]->vec_menu_level_3.size() == 0) { entry->set_text(name_level_1); diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index 73698ec..b18da4a 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -263,13 +263,11 @@ void MainWindow::settings() { vector os_control_list; this->pars_os(os_control_list); 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); - // obj_menu_os.set_last_launched_os(map_global_cmd_selection["GRUB_DEFAULT"]); obj_menu_os.set_last_launched_os(this->str_last_launched_os); obj_menu_os.init(); obj_menu_os.event(); @@ -400,7 +398,6 @@ void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path&, const Gtk::Tr if (this->intel_idle_cstate_check(size_kernel, list_store_kernel, "GRUB_CMDLINE_LINUX") == false) { string str_flags = template_item_selected(size_kernel, list_store_kernel, "GRUB_CMDLINE_LINUX"); map_cmd_selection["GRUB_CMDLINE_LINUX"] = str_flags; - // Utils::str_replace_all(str_flags, " ", ", "); entryKernel->set_text(str_flags); } } @@ -415,7 +412,6 @@ void MainWindow::item_selected_OTT(const Gtk::TreeModel::Path&, const Gtk::TreeM if (this->intel_idle_cstate_check(size_OTT, list_store_OTT, "GRUB_TERMINAL_OUTPUT") == false) { string str_flags = template_item_selected(size_OTT, list_store_OTT, "GRUB_TERMINAL_OUTPUT"); map_cmd_selection["GRUB_TERMINAL_OUTPUT"] = str_flags; - // Utils::str_replace_all(str_flags, " ", ", "); entryOTT->set_text(str_flags); } } @@ -430,7 +426,6 @@ void MainWindow::item_selected_IPT(const Gtk::TreeModel::Path&, const Gtk::TreeM if (this->intel_idle_cstate_check(size_IPT, list_store_IPT, "GRUB_TERMINAL_INPUT") == false) { string str_flags = template_item_selected(size_IPT, list_store_IPT, "GRUB_TERMINAL_INPUT"); map_cmd_selection["GRUB_TERMINAL_INPUT"] = str_flags; - // Utils::str_replace_all(str_flags, " ", ", "); entryIPT->set_text(str_flags); } } @@ -756,7 +751,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store flag_blocked_tree_view = true; vector vec_params; std::string text = entry.get_text(); - // Utils::str_replace_all(text, " ", ""); vec_params = Utils::split(text, ' '); for (auto &name: vec_Option) { this->set_row(list_store, size, name, false); @@ -764,7 +758,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store for (auto &name: vec_params) { this->set_row(list_store, size, name, true); } - // Utils::str_replace_all(text, ",", " "); if (text.length() > 0) { if (text[0] == ' ') { text = text.substr(1, text.length() - 1); @@ -920,7 +913,6 @@ void MainWindow::check_resize_window() { else { height = plug->get_window()->get_height(); width = plug->get_window()->get_width(); - // lblInfoHead->set_text(to_string(height)); } if (height != old_height) { if (minimal_height >= height) { @@ -973,7 +965,6 @@ void MainWindow::set_tree_view_user() { } else { - // map_cmd_selection[key] = ""; } if (row[m_columns_user.check_button]) { if (users_root.length() != 0) { @@ -1306,15 +1297,12 @@ void MainWindow::wrapper_save_local_cfg() { void MainWindow::set_data_cfg() { string str_flags = entryKernel->get_text(); - // Utils::str_remove(str_flags, ","); Utils::str_replace_all(str_flags, " \"", "\""); map_cmd_selection["GRUB_CMDLINE_LINUX"] = str_flags; str_flags = entryIPT->get_text(); - // Utils::str_remove(str_flags, ","); Utils::str_replace_all(str_flags, " \"", "\""); map_cmd_selection["GRUB_TERMINAL_INPUT"] = str_flags; str_flags = entryOTT->get_text(); - // Utils::str_remove(str_flags, ","); Utils::str_replace_all(str_flags, " \"", "\""); map_cmd_selection["GRUB_TERMINAL_OUTPUT"] = str_flags; if (chbLoadVariantSelectionTimer->get_active()) { @@ -1390,7 +1378,6 @@ void MainWindow::set_entry(Gtk::Entry* entry, std::map &map_temp if (map_temp.find(key) != map_temp.end()) { string value = map_temp[key]; Utils::str_replace_all(value, "\"", ""); - // Utils::str_replace_all(value, " ", ", "); entry->set_text(value); } else { -- 2.35.1 From 31b6a181f658cbcb178395bce5d69ac90875fed5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 14:01:24 +0600 Subject: [PATCH 19/25] Localisation update --- source/ubl-settings-bootloader.h | 4 ++-- ubl-settings-bootloader.pot | 4 ++-- ubl-settings-bootloader_ru.po | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 70e1555..b13f27b 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -81,8 +81,8 @@ void me_thread(string cmd); #define redirected_documentation _("You will be redirected to documentation website where documentation is\n""translated and supported by community.") #define user_name_configuration_editing_code _("User name to enter boot configuration editing mode") #define user_password_configuration_edit_mode _("User password to enter boot configuration edit mode") -#define loading_animation_with _("Loading animation with the journal") -#define loading_animation_without _("Loading animation without a journal") +#define loading_animation_with _("Loading animation with log") +#define loading_animation_without _("Loading animation without log") #define lack_loading_animation_800_600 _("Lack of loading animation with the\noutput of the abbreviated log") #define lack_loading_animation _("Lack of loading animation with the output of the abbreviated log") #define web_url _("https://wiki.ublinux.com") diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot index c6dabe2..820815c 100644 --- a/ubl-settings-bootloader.pot +++ b/ubl-settings-bootloader.pot @@ -308,12 +308,12 @@ msgstr "" #: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 #: source/ubl-settings-bootloader.cc:448 -msgid "Loading animation with the journal" +msgid "Loading animation with log" msgstr "" #: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 #: source/ubl-settings-bootloader.cc:449 -msgid "Loading animation without a journal" +msgid "Loading animation without log" msgstr "" #: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po index 92d6c26..76d8cf1 100644 --- a/ubl-settings-bootloader_ru.po +++ b/ubl-settings-bootloader_ru.po @@ -282,12 +282,12 @@ msgstr "Режим отображения экрана загрузки:" #: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 #: source/ubl-settings-bootloader.cc:448 -msgid "Loading animation with the journal" +msgid "Loading animation with log" msgstr "Анимация загрузки с журналом" #: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 #: source/ubl-settings-bootloader.cc:449 -msgid "Loading animation without a journal" +msgid "Loading animation without log" msgstr "Анимация загрузки без журнала" #: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 -- 2.35.1 From 17d979156bfdf0ef3a6809d7587f76160b986537 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 14:05:45 +0600 Subject: [PATCH 20/25] Changed about dialog icon --- ubl-settings-bootloader.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 8463bbc..f68863d 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -14,7 +14,7 @@ False True center - com.ublinux.ubl-settings-diskquota + com.ublinux.ubl-settings-bootloader dialog True ubl-settings-bootloader -- 2.35.1 From be1cb656bf2879840502b15465d8c89876208916 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 16:43:12 +0600 Subject: [PATCH 21/25] Main window has been reconfigured --- ubl-settings-bootloader.glade | 215 ++++++++++------------------------ 1 file changed, 59 insertions(+), 156 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index f68863d..82dc707 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -9,6 +9,7 @@ + False False @@ -354,8 +355,8 @@ - 784 - 556 + 800 + 600 False com.ublinux.ubl-settings-bootloader @@ -441,6 +442,7 @@ True True + never in @@ -481,11 +483,13 @@ True False + 5 vertical True False + 5 Boot selection menu timer @@ -494,10 +498,6 @@ False 3 5 - 3 - 5 - 5 - 5 True @@ -510,12 +510,6 @@ True True - 5 - 5 - 5 - 5 - 5 - 5 False @@ -527,12 +521,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 Seconds @@ -552,17 +540,14 @@ True False + 5 True False start 5 - 5 - 5 - 5 - 5 - 5 + 4 Default load start 0 @@ -579,8 +564,6 @@ True 5 5 - 5 - 5 5 5 @@ -595,10 +578,6 @@ True True True - 5 - 10 - 5 - 10 5 5 @@ -654,7 +633,6 @@ 5 10 5 - 10 5 5 @@ -677,21 +655,20 @@ False 5 10 - 5 - 10 - 5 - 5 0.019999999552965164 in True False + 5 + 5 + 5 + 5 True False - 5 True @@ -699,14 +676,8 @@ vertical - 100 True True - 5 - 3 - 5 - 3 - 5 in @@ -725,7 +696,7 @@ - False + True True 0 @@ -744,17 +715,12 @@ True False vertical + 5 True True True - 5 - 10 - 5 - 10 - 5 - 5 True @@ -762,6 +728,9 @@ value-increase-symbolic + False @@ -774,12 +743,6 @@ True True True - 5 - 10 - 5 - 10 - 3 - 5 True @@ -787,6 +750,9 @@ document-edit-symbolic + False @@ -799,12 +765,6 @@ True True True - 5 - 10 - 5 - 10 - 3 - 10 True @@ -812,6 +772,9 @@ user-trash-symbolic + False @@ -856,9 +819,6 @@ False 5 10 - 5 - 10 - 5 5 0.019999999552965164 in @@ -866,6 +826,9 @@ True False + 5 + 5 + 5 True @@ -878,14 +841,8 @@ vertical - 100 True True - 5 - 5 - 5 - 5 - 5 in @@ -904,7 +861,7 @@ - False + True True 0 @@ -923,6 +880,7 @@ True False vertical + 5 True @@ -930,10 +888,6 @@ True 5 10 - 5 - 10 - 5 - 5 True @@ -941,6 +895,9 @@ value-increase-symbolic + False @@ -955,10 +912,6 @@ True 5 10 - 5 - 10 - 3 - 5 True @@ -966,6 +919,9 @@ document-edit-symbolic + False @@ -980,10 +936,6 @@ True 5 10 - 5 - 10 - 3 - 10 True @@ -991,6 +943,9 @@ user-trash-symbolic + False @@ -1074,42 +1029,29 @@ True False + 5 5 + 5 True False vertical + 5 - 140 True True - 5 - 10 - 5 - 10 - 5 - 5 in - + True - False - - - True - True - - - - - + True - False + True True 0 @@ -1118,16 +1060,11 @@ True False + 5 True False - 5 - 5 - 5 - 5 - 1 - 5 Command line parameters: @@ -1140,10 +1077,7 @@ True True - 5 - 10 - 5 - 10 + center 5 5 @@ -1202,12 +1136,15 @@ True False + 5 5 + 5 True False vertical + 5 140 @@ -1215,24 +1152,11 @@ True 5 10 - 5 - 10 - 5 - 5 in - + True - False - - - True - True - - - - - + True @@ -1246,16 +1170,12 @@ True False + 5 True False - 5 - 5 - 5 - 5 - 1 - 5 + center Command line parameters: @@ -1268,10 +1188,7 @@ True True - 5 - 10 - 5 - 10 + center 5 5 @@ -1330,23 +1247,19 @@ True False + 5 5 + 5 True False vertical + 5 - 140 True True - 5 - 10 - 5 - 10 - 5 - 5 in @@ -1374,16 +1287,14 @@ True False + 5 True False + center 5 5 - 5 - 5 - 1 - 5 Command line parameters: @@ -1396,10 +1307,9 @@ True True + center 5 10 - 5 - 10 5 5 @@ -1670,13 +1580,6 @@ - - - - - - - False Внимание! -- 2.35.1 From 7d38cceddcded44623b98dd47d1052973c78991c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 17:09:05 +0600 Subject: [PATCH 22/25] Window elements paddings redone --- ubl-settings-bootloader.glade | 376 ++++++++++++++-------------------- 1 file changed, 149 insertions(+), 227 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 82dc707..96a313f 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -442,12 +442,19 @@ True True + 5 + 5 + 5 never in True False + 5 + 5 + 5 + 5 True @@ -462,12 +469,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -496,9 +497,10 @@ True True False - 3 - 5 True + False @@ -546,8 +548,6 @@ True False start - 5 - 4 Default load start 0 @@ -562,8 +562,6 @@ True True - 5 - 5 5 5 @@ -605,17 +603,12 @@ True False + 5 True False start - 5 - 5 - 5 - 5 - 5 - 5 Load screen display mode: start 0 @@ -630,9 +623,6 @@ True False - 5 - 10 - 5 5 5 @@ -653,22 +643,22 @@ True False - 5 - 10 0.019999999552965164 in - + True False - 5 - 5 - 5 - 5 - + True False + 5 + 5 + 5 + 5 + 5 + 5 True @@ -702,92 +692,92 @@ + + True + True + 0 + - - - True - True - 0 - - - - - True - False - vertical - 5 - + True - True - True + False + vertical + 5 - + + True + True + True + + True False value-increase-symbolic + + + + + False + True + 0 + - - - - False - True - 0 - - - - - True - True - True - + + True + True + True + + True False document-edit-symbolic + + + + + False + True + 1 + - - - - False - True - 1 - - - - - True - True - True - + + True + True + True + + True False user-trash-symbolic + + + + + False + True + 2 + - False True - 2 + 1 - - False - True - 1 - @@ -808,7 +798,7 @@ - False + True True 5 @@ -817,23 +807,22 @@ True False - 5 - 10 5 0.019999999552965164 in - + True False - 5 - 5 - 5 + 5 - + True False - 5 + 5 + 5 + 5 + 5 True @@ -845,10 +834,6 @@ True in - - True - False - True True @@ -857,8 +842,6 @@ - - True @@ -867,98 +850,92 @@ + + True + True + 0 + - - - True - True - 0 - - - - - True - False - vertical - 5 - + True - True - True - 5 - 10 + False + vertical + 5 - + + True + True + True + + True False value-increase-symbolic + + + + + False + True + 0 + - - - - False - True - 0 - - - - - True - True - True - 5 - 10 - + + True + True + True + + True False document-edit-symbolic + + + + + False + True + 1 + - - - - False - True - 1 - - - - - True - True - True - 5 - 10 - + + True + True + True + + True False user-trash-symbolic + + + + + False + True + 2 + - False True - 2 + 1 - - False - True - 1 - @@ -979,7 +956,7 @@ - False + True True 5 @@ -1017,12 +994,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -1039,19 +1010,12 @@ vertical 5 - + True True - in - - - True - True - - - True + False True 0 @@ -1124,12 +1088,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -1146,24 +1104,14 @@ vertical 5 - - 140 + True True - 5 - 10 - in - - - True - True - - False True - 1 + 0 @@ -1235,12 +1183,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -1257,25 +1199,9 @@ vertical 5 - + True True - in - - - True - False - - - True - True - - - - - - - False @@ -1293,8 +1219,6 @@ True False center - 5 - 5 Command line parameters: @@ -1308,8 +1232,6 @@ True True center - 5 - 10 5 5 -- 2.35.1 From 129da93691c4932b732ea3b016c99d2f4c88d4c8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 17:13:28 +0600 Subject: [PATCH 23/25] Removed leftover scrolls --- ubl-settings-bootloader.glade | 44 +++-------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index 96a313f..bc4c9d7 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -665,25 +665,9 @@ False vertical - + True True - in - - - True - False - - - True - True - - - - - - - True @@ -824,31 +808,9 @@ 5 5 - + True - False - vertical - - - True - True - in - - - True - True - - - - - - - - True - True - 0 - - + True True -- 2.35.1 From ad34a7d141a40e13bc7d3cce583febe31fd9194e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 17:21:04 +0600 Subject: [PATCH 24/25] Fixed padding between two entries --- ubl-settings-bootloader.glade | 40 +---------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index bc4c9d7..0732620 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -3,13 +3,6 @@ - - both - True - - - - False False @@ -486,6 +479,7 @@ False 5 vertical + 5 True @@ -562,8 +556,6 @@ True True - 5 - 5 True @@ -576,8 +568,6 @@ True True True - 5 - 5 True @@ -623,8 +613,6 @@ True False - 5 - 5 True @@ -1446,24 +1434,6 @@ - - both - True - - - - - - - - both - True - - - - - - False Внимание! @@ -1962,14 +1932,6 @@ - - - - - - - - False False -- 2.35.1 From b70a652746b082bc6293c1ab0f36d75caa05c7d4 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 09:08:02 +0600 Subject: [PATCH 25/25] Removed debugging from package configuration --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 2ea7fee..67df707 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -71,7 +71,7 @@ add_custom_target( set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection -g") + -fstack-clash-protection -fcf-protection") set(SOURCE_FILES menu_os.h -- 2.35.1