From 12e24675b8b0769c15468a467d0a8592f33dae6d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 29 Mar 2023 10:46:39 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D1=82=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BF=D0=BE=20=D1=81=D0=B2?= =?UTF-8?q?=D1=8F=D0=B7=D0=B8=20gui=20=D1=81=20ubconfig-=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boot-options.csv | 26 ++++++------ input-options.csv | 10 ++--- output-options.csv | 10 ++--- source/ubl-settings-bootloader.cc | 68 +++++++++++++++++++++++-------- source/ubl-settings-bootloader.h | 7 +--- 5 files changed, 76 insertions(+), 45 deletions(-) mode change 100644 => 100755 source/ubl-settings-bootloader.cc diff --git a/boot-options.csv b/boot-options.csv index 775d901..c76e0a9 100644 --- a/boot-options.csv +++ b/boot-options.csv @@ -1,14 +1,14 @@ Get,Set=1,Set=0,Option,Description -cmd_get,cmd_true,cmd_false,quiet,Downloading without text messages -cmd_get,cmd_true,cmd_false,splash,Show welcome window -cmd_get,cmd_true,cmd_false,noplymouth,Disable Plymouth -cmd_get,cmd_true,cmd_false,acpi=off,Disable ACPI -cmd_get,cmd_true,cmd_false,noapic,Disable APIC -cmd_get,cmd_true,cmd_false,nolapic,Disable local APIC -cmd_get,cmd_true,cmd_false,single,Single User Mode -cmd_get,cmd_true,cmd_false,nomodeset,Disable kernel selection and loading of video drivers -cmd_get,cmd_true,cmd_false,915.enable_dc=0,Disable GPU power management -cmd_get,cmd_true,cmd_false,ahci.mobile_lpm_policy=1,"Maximum performance, power management" -cmd_get,cmd_true,cmd_false,snd-intel-dspcfg.dsp_driver=1,Forced selection of an Intel sound device driver -cmd_get,cmd_true,cmd_false,intel_idle.max_cstate=1,Prevents the processor from going into a deep sleep state -cmd_get,cmd_true,cmd_false,intel_idle.max_cstate=4,Eliminates flickering laptop display on Ultra Voltage processors +get boot GRUB_BOOT_SILENT,quiet,cmd_false,quiet,Downloading without text messages +get boot GRUB_BOOT_SILENT,splash,cmd_false,splash,Show welcome window +get boot GRUB_BOOT_SILENT,noplymouth,cmd_false,noplymouth,Disable Plymouth +get boot GRUB_BOOT_SILENT,acpi=off,cmd_false,acpi=off,Disable ACPI +get boot GRUB_BOOT_SILENT,noapic,cmd_false,noapic,Disable APIC +get boot GRUB_BOOT_SILENT,nolapic,cmd_false,nolapic,Disable local APIC +get boot GRUB_BOOT_SILENT,single,cmd_false,single,Single User Mode +get boot GRUB_BOOT_SILENT,nomodeset,cmd_false,nomodeset,Disable kernel selection and loading of video drivers +get boot GRUB_BOOT_SILENT,915.enable_dc=0,cmd_false,915.enable_dc=0,Disable GPU power management +get boot GRUB_BOOT_SILENT,ahci.mobile_lpm_policy=1,cmd_false,ahci.mobile_lpm_policy=1,"Maximum performance, power management" +get boot GRUB_BOOT_SILENT,snd-intel-dspcfg.dsp_driver=1,cmd_false,snd-intel-dspcfg.dsp_driver=1,Forced selection of an Intel sound device driver +get boot GRUB_BOOT_SILENT,intel_idle.max_cstate=1,cmd_false,intel_idle.max_cstate=1,Prevents the processor from going into a deep sleep state +get boot GRUB_BOOT_SILENT,intel_idle.max_cstate=4,cmd_false,intel_idle.max_cstate=4,Eliminates flickering laptop display on Ultra Voltage processors diff --git a/input-options.csv b/input-options.csv index ecd672e..2f0acd3 100644 --- a/input-options.csv +++ b/input-options.csv @@ -1,6 +1,6 @@ Get,Set=1,Set=0,Option,Description -cmd_get,cmd_true,cmd_false,console,PC BIOS & EFI console -cmd_get,cmd_true,cmd_false,serial,Serial terminal -cmd_get,cmd_true,cmd_false,ofconsole,Open Firmware Console -cmd_get,cmd_true,cmd_false,at_keyboard,PC AT Keyboard (Coreboot) -cmd_get,cmd_true,cmd_false,usb_keyboard,USB Keyboard (HID Boot protocol) +ubconfig get boot GRUB_TERMINAL_INPUT,cmd_true,cmd_false,console,PC BIOS & EFI console +ubconfig get boot GRUB_TERMINAL_INPUT,cmd_true,cmd_false,serial,Serial terminal +ubconfig get boot GRUB_TERMINAL_INPUT,cmd_true,cmd_false,ofconsole,Open Firmware Console +ubconfig get boot GRUB_TERMINAL_INPUT,cmd_true,cmd_false,at_keyboard,PC AT Keyboard (Coreboot) +ubconfig get boot GRUB_TERMINAL_INPUT,cmd_true,cmd_false,usb_keyboard,USB Keyboard (HID Boot protocol) diff --git a/output-options.csv b/output-options.csv index ce2342f..3fb8237 100644 --- a/output-options.csv +++ b/output-options.csv @@ -1,6 +1,6 @@ Get,Set=1,Set=0,Option,Description -cmd_get,cmd_true,cmd_false,console,PC BIOS & EFI console -cmd_get,cmd_true,cmd_false,serial,Serial terminal -cmd_get,cmd_true,cmd_false,ofconsole,Open Firmware Console -cmd_get,cmd_true,cmd_false,gfxterm,Output in graphical mode -cmd_get,cmd_true,cmd_false,vga_text,VGA text output (Coreboot) +ubconfig get boot GRUB_TERMINAL_OUTPUT,console,cmd_false,console,PC BIOS & EFI console +ubconfig get boot GRUB_TERMINAL_OUTPUT,serial,cmd_false,serial,Serial terminal +ubconfig get boot GRUB_TERMINAL_OUTPUT,ofconsole,cmd_false,ofconsole,Open Firmware Console +ubconfig get boot GRUB_TERMINAL_OUTPUT,gfxterm,cmd_false,gfxterm,Output in graphical mode +ubconfig get boot GRUB_TERMINAL_OUTPUT,vga_text,cmd_false,vga_text,VGA text output (Coreboot) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc old mode 100644 new mode 100755 index afcb1a9..76868b9 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -78,6 +78,8 @@ void MainWindow::settings(){ btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); if (this->check_root() == 0) { + spbSecond->set_range(0, 100000000000); + spbSecond->set_increments(1.0, 1.0); this->fill_in_view(); this->download_local_cfg(); this->download_globl_cfg(); @@ -109,9 +111,9 @@ void MainWindow::fill_in_view() { this->view_add_colums(*treeViewKernel); this->view_add_colums(*treeViewIPT); this->view_add_colums(*treeViewOTT); - // auto iter = list_store_kernel->prepend(); - // row_kernel[m_columns.cmd_set_true]; - // cout << cmd << endl; + std::vector treeViewKernalCol = treeViewKernel->get_columns(); + + //cout << treeViewKernalCol[2]->get_alignment() << endl; } void MainWindow::item_selected_kernel(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator&) { @@ -215,14 +217,6 @@ void MainWindow::view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtrget_widget("chbLoadVariantSelectionTimer", chbLoadVariantSelectionTimer); builder->get_widget("chbLastSelectionWillBecome", chbLastSelectionWillBecome); @@ -309,7 +303,35 @@ void MainWindow::localization(){ this->set_title(gettext("ubl-settings-bootloader")); } +void MainWindow::get_menu_boot(string cmd) { + struct Result res_response = this->wrapper_call(cmd); + + if (res_response.error == 0) { + spbSecond->set_value(atoi(res_response.response.c_str())); + } + else if (res_response.error == 3) { + + } + else { + + } + +} + +void MainWindow::set_menu_boot(string cmd) { + std::string seconds = to_string(spbSecond->get_value()); + cmd += seconds; + struct Result res_response = this->wrapper_call(cmd); + if (res_response.error == 0) { + } + else if (res_response.error == 3) { + + } + else { + + } +} void MainWindow::event(){ btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); @@ -332,9 +354,13 @@ void MainWindow::event(){ void MainWindow::save_global_local_cfg() { if (flag_save_global == false) { flag_save_all = true; + std::string cmd_boot_time = "sudo ubconfig --default --source global get boot GRUB_TIMEOU"; + this->set_menu_boot(cmd_boot_time); } else if (flag_save_local == false) { flag_save_all = true; + std::string cmd_boot_time = "sudo ubconfig --default --source system get boot GRUB_TIMEOU"; + this->set_menu_boot(cmd_boot_time); } else{ info_status_app("boxInfoMessOK"); @@ -347,28 +373,32 @@ void MainWindow::save_global_local_cfg() { void MainWindow::save_global_cfg() { if (flag_save_global == false) { - flag_save_global = true; + flag_save_global = true; + if (flag_save_all == false) { + std::string cmd_boot_time = "sudo ubconfig --default --source global get boot GRUB_TIMEOU"; + this->set_menu_boot(cmd_boot_time); + } } else{ info_status_app("boxInfoMessOK"); lblWarning->set_text(gettext("Nothing to save!")); } info_warning_error(3); - - } void MainWindow::save_local_cfg() { if (flag_save_local == false) { flag_save_local = true; + if (flag_save_all == false) { + std::string cmd_boot_time = "sudo ubconfig --default --source system get boot GRUB_TIMEOU"; + this->set_menu_boot(cmd_boot_time); + } } - else{ + else { info_status_app("boxInfoMessOK"); lblWarning->set_text(gettext("Nothing to save!")); } - info_warning_error(2); - } void MainWindow::download_globl_cfg() { @@ -380,6 +410,8 @@ void MainWindow::download_globl_cfg() { flag_save_global = true; flag_save_all = true; flag_load = true; + std::string cmd_boot_time = "sudo ubconfig --default --source system get boot GRUB_TIMEOU"; + this->get_menu_boot(cmd_boot_time); info_warning_error(1); } @@ -391,6 +423,8 @@ void MainWindow::download_local_cfg() { flag_save_local = true; flag_save_global = true; flag_save_all = true; + std::string cmd_boot_time = "sudo ubconfig --default --source global get boot GRUB_TIMEOU"; + this->get_menu_boot(cmd_boot_time); info_warning_error(0); } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 84f95b4..252af13 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -115,10 +115,6 @@ class MainWindow : public Gtk::ApplicationWindow { bool flag_save_all = false; bool flag_save_global = false; bool flag_save_local = false; - int width; - int heigh; - int screen_width; - int screen_hight; int index_error = 0; string str_cmd_error = ""; template @@ -130,6 +126,8 @@ class MainWindow : public Gtk::ApplicationWindow { MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); + void get_menu_boot(string cmd); + void set_menu_boot(string cmd); void get_builder(); void add_CSS(); void localization(); @@ -137,7 +135,6 @@ class MainWindow : public Gtk::ApplicationWindow { void settings(); void fn_event_intelMax1(); void fn_event_intelMax4(); - void get_monitor_size(); void synopsis_show(); void view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtr list_store_m , std::array, 5> &arr_view, size_t index); void wrapper_system(string cmd, string thread_str);