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

Merge pull request 'master' (#55) from YanTheKaller/ubl-settings-bootloader:master into master

Browse Source 
Reviewed-on: #55
pull/66/head
Dmitry Razumov 2 years ago
parent 2607865b42 b70a652746
commit 72025f139e
8 changed files with 227 additions and 484 deletions
Show Stats Download Patch File Download Diff File

5
source/main.cc
Unescape View File

@ -9,11 +9,6 @@ int main(int argc, char** argv) {
for (int i=1; i<argc; i++){
str_cmd_argv+= to_string(*argv[i]) + " ";
}
if (geteuid()!=0){
string cmd = "";
cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
return system(cmd.c_str());
}
if (argc > 1){
str_argv = argv[1];
}

1
source/menu_os.cc
Unescape View File

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

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

@ -263,13 +263,11 @@ void MainWindow::settings() {
vector<string> os_control_list;
this->pars_os(os_control_list);
this->download_local_cfg();
this->download_globl_cfg();
vector<tuple<string, vector<string>>> vec_list_os = format_os_list(os_control_list);
obj_menu_os.set_main_revealer(revilerMenuOS);
obj_menu_os.set_builder(builder, path_glade);
obj_menu_os.set_map(vec_list_os);
obj_menu_os.set_entry(entrListOS);
// 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);
}
}
@ -670,7 +665,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);
@ -690,8 +684,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);
@ -759,7 +751,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &list_store
flag_blocked_tree_view = true;
vector<string> 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);
@ -767,7 +758,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &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);
@ -857,27 +847,34 @@ 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) {
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="";
}
}
}
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) {
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="";
}
}
}
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 +889,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) {
@ -915,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) {
@ -968,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) {
@ -1119,6 +1115,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) {
@ -1127,23 +1124,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_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) {
@ -1299,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()) {
@ -1383,7 +1378,6 @@ void MainWindow::set_entry(Gtk::Entry* entry, std::map<string, string> &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 {

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

@ -44,19 +44,19 @@ 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 project_Home_page _("Project homepage")
#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")
#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")
@ -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 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")

3
ubl-settings-bootloader.css
Unescape View File

@ -160,4 +160,7 @@ opacity:0.99;
border-width: 1px;
border-style: solid;
border-color: @theme_text_color;
}
.bultar {
border:none;
}

630
ubl-settings-bootloader.glade
View File

File diff suppressed because it is too large Load Diff

12
ubl-settings-bootloader.pot
Unescape View File

@ -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
@ -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
@ -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 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 magazine"
msgid "Loading animation without log"
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
@ -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

14
ubl-settings-bootloader_ru.po
Unescape View File

@ -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
@ -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"
@ -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 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 magazine"
msgid "Loading animation without log"
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
@ -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

Write Preview
Loading…
Cancel
Save