diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index e6d9f93..66c7629 --- a/Makefile +++ b/Makefile @@ -117,10 +117,8 @@ install: check uninstall @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg" @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png" @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" alert.svg @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" close.svg @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/VERSION.md b/VERSION.md old mode 100644 new mode 100755 diff --git a/alert.svg b/alert.svg old mode 100644 new mode 100755 diff --git a/bg_top.png b/bg_top.png old mode 100644 new mode 100755 diff --git a/checked.svg b/checked.svg old mode 100644 new mode 100755 index 7956b34..e3cab42 --- a/checked.svg +++ b/checked.svg @@ -21,11 +21,11 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="14.8125" - inkscape:cx="-12.219409" + inkscape:cx="-4.6919831" inkscape:cy="9.9578059" inkscape:window-width="1920" inkscape:window-height="1027" - inkscape:window-x="1920" + inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg25" /> @@ -323,5 +323,5 @@ + style="fill:#4d4d4d;fill-opacity:1" /> diff --git a/close.svg b/close.svg old mode 100644 new mode 100755 diff --git a/ru.ublinux.pkexec.ubl-settings-datetime.exec.policy b/ru.ublinux.pkexec.ubl-settings-datetime.exec.policy old mode 100644 new mode 100755 diff --git a/screenshot/screenshot.png b/screenshot/screenshot.png old mode 100644 new mode 100755 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/source/main.cc b/source/main.cc old mode 100644 new mode 100755 diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc old mode 100644 new mode 100755 index f40b2d7..c773f88 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -78,15 +78,16 @@ void MainWindow::settings(){ btnBoxAboutDialog->set_visible(false); this->event(); this->parse_text_date(); + this->download_local_cfg(); this->download_globl_cfg(); - this->download_local_cfg(); - orevrlayInfo->add_overlay(*boxInfoError); - imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg"); - imageCloseInfo->set("/usr/share/ubl-settings-datetime/images/close.svg"); + + //orevrlayInfo->add_overlay(*boxInfoError); + //imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg"); + //GdkPixbuf* pixbuf_image = gdk_pixbuf_new_from_file_at_size("/usr/share/ubl-settings-datetime/images/close.svg", 12,12,NULL); + //GtkWidget* imageInfo = GTK_WIDGET(imageCloseInfo->gobj()); + //gtk_image_set_from_pixbuf(GTK_IMAGE(imageInfo), pixbuf_image); } else{ - btnSaveLocal->set_sensitive(false); - btnSaveGlobl->set_sensitive(false); btnDownload->set_sensitive(false); numTimeHrs->set_sensitive(false); numTimeMin->set_sensitive(false); @@ -108,6 +109,8 @@ void MainWindow::settings(){ lblDateTimeSetting->set_sensitive(false); btnBoxAboutDialog->set_visible(false); this->event(); + imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg"); + } @@ -127,13 +130,15 @@ int MainWindow::check_root(){ void MainWindow::lacalization(){ btnSynopsis->set_label(_("Synopsis")); - aboutProgram->set_label(_("About the program")); + btnAbout->set_label(_("About the program")); + lblDonwlodLocal->set_label(_("Download local")); + lblDonwlolGlob->set_label(_("Download global")); + lblSaveGlob->set_label(_("Save to Global configuration")); + lblSaveLocal->set_label(_("Save to local configuration")); + lblSaveLocalGlob->set_label(_("Save to global and local configuration")); aboutWindows->set_comments(_("Setting the date and time")); lblSave->set_label(_("Save")); lblDownload->set_label(_("Download")); - btnDownloadGlobal->set_label(_("Download global")); - btnSaveLocal->set_label(_("Save local")); - btnSaveGlobl->set_label(_("Save global")); txtDate->set_tooltip_text(_("Date of\nFormat: DD.MM.YYYY")); txtNtpServer->set_tooltip_text(_("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.")); lblSynchronizebChkGLob->set_text(_("Synchronize via NTP:")); @@ -198,22 +203,14 @@ void MainWindow::add_CSS(){ //Glib::RefPtr context_button = btnHardwareTime->get_style_context(); context->add_class("cssboxColor1"); context_lbl_head->add_class("textHead"); - Glib::RefPtr boxInfo = boxInfoError->get_style_context(); - boxInfo->add_class("boxInfoOK"); - Glib::RefPtr btnWarngingCloseCss = btnWarngingClose->get_style_context(); - btnWarngingCloseCss->add_class("boxInfoOK"); } -void MainWindow::info_status_app(string style){ - Glib::RefPtr cssProvider = Gtk::CssProvider::create(); - cssProvider->load_from_path(path_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 + +void MainWindow::info_status_app(string stule){ Glib::RefPtr boxInfo = boxInfoError->get_style_context(); - boxInfo->add_class(style); - Glib::RefPtr btnWarngingCloseCss = btnWarngingClose->get_style_context(); - btnWarngingCloseCss->add_class(style); + boxInfo->remove_class("boxInfoMessOK"); + boxInfo->remove_class("boxInfoMessError"); + boxInfo->add_class(stule); } void MainWindow::get_builder(){ @@ -248,24 +245,34 @@ void MainWindow::get_builder(){ builder->get_widget("mess_sudo",mess_sudo); builder->get_widget("lblMessageSudo",lblMessageSudo); builder->get_widget("btnMessCloseSudo",btnMessCloseSudo); - builder->get_widget("btnSaveLocal",btnSaveLocal); - builder->get_widget("btnSaveGlobl",btnSaveGlobl); builder->get_widget("lblSave",lblSave); - builder->get_widget("btnDownload",btnDownload); builder->get_widget("lblDownload",lblDownload); - builder->get_widget("btnDownloadGlobal", btnDownloadGlobal); - builder->get_widget("btnSettings", btnSettings); builder->get_widget("aboutWindows", aboutWindows); builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog); - builder->get_widget("btnSynopsis", btnSynopsis); - builder->get_widget("aboutProgram", aboutProgram); builder->get_widget("boxInfoError", boxInfoError); - builder->get_widget("orevrlayInfo", orevrlayInfo); - builder->get_widget("btnWarngingClose", btnWarngingClose); builder->get_widget("lblWarning", lblWarning); builder->get_widget("imgInfo", imgInfo); - builder->get_widget("imageCloseInfo", imageCloseInfo); + builder->get_widget("popDownloadMenu", popDownloadMenu); + builder->get_widget("popSaveMenu", popSaveMenu); + builder->get_widget("popAbout", popAbout); + builder->get_widget("btnSave", btnSave); + builder->get_widget("btnSettings", btnSettings); + builder->get_widget("btnDownload", btnDownload); + builder->get_widget("btnSynopsis", btnSynopsis); + builder->get_widget("btnAbout", btnAbout); + builder->get_widget("btnDonwlodLocal", btnDonwlodLocal); + builder->get_widget("btnDonwlolGlob", btnDonwlolGlob); + builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob); + builder->get_widget("btnSaveLocal", btnSaveLocal); + builder->get_widget("btnSaveGlob", btnSaveGlob); + builder->get_widget("lblSynopsis", lblSynopsis); + builder->get_widget("lblAbout", lblAbout); + builder->get_widget("lblDonwlodLocal", lblDonwlodLocal); + builder->get_widget("lblDonwlolGlob", lblDonwlolGlob); + builder->get_widget("lblSaveLocalGlob", lblSaveLocalGlob); + builder->get_widget("lblSaveLocal", lblSaveLocal); + builder->get_widget("lblSaveGlob", lblSaveGlob); this->add_CSS(); } void MainWindow::gui_exit(){ @@ -289,26 +296,16 @@ void MainWindow::event(){ cbRegion->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::append_zone)); cldrDate->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); mess_sudo->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit_2)); - btnDownloadGlobal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg)); - btnSaveLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_local_cfg)); - btnSaveGlobl->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_global_cfg)); - aboutProgram->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::about_Dialog_show)); - btnDownload->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); - btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); - btnWarngingClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::close_banner_info)); - Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::close_banner_info_timer), 10000); -} - -bool MainWindow::close_banner_info_timer(){ - if (bool_close_banner_info==true){ - boxInfoError->hide(); - } - - return false; -} - -void MainWindow::close_banner_info(){ - boxInfoError->hide(); + btnDownload->signal_clicked().connect([&](){popDownloadMenu->show();}); + btnSave->signal_clicked().connect([&](){popSaveMenu->show();}); + btnSettings->signal_clicked().connect([&](){popAbout->show();}); + btnAbout->signal_clicked().connect([&](){aboutWindows->show();}); + btnSynopsis->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); + btnDonwlodLocal->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); + btnDonwlolGlob->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg)); + btnSaveLocalGlob->signal_clicked().connect([&](){save_global_local_cfg();}); + btnSaveLocal->signal_clicked().connect([&](){save_local_cfg();}); + btnSaveGlob->signal_clicked().connect([&](){save_global_cfg();}); } void MainWindow::synopsis_show(){ @@ -317,11 +314,6 @@ void MainWindow::synopsis_show(){ warning_info=0; } - -void MainWindow::about_Dialog_show(){ - aboutWindows->show(); -} - void MainWindow::download_local_cfg(){ string cmd = "/usr/bin/ubconfig --default --source system get clock ZONE"; this->fill_in_reg_zone(cmd); @@ -349,33 +341,19 @@ void MainWindow::save_global_cfg(){ this->save_Dhcp(); info_warning_error(3); } - +void MainWindow::save_global_local_cfg(){ + string cmd = "ubconfig --target system set clock ZONE="; + this->enter_zone(cmd); + info_warning_error(4); + cmd = "/usr/bin/ubconfig --target global set clock ZONE="; + this->enter_zone(cmd); + this->save_Dhcp(); +} void MainWindow::info_warning_error(int mess){ - boxInfoError->show(); - if (error_info!=0){ - imgInfo->set("/usr/share/ubl-settings-datetime/images/alert.svg"); - bool_close_banner_info=false; - info_status_app("boxInfoError"); - error_info=0; - warning_info=0; - if (mess == 0){ - lblWarning->set_text(_("Local configuration reading error")); - } - else if (mess == 1){ - lblWarning->set_text(_("Global configuration read error")); - } - else if (mess == 2){ - lblWarning->set_text(_("Local configuration write error")); - } - else if (mess == 3){ - lblWarning->set_text(_("Global configuration write error")); - } - } - else if (warning_info!=0){ + if (error_info>0 || warning_info>0){ + info_status_app("boxInfoMessError"); imgInfo->set("/usr/share/ubl-settings-datetime/images/warning.svg"); - bool_close_banner_info=false; - info_status_app("boxInfoWarning"); error_info=0; warning_info=0; if (mess == 0){ @@ -390,12 +368,13 @@ void MainWindow::info_warning_error(int mess){ else if (mess == 3){ lblWarning->set_text(_("Global configuration write error")); } - + else if (mess == 4){ + lblWarning->set_text(_("Error saved local and global configuration")); + } } else{ + info_status_app("boxInfoMessOK"); imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg"); - bool_close_banner_info=true; - info_status_app("boxInfoOK"); if (mess == 0){ lblWarning->set_text(_("Local configuration downloaded successfully")); } @@ -408,6 +387,9 @@ void MainWindow::info_warning_error(int mess){ else if (mess == 3){ lblWarning->set_text(_("Global configuration successfully written")); } + else if (mess == 4){ + lblWarning->set_text(_("Successfully saved local and global configuration")); + } } } @@ -602,18 +584,7 @@ void MainWindow::event_entry_cbDhcp(){ txtNtpServer->set_text(""); btnUpdateDateTime->set_sensitive(false); txtNtpServer->set_sensitive(false); - /* - cmd = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"; - struct Result obj_result = this->wrapper_call(cmd); - if (obj_result.error==0){ - txtNtpServer->set_text(obj_result.response); - } - else{ - //string error = ""; - //error = string(_("ERROR")) + "\n" + obj_result.response; - //lblMessage->set_text(error); - //mess_dchp->show(); - }*/ + } else if (activ_index==1){ @@ -623,25 +594,6 @@ void MainWindow::event_entry_cbDhcp(){ } else if (activ_index==2){ txtNtpServer->set_sensitive(true); - /* - string cmd = "/usr/bin/ubconfig get network NTPSERVERS"; - struct Result obj_result = this->wrapper_call(cmd); - if (obj_result.error==0){ - if (obj_result.response.find("default")==std::string::npos){ - if (obj_result.response.find("dhcp")==std::string::npos){ - txtNtpServer->set_text(obj_result.response); - } - cbDhcp->set_active(activ_index); - } - } - else if (obj_result.error==3){} - else{ - string error = ""; - error = string(_("ERROR")) + "\n" + obj_result.response; - lblMessage->set_text(error); - mess_dchp->show(); - } - */ } else if (activ_index==3){ txtNtpServer->set_text(""); @@ -746,6 +698,10 @@ void MainWindow::entry_dhcp_mess(){ txtNtpServer->set_text(obj_result.response); } else{ + if (obj_result.error==2){ + error_info-=1; + warning_info-=1; + } //string error = ""; //error = string(_("ERROR")) + "\n" + obj_result.response; //lblMessage->set_text(error); @@ -800,7 +756,6 @@ void MainWindow::get_config(){ this->read_file(); this->update_hour_minute(); this->update_calendar(); - this->entry_dhcp_mess(); } array MainWindow::split_region_zone(string read_reg_zon_cfg){ @@ -921,6 +876,13 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex index+=1; } } + if (region=="Etc" && zone==""){ + error_info-=1; + warning_info-=1; + } + else if (region==""){ + error_info+=1; + } } string MainWindow::call(string cmd){ diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h old mode 100644 new mode 100755 index 5e82786..1831d81 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -58,6 +58,9 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Window *mess_dchp; Gtk::Window *mess_sudo; Gtk::Popover *popCalendar; + Gtk::Popover *popSaveMenu; + Gtk::Popover *popDownloadMenu; + Gtk::Popover *popAbout; Gtk::Calendar *cldrDate; Gtk::Label *lblMessage; Gtk::Label *lblMessageSudo; @@ -79,23 +82,31 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::CheckButton *cbxSynchronizeNtp; Gtk::Entry *txtNtpServer; Gtk::Entry *txtDate; - Gtk::MenuButton *btnDownload; - Gtk::MenuItem *btnSaveLocal; - Gtk::MenuItem *btnSaveGlobl; - Gtk::MenuItem *btnDownloadGlobal; + Gtk::Button *btnDownload; + Gtk::Button *btnSave; + Gtk::Button *btnSettings; Gtk::AboutDialog *aboutWindows; Gtk::ButtonBox *btnBoxAboutDialog; - Gtk::MenuButton *btnSettings; - Gtk::MenuItem *btnSynopsis; - Gtk::MenuItem *aboutProgram; - Gtk::Widget *boxInfoError; - Gtk::Overlay *orevrlayInfo; - Gtk::Button *btnWarngingClose; + + Gtk::Box *boxInfoError; Gtk::Label *lblWarning; Gtk::Image *imgInfo; - Gtk::Image *imageCloseInfo; std::map > time_reg_map; std::map > time_reg_map_local; + Gtk::Button *btnSaveLocalGlob; + Gtk::Button *btnSaveLocal; + Gtk::Button *btnSaveGlob; + Gtk::Button *btnDonwlolGlob; + Gtk::Button *btnDonwlodLocal; + Gtk::Button *btnAbout; + Gtk::Button *btnSynopsis; + Gtk::Label *lblSaveLocalGlob; + Gtk::Label *lblSaveLocal; + Gtk::Label *lblSaveGlob; + Gtk::Label *lblDonwlolGlob; + Gtk::Label *lblDonwlodLocal; + Gtk::Label *lblAbout; + Gtk::Label *lblSynopsis; unsigned int year=0; unsigned int month=0; unsigned int day=0; @@ -119,12 +130,10 @@ class MainWindow : public Gtk::ApplicationWindow { MainWindow(Glib::RefPtr const& builder); virtual ~MainWindow() = default; void info_warning_error(int mess); - bool close_banner_info_timer(); - void close_banner_info(); void synopsis_show(); + void save_global_local_cfg(); void fill_in_reg_zone(string &cmd); void download_globl_cfg(); - void about_Dialog_show(); void save_local_cfg(); void save_global_cfg(); void save_Dhcp(); @@ -162,7 +171,7 @@ class MainWindow : public Gtk::ApplicationWindow { void stop_ntp(); void wind_close_ntp(); void wrapper_system(string cmd); - void info_status_app(string style); + void info_status_app(string stule); void wrapper_update_time_date(); string zone_file_read(string zone); void sort_zone(vector *time_reg_map_local,vector *time_reg_map); diff --git a/style.css b/style.css old mode 100644 new mode 100755 index 8a2e785..ea9b691 --- a/style.css +++ b/style.css @@ -1,17 +1,13 @@ +.boxInfoMessError{ + background-color: #ea9999; +} .cssboxColor1{ background: url("/usr/share/ubl-settings-datetime/images/bg_top.png") no-repeat; } +.boxInfoMessOK{ + background-color: #f3f0ac; +} .textHead{ text-shadow: 1px 1px #ffffff; } -.boxInfoOK{ - background-color:#6edf64; -} -.boxInfoWarning{ - background-color: rgba(242, 255, 0, 1); -} - -.boxInfoError{ - background-color: rgba(255, 0, 0, 1); -} diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop old mode 100644 new mode 100755 diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade old mode 100644 new mode 100755 index ce8e835..93061eb --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -5,17 +5,24 @@ False О Программе + False + True center + ubl-settings-datetime dialog + True ubl-settings-datetime - 1.4 + 1.28 Copyright © 2021 - the ublinux team Setting the date and time https://ublinux.ru/ www.ublinux.ru + Это приложение распространяется без каких-либо гарантий. +Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. UBGroup UBGroup - ubl-settings-datetime + ublinux-ubconfig + True gpl-2-0 @@ -24,9 +31,11 @@ 2 - btnBoxAboutDialog False end + + + False @@ -40,150 +49,471 @@ - - True + False - start - True - vertical + Внимание! + dialog True False + vertical - + True False 5 5 5 5 - 6 - 6 - gtk-dialog-warning + + + True + False + 5 + 5 + 5 + 6 + 6 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 6 + 6 + Enter DHCP ! + + + True + True + 1 + + False True - 0 + 1 - + + OK True - False - start - center - 6 + True + True + 5 5 5 5 - 6 - 6 - Warning! - - - - + 3 + 3 - True + False True 1 + + + + + False + Внимание! + center + dialog + + + True + False + vertical - + True False - True - none + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 6 + 6 + 50 + gtk-dialog-warning + + + True + True + 0 + + - + + 160 True False - gtk-remove + start + center + 5 + 5 + 5 + 5 + 6 + 6 + Enter DHCP ! + + True + True + 1 + False True - end - 3 + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 - - True - True - 0 - - - True + False - - True - False - Save Local - True - - - - + True False - Save Global - True + 0 + none + + + True + False + 5 + 5 + 5 + 5 + + + True + False + vertical + + + True + True + True + True + + + True + False + start + Synopsis + + + + + False + True + 0 + + + + + True + True + True + + + True + False + start + About the program + + + + + False + True + 1 + + + + + + + + + - - True + False - + True False - Download Global - True + 0 + none + + + True + False + 5 + 5 + 5 + 5 + + + True + False + vertical + + + True + True + True + + + True + False + start + Download local + + + + + False + True + 0 + + + + + True + True + True + start + + + True + False + start + Download global + + + + + False + True + 1 + + + + + + + + + - - True + False - - True - False - Synopsis - True - - - - + True False - About the program - True + 0 + none + + + True + False + 5 + 5 + 5 + 5 + + + True + False + vertical + + + True + True + True + + + True + False + start + Save to global and local configuration + + + + + False + True + 0 + + + + + True + True + True + + + True + False + start + Save to local configuration + + + + + False + True + 1 + + + + + True + True + True + + + True + False + start + Save to Global configuration + + + + + False + True + 2 + + + + + + + + + False - + True False + vertical - + True False vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + gtk-missing-image + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + + + + + + + True + True + 1 + + + + + False + True + 0 + + True @@ -288,7 +618,7 @@ False True - 0 + 1 @@ -443,9 +773,9 @@ Format: DD.MM.YYYY True Интерактивный выбор даты 5 - 5 + 10 5 - 7 + 10 6 6 @@ -478,7 +808,7 @@ Format: DD.MM.YYYY True True True - 5 + 7 5 7 5 @@ -559,7 +889,7 @@ Format: DD.MM.YYYY 5 10 5 - 5 + 10 6 6 @@ -707,9 +1037,9 @@ Format: DD.MM.YYYY True False 5 - 10 + 5 5 - 10 + 5 5 0.019999999552965164 in @@ -756,7 +1086,7 @@ Format: DD.MM.YYYY 5 5 6 - 6 + 10 False False @@ -794,7 +1124,7 @@ Format: DD.MM.YYYY 5 5 6 - 6 + 10 False False @@ -847,12 +1177,14 @@ Format: DD.MM.YYYY False True - 1 + 2 - -1 + False + True + 0 @@ -885,13 +1217,15 @@ Format: DD.MM.YYYY True False True - menu2 + True + none + popDownloadMenu True False - + True False 5 @@ -900,7 +1234,7 @@ Format: DD.MM.YYYY 5 6 6 - media-floppy + Download False @@ -909,16 +1243,16 @@ Format: DD.MM.YYYY - + True - False - 5 - 5 - 5 - 5 - 6 - 6 - Download + False + True + False + True + False + + + False @@ -928,9 +1262,6 @@ Format: DD.MM.YYYY - False @@ -956,13 +1287,15 @@ Format: DD.MM.YYYY True False True - menu1 + True + none + popSaveMenu True False - + True False 5 @@ -971,7 +1304,10 @@ Format: DD.MM.YYYY 5 6 6 - go-bottom + Save + False @@ -980,16 +1316,15 @@ Format: DD.MM.YYYY - + True - False - 5 - 5 - 5 - 5 - 6 - 6 - Save + False + True + False + True + + + False @@ -999,9 +1334,6 @@ Format: DD.MM.YYYY - False @@ -1015,19 +1347,11 @@ Format: DD.MM.YYYY True False True - menu3 + True + none + popAbout - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - gtk-execute - + @@ -1071,171 +1395,4 @@ Format: DD.MM.YYYY - - False - Внимание! - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 6 - 6 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - - - False - Внимание! - center - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 5 - 5 - 5 - 5 - 6 - 6 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - diff --git a/ubl-settings-datetime.png b/ubl-settings-datetime.png old mode 100644 new mode 100755 diff --git a/ubl-settings-datetime.svg b/ubl-settings-datetime.svg old mode 100644 new mode 100755 diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po old mode 100644 new mode 100755 index 1bf5130..d2360a6 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -52,6 +52,12 @@ msgstr "OK" msgid "Setting the date and time" msgstr "Настройка даты времени" +msgid "Successfully saved local and global configuration" +msgstr "Успешно сохранена локальная и глобальная конфигурация" + +msgid "Error saved local and global configuration" +msgstr "Ошибка сохранена локальной и глобальной конфигурации" + msgid "Settings the date and time" msgstr "Настройки даты и времени" @@ -1642,10 +1648,13 @@ msgstr "Опции:\n" msgid "Save" msgstr "Сохранить" -msgid "Save global" +msgid "Save to global and local configuration" +msgstr "Сохранить в глобальную и локальную конфигурацию" + +msgid "Save to Global configuration" msgstr "Сохранить в глобальную конфигурацию" -msgid "Save local" +msgid "Save to local configuration" msgstr "Сохранить в локальную конфигурацию" msgid "Download global" diff --git a/warning.svg b/warning.svg old mode 100644 new mode 100755 index ab59be1..9a90dba --- a/warning.svg +++ b/warning.svg @@ -50,6 +50,6 @@ inkscape:window-maximized="1" />