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

Сделан пункт "Режим загрузки:"

Browse Source
pull/11/head
Igor Belitskiy 3 years ago
parent 00423cdc76
commit 792eb67355
5 changed files with 123 additions and 1306 deletions
Show Stats Download Patch File Download Diff File

1265
#ubl-settings-bootloader.glade#
View File

File diff suppressed because it is too large Load Diff

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

@ -116,8 +116,6 @@ void MainWindow::fill_in_view() {
this->view_add_colums(*treeViewIPT); this->view_add_colums(*treeViewIPT);
this->view_add_colums(*treeViewOTT); this->view_add_colums(*treeViewOTT);
std::vector<Gtk::TreeViewColumn*> treeViewKernalCol = treeViewKernel->get_columns(); std::vector<Gtk::TreeViewColumn*> treeViewKernalCol = treeViewKernel->get_columns();
//cout << treeViewKernalCol[2]->get_alignment() << endl;
} }
void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator&) { void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator&) {
@ -167,6 +165,56 @@ void MainWindow::item_selected_IPT(const Gtk::TreeModel::Path& path, const Gtk::
} }
void MainWindow::get_download_mode(string cmd) {
struct Result<string> res_response = this->wrapper_call(cmd);
if (res_response.error == 0) {
str_replace_all(res_response.response, "\"","");
if (res_response.response == "splash") {
cmbDownloadMode->set_active(0);
}
else if (res_response.response == "splash quiet ub.silent") {
cmbDownloadMode->set_active(1);
}
else if (res_response.response == "quiet ub.silent") {
cmbDownloadMode->set_active(2);
}
else if (res_response.response == "plymouth.enable=0") {
cmbDownloadMode->set_active(3);
}
else{
cmbDownloadMode->set_active(-1);
}
}
else if (res_response.error == 3) {
cmbDownloadMode->set_active(-1);
}
else {
cmbDownloadMode->set_active(-1);
}
}
void MainWindow::set_download_mode(string cmd) {
int index = cmbDownloadMode->get_active_row_number();
string key = "";
if (index == 0) {
key = "splash";
}
else if (index == 1) {
key = "splash quiet ub.silent";
}
else if (index == 2) {
key = "quiet ub.silent";
}
else if (index == 3) {
key = "plymouth.enable=0";
}
else{
return;
}
cmd +="\"" + key + "\"";
wrapper_system(cmd, "");
}
void MainWindow::template_item_selected(std::map<string, string> &map_view, const Gtk::TreeModel::Path& path, Glib::RefPtr<Gtk::ListStore> &list_store) { void MainWindow::template_item_selected(std::map<string, string> &map_view, const Gtk::TreeModel::Path& path, Glib::RefPtr<Gtk::ListStore> &list_store) {
const auto iter = list_store->get_iter(path); const auto iter = list_store->get_iter(path);
if(iter) { if(iter) {
@ -272,6 +320,11 @@ void MainWindow::get_builder(){
builder->get_widget("lblDownloadMode", lblDownloadMode); builder->get_widget("lblDownloadMode", lblDownloadMode);
builder->get_widget("lblSecurityLogin", lblSecurityLogin); builder->get_widget("lblSecurityLogin", lblSecurityLogin);
builder->get_widget("lblPasswordProtec", lblPasswordProtec); builder->get_widget("lblPasswordProtec", lblPasswordProtec);
builder->get_widget("cmbDownloadMode", cmbDownloadMode);
builder->get_widget("chbSecurityLogin", chbSecurityLogin);
builder->get_widget("chbPasswordProtecc", chbPasswordProtecc);
builder->get_widget("entryPasswordProtecc", entryPasswordProtecc);
builder->get_widget("entrySecurityLogin", entrySecurityLogin);
} }
void MainWindow::localization(){ void MainWindow::localization(){
@ -313,6 +366,11 @@ void MainWindow::localization(){
lblDownloadMode->set_text(gettext("Download mode:")); lblDownloadMode->set_text(gettext("Download mode:"));
lblSecurityLogin->set_text(gettext("Security login:")); lblSecurityLogin->set_text(gettext("Security login:"));
lblPasswordProtec->set_text(gettext("Password protection:")); lblPasswordProtec->set_text(gettext("Password protection:"));
cmbDownloadMode->append(gettext("Plymouth graphics, full log"));
cmbDownloadMode->append(gettext("Plymouth graphics, no log"));
cmbDownloadMode->append(gettext("No plymouth, minimal log"));
cmbDownloadMode->append(gettext("Without plymouth, full log"));
} }
vector<string> MainWindow::get_setting_entry_all(string cmd, Gtk::Entry &entry_text, std::map <string, string> &map_temp) { vector<string> MainWindow::get_setting_entry_all(string cmd, Gtk::Entry &entry_text, std::map <string, string> &map_temp) {
@ -441,25 +499,27 @@ void MainWindow::event(){
void MainWindow::save_global_local_cfg() { void MainWindow::save_global_local_cfg() {
if (flag_save_global) { if (flag_save_global) {
std::string cmd_boot_time = "sudo ubconfig --target global set boot GRUB_TIMEOUT="; std::string cmd_boot_time = "ubconfig --target global set boot GRUB_TIMEOUT=";
this->set_menu_boot(cmd_boot_time); this->set_menu_boot(cmd_boot_time);
string cmd_settings_kernel = "sudo ubconfig --target global set boot GRUB_CMDLINE_LINUX="; string cmd_settings_kernel = "ubconfig --target global set boot GRUB_CMDLINE_LINUX=";
string cmd_settings_IPT = "sudo ubconfig --target global set boot GRUB_TERMINAL_OUTPUT="; string cmd_settings_IPT = "ubconfig --target global set boot GRUB_TERMINAL_OUTPUT=";
string cmd_settings_OTT = "sudo ubconfig --target global set boot GRUB_TERMINAL_INPUT="; string cmd_settings_OTT = "ubconfig --target global set boot GRUB_TERMINAL_INPUT=";
this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT); this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT);
this->set_download_mode("ubconfig --target global set boot GRUB_BOOT_SILENT=");
flag_save_all = false; flag_save_all = false;
} }
else if (flag_save_local) { if (flag_save_local) {
std::string cmd_boot_time = "sudo ubconfig --target global set boot GRUB_TIMEOUT="; std::string cmd_boot_time = "ubconfig --target system set boot GRUB_TIMEOUT=";
this->set_menu_boot(cmd_boot_time); this->set_menu_boot(cmd_boot_time);
string cmd_settings_kernel = "sudo ubconfig --target global set boot GRUB_CMDLINE_LINUX="; string cmd_settings_kernel = "ubconfig --target system set boot GRUB_CMDLINE_LINUX=";
string cmd_settings_IPT = "sudo ubconfig --target global set boot GRUB_TERMINAL_OUTPUT="; string cmd_settings_IPT = "ubconfig --target system set boot GRUB_TERMINAL_OUTPUT=";
string cmd_settings_OTT = "sudo ubconfig --target global set boot GRUB_TERMINAL_INPUT="; string cmd_settings_OTT = "ubconfig --target system set boot GRUB_TERMINAL_INPUT=";
this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT); this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT);
this->set_download_mode("ubconfig --target system set boot GRUB_BOOT_SILENT=");
flag_save_all = false; flag_save_all = false;
} }
else{ else if (flag_save_local == false && flag_save_local == false) {
info_status_app("boxInfoMessOK"); info_status_app("boxInfoMessOK");
lblWarning->set_text(gettext("Nothing to save!")); lblWarning->set_text(gettext("Nothing to save!"));
} }
@ -471,12 +531,13 @@ void MainWindow::save_global_local_cfg() {
void MainWindow::save_global_cfg() { void MainWindow::save_global_cfg() {
if (flag_save_global) { if (flag_save_global) {
if (flag_save_all) { if (flag_save_all) {
std::string cmd_boot_time = "sudo ubconfig --target global set boot GRUB_TIMEOUT="; std::string cmd_boot_time = "ubconfig --target global set boot GRUB_TIMEOUT=";
this->set_menu_boot(cmd_boot_time); this->set_menu_boot(cmd_boot_time);
string cmd_settings_kernel = "sudo ubconfig --target global set boot GRUB_CMDLINE_LINUX="; string cmd_settings_kernel = "ubconfig --target global set boot GRUB_CMDLINE_LINUX=";
string cmd_settings_IPT = "sudo ubconfig --target global set boot GRUB_TERMINAL_OUTPUT"; string cmd_settings_IPT = "ubconfig --target global set boot GRUB_TERMINAL_OUTPUT";
string cmd_settings_OTT = "sudo ubconfig --target global set boot GRUB_TERMINAL_INPUT="; string cmd_settings_OTT = "ubconfig --target global set boot GRUB_TERMINAL_INPUT=";
this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT); this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT);
this->set_download_mode("ubconfig --target global set boot GRUB_BOOT_SILENT=");
flag_save_global = false; flag_save_global = false;
} }
} }
@ -490,12 +551,13 @@ void MainWindow::save_global_cfg() {
void MainWindow::save_local_cfg() { void MainWindow::save_local_cfg() {
if (flag_save_local) { if (flag_save_local) {
if (flag_save_all) { if (flag_save_all) {
std::string cmd_boot_time = "sudo ubconfig --target system set boot GRUB_TIMEOUT="; std::string cmd_boot_time = "ubconfig --target system set boot GRUB_TIMEOUT=";
this->set_menu_boot(cmd_boot_time); this->set_menu_boot(cmd_boot_time);
string cmd_settings_kernel = "sudo ubconfig --target system set boot GRUB_CMDLINE_LINUX="; string cmd_settings_kernel = "ubconfig --target system set boot GRUB_CMDLINE_LINUX=";
string cmd_settings_IPT = "sudo ubconfig --target system set boot GRUB_TERMINAL_OUTPUT"; string cmd_settings_IPT = "ubconfig --target system set boot GRUB_TERMINAL_OUTPUT";
string cmd_settings_OTT = "sudo ubconfig --target system set boot GRUB_TERMINAL_INPUT="; string cmd_settings_OTT = "ubconfig --target system set boot GRUB_TERMINAL_INPUT=";
this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT); this->cmd_entry_all(cmd_settings_kernel,cmd_settings_IPT,cmd_settings_OTT);
this->set_download_mode("ubconfig --target system set boot GRUB_BOOT_SILENT=");
flag_save_local = true; flag_save_local = true;
} }
} }
@ -514,17 +576,18 @@ void MainWindow::download_globl_cfg() {
flag_save_global = false; flag_save_global = false;
flag_save_all = false; flag_save_all = false;
flag_load = true; flag_load = true;
std::string cmd_boot_time = "sudo ubconfig --default --source global get boot GRUB_TIMEOUT"; std::string cmd_boot_time = "ubconfig --default --source global get boot GRUB_TIMEOUT";
this->get_menu_boot(cmd_boot_time); this->get_menu_boot(cmd_boot_time);
string cmd_kernel_entry = "sudo ubconfig --default --source global get boot GRUB_CMDLINE_LINUX"; string cmd_kernel_entry = "ubconfig --default --source global get boot GRUB_CMDLINE_LINUX";
this->get_setting_entry_all(cmd_kernel_entry, *entryKernel, map_global_cmd_selection); this->get_setting_entry_all(cmd_kernel_entry, *entryKernel, map_global_cmd_selection);
string cmd_ipt_entry = "sudo ubconfig --default --source global get boot GRUB_TERMINAL_INPUT"; string cmd_ipt_entry = "ubconfig --default --source global get boot GRUB_TERMINAL_INPUT";
this->get_setting_entry_all(cmd_ipt_entry, *entryIPT, map_global_cmd_selection); this->get_setting_entry_all(cmd_ipt_entry, *entryIPT, map_global_cmd_selection);
string cmd_opt_entry = "sudo ubconfig --default --source global get boot GRUB_TERMINAL_OUTPUT"; string cmd_opt_entry = "ubconfig --default --source global get boot GRUB_TERMINAL_OUTPUT";
this->get_setting_entry_all(cmd_opt_entry, *entryOTT, map_global_cmd_selection); this->get_setting_entry_all(cmd_opt_entry, *entryOTT, map_global_cmd_selection);
this->set_row_all(map_global_cmd_selection, list_store_kernel, vec_Option_kernel, size_kernel); this->set_row_all(map_global_cmd_selection, list_store_kernel, vec_Option_kernel, size_kernel);
this->set_row_all(map_global_cmd_selection, list_store_IPT, vec_Option_IPT, size_IPT); this->set_row_all(map_global_cmd_selection, list_store_IPT, vec_Option_IPT, size_IPT);
this->set_row_all(map_global_cmd_selection, list_store_OTT, vec_Option_OTT, size_OTT); this->set_row_all(map_global_cmd_selection, list_store_OTT, vec_Option_OTT, size_OTT);
this->get_download_mode("ubconfig --default --source global get boot GRUB_BOOT_SILENT");
info_warning_error(1); info_warning_error(1);
} }
@ -536,17 +599,18 @@ void MainWindow::download_local_cfg() {
flag_save_global = false; flag_save_global = false;
flag_save_all = false; flag_save_all = false;
flag_load = false; flag_load = false;
std::string cmd_boot_time = "sudo ubconfig --default --source system get boot GRUB_TIMEOUT"; std::string cmd_boot_time = "ubconfig --default --source system get boot GRUB_TIMEOUT";
this->get_menu_boot(cmd_boot_time); this->get_menu_boot(cmd_boot_time);
string cmd_kernel_entry = "sudo ubconfig --default --source system get boot GRUB_CMDLINE_LINUX"; string cmd_kernel_entry = "ubconfig --default --source system get boot GRUB_CMDLINE_LINUX";
this->get_setting_entry_all(cmd_kernel_entry, *entryKernel, map_local_cmd_selection); this->get_setting_entry_all(cmd_kernel_entry, *entryKernel, map_local_cmd_selection);
string cmd_ipt_entry = "sudo ubconfig --default --source system get boot GRUB_TERMINAL_INPUT"; string cmd_ipt_entry = "ubconfig --default --source system get boot GRUB_TERMINAL_INPUT";
this->get_setting_entry_all(cmd_ipt_entry, *entryIPT, map_local_cmd_selection); this->get_setting_entry_all(cmd_ipt_entry, *entryIPT, map_local_cmd_selection);
string cmd_opt_entry = "sudo ubconfig --default --source system get boot GRUB_TERMINAL_OUTPUT"; string cmd_opt_entry = "ubconfig --default --source system get boot GRUB_TERMINAL_OUTPUT";
this->get_setting_entry_all(cmd_opt_entry, *entryOTT, map_local_cmd_selection); this->get_setting_entry_all(cmd_opt_entry, *entryOTT, map_local_cmd_selection);
this->set_row_all(map_local_cmd_selection, list_store_kernel, vec_Option_kernel, size_kernel); this->set_row_all(map_local_cmd_selection, list_store_kernel, vec_Option_kernel, size_kernel);
this->set_row_all(map_local_cmd_selection, list_store_IPT, vec_Option_IPT, size_IPT); this->set_row_all(map_local_cmd_selection, list_store_IPT, vec_Option_IPT, size_IPT);
this->set_row_all(map_local_cmd_selection, list_store_OTT, vec_Option_OTT, size_OTT); this->set_row_all(map_local_cmd_selection, list_store_OTT, vec_Option_OTT, size_OTT);
this->get_download_mode("ubconfig --default --source system get boot GRUB_BOOT_SILENT");
info_warning_error(0); info_warning_error(0);
} }
@ -685,7 +749,6 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
} }
void MainWindow::log_mess_error(string &cmd) { void MainWindow::log_mess_error(string &cmd) {
cout << cmd << endl;
string key = ""; string key = "";
if (map_cmd_error.find(cmd) != map_cmd_error.end()){ if (map_cmd_error.find(cmd) != map_cmd_error.end()){
str_cmd_error = map_cmd_error[cmd]; str_cmd_error = map_cmd_error[cmd];

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

@ -91,6 +91,11 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::TreeView *treeViewOTT; Gtk::TreeView *treeViewOTT;
Gtk::Image *imgBG; Gtk::Image *imgBG;
Gtk::Overlay *overHead; Gtk::Overlay *overHead;
Gtk::ComboBoxText *cmbDownloadMode;
Gtk::ComboBoxText *chbSecurityLogin;
Gtk::ComboBoxText *chbPasswordProtecc;
Gtk::Entry *entrySecurityLogin;
Gtk::Entry *entryPasswordProtecc;
std::vector<std::string> vec_Option_kernel; std::vector<std::string> vec_Option_kernel;
std::vector<std::string> vec_Option_IPT; std::vector<std::string> vec_Option_IPT;
@ -142,6 +147,7 @@ class MainWindow : public Gtk::ApplicationWindow {
void fn_event_intelMax1(); void fn_event_intelMax1();
void fn_event_intelMax4(); void fn_event_intelMax4();
void synopsis_show(); void synopsis_show();
void get_download_mode(string cmd);
void view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m , std::array<std::vector<std::string>, 5> &arr_view, size_t index); void view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListStore> list_store_m , std::array<std::vector<std::string>, 5> &arr_view, size_t index);
void wrapper_system(string cmd, string thread_str); void wrapper_system(string cmd, string thread_str);
struct Result<string> wrapper_call(string cmd); struct Result<string> wrapper_call(string cmd);
@ -160,6 +166,7 @@ class MainWindow : public Gtk::ApplicationWindow {
bool focus_out_txt_IPT(GdkEventFocus*); bool focus_out_txt_IPT(GdkEventFocus*);
bool focus_out_txt_OTT(GdkEventFocus*); bool focus_out_txt_OTT(GdkEventFocus*);
void fill_in_view(); void fill_in_view();
void set_download_mode(string cmd);
vector<string> get_setting_entry_all(string cmd, Gtk::Entry &entry_text, std::map <string, string> &map_temp); vector<string> get_setting_entry_all(string cmd, Gtk::Entry &entry_text, std::map <string, string> &map_temp);
void cmd_entry_all(string cmd_settings_kernel,string cmd_settings_IPT,string cmd_settings_OTT); void cmd_entry_all(string cmd_settings_kernel,string cmd_settings_IPT,string cmd_settings_OTT);
string dynamic_update_entry(std::map<string, string> &map_view, vector<string> &vec_allowed); string dynamic_update_entry(std::map<string, string> &map_view, vector<string> &vec_allowed);

24
ubl-settings-bootloader.glade
Unescape View File

@ -392,7 +392,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkComboBoxText" id="cmbDefaultDonw">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -403,7 +403,7 @@ specified priority</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -460,7 +460,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkComboBoxText" id="cmbDownloadMode">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -480,7 +480,7 @@ specified priority</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -507,7 +507,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkComboBoxText" id="chbSecurityLogin">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -524,9 +524,9 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkEntry" id="entrySecurityLogin">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
@ -544,7 +544,7 @@ specified priority</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -570,7 +570,7 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkComboBoxText" id="chbPasswordProtecc">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -587,9 +587,9 @@ specified priority</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText"> <object class="GtkEntry" id="entryPasswordProtecc">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
@ -607,7 +607,7 @@ specified priority</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
</object> </object>

12
ubl-settings-bootloader_ru.po
Unescape View File

@ -16,6 +16,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
msgid "Plymouth graphics, full log"
msgstr "Графика plymouth, полный лог"
msgid "Plymouth graphics, no log"
msgstr "Графика plymouth, нет лога"
msgid "No plymouth, minimal log"
msgstr "Без plymouth, минимальный лог"
msgid "Without plymouth, full log"
msgstr "Без plymouth, полный лог"
msgid "Download mode:" msgid "Download mode:"
msgstr "Режим загрузки:" msgstr "Режим загрузки:"

Write Preview
Loading…
Cancel
Save