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

Исправлен дизайн и отступы в коде

Browse Source
pull/18/head
Igor Belitskiy 3 years ago
parent fa7f759578
commit 5d3180930d
2 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -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);
@ -98,7 +95,6 @@ void MainWindow::settings(){
this->str_last_launched_os = this->pars_last_launched_os();
vector<string> 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,12 +428,10 @@ 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() {
@ -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<Gtk::ListStore> &list_store, Gtk::Entry &entry, std::vector<std::string> &vec_Option, int size, string key) {
flag_blocked_tree_view = true;
vector<string> vec_params;
@ -587,7 +569,6 @@ void MainWindow::set_entry_to_tree_view(Glib::RefPtr<Gtk::ListStore> &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() {
@ -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, ",");

4
ubl-settings-bootloader.glade
Unescape View File

@ -601,7 +601,7 @@ specified priority</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow">
<property name="height-request">64</property>
<property name="height-request">65</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-top">6</property>
@ -745,7 +745,7 @@ specified priority</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow">
<property name="height-request">64</property>
<property name="height-request">65</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-top">6</property>

Write Preview
Loading…
Cancel
Save