diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index b6a0353..0f4cd44 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -15,8 +15,8 @@ bool flag_save = false; bool flag_save_local = false; bool flag_save_global = false; bool flag_load_global = false; -int socket_ext_id_I= 0; -int socket_trd_id_I= 0; +int socket_ext_id_I = 0; +int socket_trd_id_I = 0; CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help) : Glib::OptionGroup{p_name, p_description, p_help} { @@ -97,7 +97,6 @@ void MainWindow::settings() { this->event(); imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg"); } - } @@ -139,7 +138,6 @@ void MainWindow::lacalization() { lblHW->set_text(_("Synchronize hardware time:")); cbHw->append(_("Local time")); cbHw->append(_("UTC time")); - } void MainWindow::flag_block_gui() { @@ -187,36 +185,20 @@ void MainWindow::add_CSS() { Glib::RefPtr styleContext = Gtk::StyleContext::create(); Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application - Glib::RefPtr context = boxColor->get_style_context(); - Glib::RefPtr context_lbl_head = lblHead->get_style_context(); - context->add_class("cssboxColor1"); - context_lbl_head->add_class("textHead"); - /* + Glib::RefPtr boxColor_css = boxColor->get_style_context(); + boxColor_css->add_class("cssboxColor1"); + Glib::RefPtr lblHead_css = lblHead->get_style_context(); Glib::RefPtr boxButton_css = boxButton->get_style_context(); Glib::RefPtr boxSave_css = boxSave->get_style_context(); - Glib::RefPtr btnDownload_css = btnDownload->get_style_context(); - Glib::RefPtr lblDownload_css = lblDownload->get_style_context(); - Glib::RefPtr imgDonwload_css = imgDonwload->get_style_context(); Glib::RefPtr headerBar_css = headerBar->get_style_context(); - headerBar_css->add_class("bkim"); - imgDonwload_css->add_class("bkim"); - lblDownload_css->add_class("bkim"); - btnDownload_css->add_class("bkim"); - boxButton_css->add_class("bkim"); - boxSave_css->add_class("bkim"); - double opacity= 1.0; - headerBar->set_opacity(opacity); - boxButton->set_opacity(opacity); - boxSave->set_opacity(opacity); - btnDownload->set_opacity(opacity); - lblDownload->set_opacity(opacity); - imgDonwload->set_opacity(opacity); - btnSave->set_opacity(opacity); - lblSave->set_opacity(opacity); - btnSettings->set_opacity(opacity); - imgSave->set_opacity(opacity); - imgSettings->set_opacity(opacity); - */ + lblHead_css->add_class("textHead"); + boxButton_css->add_class("bkimButton"); + boxSave_css->add_class("bkimButton"); + headerBar_css->add_class("bkimHeadBar"); + //Glib::RefPtr w = this->get_style_context(); + //w->add_class("bkim"); + + } @@ -244,22 +226,22 @@ void MainWindow::get_builder() { builder->get_widget("cldrDate", cldrDate); builder->get_widget("mess_dchp", mess_dchp); builder->get_widget("lblMessage", lblMessage); - builder->get_widget("lblDateTimeSetting",lblDateTimeSetting); - builder->get_widget("lblHead",lblHead); - builder->get_widget("lblTime",lblTime); - builder->get_widget("lblData",lblData); - builder->get_widget("lblTimeZone",lblTimeZone); - builder->get_widget("lblReg",lblReg); - builder->get_widget("lblZone",lblZone); - builder->get_widget("lblSynchronizebChkGLob",lblSynchronizebChkGLob); - builder->get_widget("lblSynchronizeBtn",lblSynchronizeBtn); - builder->get_widget("lblTimeBios",lblTimeBios); + builder->get_widget("lblDateTimeSetting", lblDateTimeSetting); + builder->get_widget("lblHead", lblHead); + builder->get_widget("lblTime", lblTime); + builder->get_widget("lblData", lblData); + builder->get_widget("lblTimeZone", lblTimeZone); + builder->get_widget("lblReg", lblReg); + builder->get_widget("lblZone", lblZone); + builder->get_widget("lblSynchronizebChkGLob", lblSynchronizebChkGLob); + builder->get_widget("lblSynchronizeBtn", lblSynchronizeBtn); + builder->get_widget("lblTimeBios", lblTimeBios); builder->get_widget("btnHardwareTime",btnHardwareTime); builder->get_widget("mess_sudo",mess_sudo); - builder->get_widget("lblMessageSudo",lblMessageSudo); + builder->get_widget("lblMessageSudo", lblMessageSudo); builder->get_widget("btnMessCloseSudo",btnMessCloseSudo); - builder->get_widget("lblSave",lblSave); - builder->get_widget("lblDownload",lblDownload); + builder->get_widget("lblSave", lblSave); + builder->get_widget("lblDownload", lblDownload); builder->get_widget("aboutWindows", aboutWindows); builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog); builder->get_widget("boxInfoError", boxInfoError); @@ -290,7 +272,6 @@ void MainWindow::get_builder() { builder->get_widget("imgDonwload", imgDonwload); builder->get_widget("imgSettings", imgSettings); builder->get_widget("imgSave", imgSave); - } void MainWindow::gui_exit() { @@ -322,7 +303,6 @@ void MainWindow::event() { btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();}); btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();}); btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();}); - } void MainWindow::synopsis_show() { @@ -366,10 +346,10 @@ void MainWindow::save_local_cfg() { string cmd_default = "/usr/bin/ubconfig --target system set network NTPSERVERS=default"; string cmd_dhcp = "/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"; string cmd_set_ntp = "/usr/bin/ubconfig --target system set network NTPSERVERS=\""; - string remove = "/usr/bin/ubconfig --target system remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp); + string remove_ntp = "/usr/bin/ubconfig --target system remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); string local = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"; - string hw = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"; + string hw = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"; this->hardware_clock_global(local, hw); info_warning_error(2); } @@ -380,8 +360,8 @@ void MainWindow::save_global_cfg() { string cmd_default = "/usr/bin/ubconfig --target global set network NTPSERVERS=default"; string cmd_dhcp = "/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"; string cmd_set_ntp = "/usr/bin/ubconfig --target global set network NTPSERVERS=\""; - string remove = "/usr/bin/ubconfig --target global remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp); + string remove_ntp = "/usr/bin/ubconfig --target global remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); string local = "/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"; string hw = "/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"; this->hardware_clock_global(local, hw); @@ -560,7 +540,6 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) { mess_dchp->show(); } } - } return true; } @@ -676,8 +655,6 @@ void MainWindow::event_entry_cbDhcp() { txtNtpServer->set_text(""); btnUpdateDateTime->set_sensitive(false); txtNtpServer->set_sensitive(false); - - } else if (activ_index == 1) { btnUpdateDateTime->set_sensitive(false); @@ -685,7 +662,7 @@ void MainWindow::event_entry_cbDhcp() { txtNtpServer->set_text(""); } else if (activ_index == 2) { - if (flag_ntp_edit==false) { + if (flag_ntp_edit == false) { txtNtpServer->set_sensitive(true); } } @@ -703,7 +680,6 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove } else if (activ_index == 0) { wrapper_system(cmd_default, "&"); - } else if (activ_index == 1) { wrapper_system(cmd_dhcp, "&"); @@ -761,7 +737,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc else { cbDhcp->set_active(2); txtNtpServer->set_text(str_dhcp); - if (flag_ntp_edit==false) { + if (flag_ntp_edit ==false) { txtNtpServer->set_sensitive(true); } } @@ -772,7 +748,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); btnUpdateDateTime->set_sensitive(true); - warning_info-= 1; + warning_info -= 1; } } @@ -846,8 +822,6 @@ void MainWindow::fill_in_reg_zone(string &cmd) { } } - - void MainWindow::get_config() { this->read_file(); this->update_hour_minute(); @@ -872,7 +846,6 @@ array MainWindow::split_region_zone(string &read_reg_zon_cfg) { arr[1] = ""; } return arr; - } @@ -957,7 +930,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex string zone_mixing = ""; string path_reg_zone = ""; string zone_offest = ""; - path_reg_zone=region + "/" + zone; + path_reg_zone = region + "/" + zone; zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str()); if (region == "") { tmpCbZone->append(" "); @@ -1008,8 +981,7 @@ string MainWindow::call(string cmd) { status = pclose(fp); if (status == -1) { exit(1); - } - + } return path; } @@ -1018,8 +990,8 @@ void MainWindow::append_zone() { int index = cbRegion->get_active_row_number(); if (index!=-1) { string str_region = array_region[index]; - string zone_mixing= ""; - string path_dir= ""; + string zone_mixing = ""; + string path_dir = ""; if(str_region.length() != 0) { for (const auto &_str_zone : time_reg_map_local.at(str_region)) { cbZone->append(Glib::ustring(_str_zone)); @@ -1227,8 +1199,9 @@ void MainWindow::sort_zone(vector *time_reg_map_local,vector *ti b = (*time_reg_map)[j]; (*time_reg_map)[j] = (*time_reg_map)[j + 1]; (*time_reg_map)[j + 1] = b; - } } - } + } + } + } } } diff --git a/style.css b/style.css index fadccb5..6467710 100644 --- a/style.css +++ b/style.css @@ -71,11 +71,11 @@ margin-bottom:0px; } -.bkim{ - background-image: -gtk-gradient(linear, - left top, left bottom, - from(@entry_background_a), - color-stop(0.20, @entry_background_b), - color-stop(0.85, @entry_background_c), - to(@entry_background_d)); +.bkimHeadBar{ + opacity:1.0; +} + +.bkimButton{ + background-color: transparent; + opacity:1.0; } \ No newline at end of file