From 5d3180930dfdd377b0b24f3b39714c44e87355a2 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 4 May 2023 09:17:21 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-bootloader.cc | 50 +++++++++---------------------- ubl-settings-bootloader.glade | 4 +-- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index a290dc7..ab90581 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -17,17 +17,14 @@ CmdArgParser::CmdArgParser(const string& p_name, const string& p_description, co socketIDArg.set_long_name("socket-id"); socketIDArg.set_flags(Glib::OptionEntry::FLAG_IN_MAIN); socketIDArg.set_description("Settings manager socket"); - Glib::OptionEntry socketExtId; socketExtId.set_long_name("socket-ext-id"); socketExtId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN); socketExtId.set_description("Settings manager secondary socket"); - Glib::OptionEntry socketTrdId; socketTrdId.set_long_name("socket-trd-id"); socketTrdId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN); socketTrdId.set_description("Settings manager secondary socket"); - add_entry(socketIDArg, m_socketID); add_entry(socketExtId, socket_ext_id_I); add_entry(socketTrdId, socket_trd_id_I); @@ -64,7 +61,7 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { this->settings(); } -void MainWindow::settings(){ +void MainWindow::settings() { map_cmd_error[""] = ""; vec_param_names.push_back("GRUB_TIMEOUT"); vec_param_names.push_back("GRUB_CMDLINE_LINUX"); @@ -84,7 +81,7 @@ void MainWindow::settings(){ btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); #ifdef WEBKIT_FOUND - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + one = WEBKIT_WEB_VIEW(webkit_web_view_new()); three = Glib::wrap(GTK_WIDGET(one)); wndWeb->add(*three); #endif @@ -98,7 +95,6 @@ void MainWindow::settings(){ this->str_last_launched_os = this->pars_last_launched_os(); vector os_control_list; this->pars_os(os_control_list); - this->download_local_cfg(); this->download_globl_cfg(); this->view_add_colums_melody(*treeViewMusic); @@ -111,8 +107,6 @@ void MainWindow::settings(){ obj_menu_os.set_last_launched_os(this->str_last_launched_os); obj_menu_os.init(); obj_menu_os.event(); - - } else{ boxWidgetAll->set_sensitive(false); @@ -253,6 +247,7 @@ void MainWindow::item_selected_OTT(const Gtk::TreeModel::Path&, const Gtk::TreeM entryOTT->set_text(str_flags); } } + void MainWindow::item_selected_IPT(const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&) { auto selection_kernel = treeViewKernel->get_selection(); auto selection_OTT = treeViewOTT->get_selection(); @@ -386,15 +381,12 @@ void MainWindow::get_builder() { builder->get_widget("lblInfoSeconds", lblInfoSeconds); builder->get_widget("lblHeaderName", lblHeaderName); builder->get_widget("lblInfoHead", lblInfoHead); - builder->get_widget("spbSecond", spbSecond); builder->get_widget("entryKernel", entryKernel); builder->get_widget("entryIPT", entryIPT); builder->get_widget("entryOTT", entryOTT); - builder->get_widget("boxColor", boxColor); builder->get_widget("boxWidgetAll", boxWidgetAll); - builder->get_widget("aboutWindows", aboutWindows); builder->get_widget("btnSynopsis", btnSynopsis); builder->get_widget("btnAbout", btnAbout); @@ -423,7 +415,6 @@ void MainWindow::get_builder() { builder->get_widget("wndWeb", wndWeb); #endif builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); - builder->get_widget("lblwebHeaderName", lblwebHeaderName); builder->get_widget("lblhelpText", lblhelpText); builder->get_widget("lblhelpHeader", lblhelpHeader); @@ -437,15 +428,13 @@ void MainWindow::get_builder() { builder->get_widget("treeViewMusic", treeViewMusic); builder->get_widget("lblBootMenuUsers", lblBootMenuUsers); builder->get_widget("lblRingtoneStartup", lblRingtoneStartup); - builder->get_widget("btnAddUser", btnAddUser); builder->get_widget("btnRemoveUser", btnRemoveUser); builder->get_widget("btnAddMusic", btnAddMusic); builder->get_widget("btnRemoveMusic", btnRemoveMusic); - } -void MainWindow::localization(){ +void MainWindow::localization() { time_t now = time(0); tm *ltm = localtime(&now); unsigned int year = 1900+ ltm->tm_year; @@ -462,7 +451,6 @@ void MainWindow::localization(){ lblHeaderAboutTopic->set_label(str_about); lblBootMenuUsers->set_text(str_title_Boot_Menu_Users); lblRingtoneStartup->set_text(str_title_Ringtone_Startup); - aboutWindows->set_website_label(project_Home_page); lblInfoCommand->set_text(command_line_parameters); lblInfoCommand1->set_text(command_line_parameters); @@ -533,6 +521,7 @@ bool MainWindow::focus_out_txt_IPT(GdkEventFocus*) { flag_blocked_tree_view = false; return true; } + bool MainWindow::focus_out_txt_OTT(GdkEventFocus*) { auto selection_OTT = treeViewIPT->get_selection(); selection_OTT->unselect_all(); @@ -542,10 +531,6 @@ bool MainWindow::focus_out_txt_OTT(GdkEventFocus*) { return true; } - - - - bool MainWindow::focus_in_txt_kernel(GdkEventFocus*) { auto selection_kernel = treeViewKernel->get_selection(); selection_kernel->unselect_all(); @@ -563,9 +548,6 @@ bool MainWindow::focus_in_txt_OTT(GdkEventFocus*) { return true; } - - - void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store, Gtk::Entry &entry, std::vector &vec_Option, int size, string key) { flag_blocked_tree_view = true; vector vec_params; @@ -587,7 +569,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr &list_store if (text.find("\"") == string::npos && text.length() != 0) { text = "\"" + text + "\""; } - map_cmd_selection[key] = text; } @@ -627,7 +608,6 @@ void MainWindow::cmd_entry_all(Gtk::Entry &entry, string cmd_settings, string cm else { obj_process_system.call(cmd_remove, ""); } - } void MainWindow::event() { @@ -733,7 +713,7 @@ void MainWindow::set_init_data_superuser(std::map &map_temp) { vector vec_superusers = Utils::split(names_superusers, ','); Gtk::TreeModel::Children children = treeViewUser_model->children(); for (string& str_superuser: vec_superusers) { - for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter){ + for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) { Gtk::TreeModel::Row row = *iter; if (row[m_columns_user.name] == str_superuser) { row[m_columns_user.check_button] = true; @@ -751,13 +731,13 @@ void MainWindow::set_data_csv_melody() { string code_melodyes = ""; ifstream in(path_name); if (in.is_open()) { - while (getline(in, line)){ + while (getline(in, line)) { all_melody_old += line + "\n"; } } Glib::RefPtr treeViewMusic_model = treeViewMusic->get_model(); Gtk::TreeModel::Children children = treeViewMusic_model->children(); - for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter){ + for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) { Gtk::TreeModel::Row row = *iter; code_melodyes = row[m_columns_melody.melody_code] + ""; if (code_melodyes.length() != 0 && (row[m_columns_melody.title] + "").length() != 0) { @@ -839,7 +819,7 @@ void MainWindow::remove_line_user(const Gtk::TreeModel::Path&, const Gtk::TreeMo string password = ""; Glib::RefPtr treeViewUser_model = treeViewUser->get_model(); Gtk::TreeModel::Children children = treeViewUser_model->children(); - for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter){ + for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) { Gtk::TreeModel::Row row = *iter; name = row[m_columns_user.name] + ""; password = row[m_columns_user.password] + ""; @@ -867,7 +847,7 @@ void MainWindow::remove_line_melody(const Gtk::TreeModel::Path&, const Gtk::Tree bool flag_error = false; Glib::RefPtr treeViewMusic_model = treeViewMusic->get_model(); Gtk::TreeModel::Children children = treeViewMusic_model->children(); - for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter){ + for(Gtk::TreeModel::iterator iter = children.begin(); iter != children.end(); ++iter) { Gtk::TreeModel::Row row = *iter; code_melodyes = row[m_columns_melody.melody_code] + ""; if (code_melodyes.length() == 0 && (row[m_columns_melody.title] + "").length() == 0) { @@ -895,7 +875,6 @@ bool MainWindow::focus_tree_view(GdkEventFocus*) { treeViewKernel->collapse_all(); treeViewIPT->collapse_all(); treeViewOTT->collapse_all(); - return true; } @@ -990,7 +969,6 @@ void MainWindow::wrapper_save_local_cfg() { map_local_cmd_selection = map_cmd_selection; } - void MainWindow::set_data_cfg() { string str_flags = entryKernel->get_text(); Utils::str_remove(str_flags, ","); @@ -1155,8 +1133,8 @@ void MainWindow::template_open_browser() { int size_s = std::snprintf(nullptr, 0, cmd_execute, response_user.c_str(), cmd.c_str()) + 1; auto size = static_cast(size_s); std::unique_ptr buf(new char[ size ]); - std::snprintf( buf.get(), size, cmd_execute, response_user.c_str(), cmd.c_str() ); - cmd = string( buf.get(), buf.get() + size - 1 ); + std::snprintf(buf.get(), size, cmd_execute, response_user.c_str(), cmd.c_str()); + cmd = string(buf.get(), buf.get() + size - 1); } index_error = system(cmd.c_str()); } @@ -1224,7 +1202,7 @@ MainWindow::~MainWindow() { #endif } -void MainWindow::add_CSS(){ +void MainWindow::add_CSS() { Glib::RefPtr cssProvider = Gtk::CssProvider::create(); cssProvider->load_from_path(path_css); Glib::RefPtr styleContext = Gtk::StyleContext::create(); @@ -1235,7 +1213,7 @@ void MainWindow::add_CSS(){ Glib::RefPtr boxSave_css = boxSave->get_style_context(); boxInfo = boxInfoError->get_style_context(); imgBG->set(path_img_head_background); - if (socket_trd_id_I == 0 && socket_ext_id_I == 0){ + if (socket_trd_id_I == 0 && socket_ext_id_I == 0) { boxButton_css->add_class("bkim_no_plug"); boxSave_css->add_class("bkim_no_plug"); } diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index df2da1c..9ab3b06 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -601,7 +601,7 @@ specified priority vertical - 64 + 65 True True 6 @@ -745,7 +745,7 @@ specified priority vertical - 64 + 65 True True 6