Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.ublinux.ru/Applications/ubl-settings-datetime

Browse Source
pull/122/head
Dmitry Razumov 3 years ago
parent a98f9c0b16 387c336e2e
commit 6742043d27
5 changed files with 194 additions and 114 deletions
Show Stats Download Patch File Download Diff File

126
source/ubl-settings-datetime.cc
Unescape View File

@ -15,9 +15,11 @@ int socket_ext_id_I = 0;
int socket_trd_id_I = 0; int socket_trd_id_I = 0;
string version_application = "2.2"; string version_application = "2.2";
MainWindow* obj_main; MainWindow* obj_main;
void wrapper_synopsis_show() { void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {
if (self && user_data) {}
obj_main->global_lick_doc = link;
obj_main->aboutWindows->hide(); obj_main->aboutWindows->hide();
obj_main->synopsis_show(); obj_main->temp_help_show();
} }
CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help) CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help)
@ -128,7 +130,7 @@ void MainWindow::lacalization() {
tm *ltm = localtime(&now); tm *ltm = localtime(&now);
unsigned int year = 1900+ ltm->tm_year; unsigned int year = 1900+ ltm->tm_year;
string str_authors = string(copyright) + to_string(year); string str_authors = string(copyright) + to_string(year);
aboutWindows->set_program_name(name_app); aboutWindows->set_program_name(app_name);
aboutWindows->set_copyright(str_authors); aboutWindows->set_copyright(str_authors);
aboutWindows->set_comments(str_date_time); aboutWindows->set_comments(str_date_time);
aboutWindows->set_website(website); aboutWindows->set_website(website);
@ -145,7 +147,7 @@ void MainWindow::lacalization() {
cbDhcp->append(str_manual); cbDhcp->append(str_manual);
cbDhcp->append(str_disabled); cbDhcp->append(str_disabled);
lblDateTimeSetting->set_text(current_date_time); lblDateTimeSetting->set_text(current_date_time);
lblHead->set_text(setting_date_time); lblHead->set_text(str_date_time);
lblTime->set_text(str_time); lblTime->set_text(str_time);
lblData->set_text(str_date); lblData->set_text(str_date);
lblTimeZone->set_text(str_time_zone); lblTimeZone->set_text(str_time_zone);
@ -300,7 +302,7 @@ void MainWindow::get_builder() {
builder->get_widget("btnSave", btnSave); builder->get_widget("btnSave", btnSave);
builder->get_widget("btnSettings", btnSettings); builder->get_widget("btnSettings", btnSettings);
builder->get_widget("btnLoad", btnLoad); builder->get_widget("btnLoad", btnLoad);
builder->get_widget("btnSynopsis", btnSynopsis); builder->get_widget("btnhelp", btnhelp);
builder->get_widget("btnAbout", btnAbout); builder->get_widget("btnAbout", btnAbout);
builder->get_widget("btnLoadLocal", btnLoadLocal); builder->get_widget("btnLoadLocal", btnLoadLocal);
builder->get_widget("btnLoadGlob", btnLoadGlob); builder->get_widget("btnLoadGlob", btnLoadGlob);
@ -340,11 +342,11 @@ void MainWindow::get_builder() {
} }
void MainWindow::event() { void MainWindow::event() {
g_signal_connect(G_OBJECT(aboutWindows->gobj()), "activate-link", G_CALLBACK(wrapper_synopsis_show), this); g_signal_connect(G_OBJECT(aboutWindows->gobj()), "activate-link", G_CALLBACK(wrapper_help_show), this);
btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();});
chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;});
btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser));
btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); btnhelp->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::open_help));
btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock)); btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock));
btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close)); btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close));
//cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); //cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
@ -354,7 +356,7 @@ void MainWindow::event() {
cbRegion->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::append_zone)); 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)); cldrDate->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
btnAbout->signal_activate().connect([&]() {aboutWindows->show();}); btnAbout->signal_activate().connect([&]() {aboutWindows->show();});
btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); btnhelp->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::open_help));
btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_local_cfg)); btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_local_cfg));
btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_globl_cfg)); btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_globl_cfg));
btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();}); btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();});
@ -411,7 +413,7 @@ void MainWindow::event_zone() {
this->write_config(zone_text, "zone"); this->write_config(zone_text, "zone");
} }
void MainWindow::synopsis_show() { void MainWindow::temp_help_show() {
if (flag_open_browser == true) { if (flag_open_browser == true) {
this->open_browser(); this->open_browser();
} }
@ -421,18 +423,23 @@ void MainWindow::synopsis_show() {
} }
void MainWindow::open_help() {
global_lick_doc = const_link_doc;
temp_help_show();
}
void MainWindow::open_browser() { void MainWindow::open_browser() {
#ifdef WEBKIT_FOUND #ifdef WEBKIT_FOUND
webkit_web_view_load_uri(one, link_doc); webkit_web_view_load_uri(one, _(global_lick_doc.c_str()));
wndWeb->show_all(); wndWeb->show_all();
#else #else
this->template_open_browser(); this->template_open_browser(global_lick_doc);
#endif #endif
wndShowWeb->hide(); wndShowWeb->hide();
} }
void MainWindow::template_open_browser() { void MainWindow::template_open_browser(string link_doc) {
string cmd = cmd_xdg + string(_(link_doc)) + " &"; string cmd = cmd_xdg + string(_(link_doc.c_str())) + " &";
string buf = ""; string buf = "";
if (geteuid() == 0) { if (geteuid() == 0) {
string response_user = getlogin(); string response_user = getlogin();
@ -440,7 +447,7 @@ void MainWindow::template_open_browser() {
auto size = static_cast<size_t>(size_s); auto size = static_cast<size_t>(size_s);
std::unique_ptr<char[]> buf(new char[ size ]); std::unique_ptr<char[]> buf(new char[ size ]);
std::snprintf(buf.get(), size, cmd_execute, response_user.c_str(), cmd.c_str()); std::snprintf(buf.get(), size, cmd_execute, response_user.c_str(), cmd.c_str());
cmd = std::string( buf.get(), buf.get() + size - 1 ); cmd = string(buf.get(), buf.get() + size - 1);
} }
index_error = system(cmd.c_str()); index_error = system(cmd.c_str());
} }
@ -843,7 +850,7 @@ bool MainWindow::focus_ntp_text() {
bool flag_error = false; bool flag_error = false;
bool flag_error_check_ntp = false; bool flag_error_check_ntp = false;
string str_ntp = txtNtpServer->get_text(); string str_ntp = txtNtpServer->get_text();
flag_error_check_ntp = this->check_ntp(str_ntp); flag_error_check_ntp = this->wrapper_check_ntp(str_ntp);
for (const auto &simvol: array_simvol) { for (const auto &simvol: array_simvol) {
if (str_ntp.find(simvol) != std::string::npos) { if (str_ntp.find(simvol) != std::string::npos) {
flag_error= true; flag_error= true;
@ -886,19 +893,35 @@ vector<int> MainWindow::find_all(string &str_ntp, string substr) {
return sub_index; return sub_index;
} }
bool MainWindow::check_ntp(string &str_ntp) { bool MainWindow::check_is_num_ntp(string &str_ntp) {
vector<int> sub_index = this->find_all(str_ntp, "."); int code_ascii = 0;
if (sub_index.size() == 1) { bool flag_is_num = false;
int index_point = sub_index[0]; for (size_t index = 0; index < str_ntp.length(); index++) {
int len_str_ntp = str_ntp.length(); code_ascii = static_cast<int>(str_ntp[index]);
if (((len_str_ntp-index_point) >= 2) && (index_point > 2)) { if (code_ascii >= 48 && code_ascii <= 57 ) {
return false; flag_is_num = true;
break;
}
}
return flag_is_num;
}
bool MainWindow::check_is_string_ntp(string &str_ntp) {
int code_ascii = 0;
bool flag_is_str = false;
for (size_t index = 0; index < str_ntp.length(); index++) {
code_ascii = static_cast<int>(str_ntp[index]);
if ((code_ascii >= 65 && code_ascii <= 90) || (code_ascii >= 97 && code_ascii <= 122)) {
flag_is_str = true;
break;
} }
else {
return true;
} }
return flag_is_str;
} }
else if (sub_index.size() == 3) {
bool MainWindow::validate_ip_address(string &str_ntp) {
vector<int> sub_index = this->find_all(str_ntp, ".");
if (sub_index.size() == 3) {
int index_str_ntp = sub_index[0]; int index_str_ntp = sub_index[0];
int index_str_ntp_1 = sub_index[1]; int index_str_ntp_1 = sub_index[1];
int index_str_ntp_2 = sub_index[2]; int index_str_ntp_2 = sub_index[2];
@ -942,7 +965,60 @@ bool MainWindow::check_ntp(string &str_ntp) {
return true; return true;
} }
return false; return false;
}
bool MainWindow::validate_domen(string &str_ntp) {
vector<int> sub_index = this->find_all(str_ntp, ".");
if (sub_index.size() != 0) {
int index_point = sub_index[sub_index.size()-1];
int len_str_ntp = str_ntp.length();
if (((len_str_ntp-index_point) >= 2) && (index_point > 2)) {
return false;
}
else {
return true;
}
}
else {
return true;
}
return false;
}
bool MainWindow::check_ntp(string &str_ntp) {
bool flag_is_str = this->check_is_string_ntp(str_ntp);
bool flag_is_num = this->check_is_num_ntp(str_ntp);
if (flag_is_str) {
return this->validate_domen(str_ntp);
}
else if (flag_is_str && flag_is_num == false) {
return this->validate_ip_address(str_ntp);
}
else {
return false;
}
return false;
}
bool MainWindow::wrapper_check_ntp(string &str_ntp) {
bool flag_check_error_ntp = false;
if (str_ntp.find(",") != string::npos) {
vector<string> vec_ntp = split(str_ntp, ',');
for (string& str_split_ntp: vec_ntp) {
if (str_split_ntp.length() == 0) {
return true;
}
flag_check_error_ntp = this->check_ntp(str_split_ntp);
if (flag_check_error_ntp) {
return flag_check_error_ntp;
}
}
return false;
}
else {
return this->check_ntp(str_ntp);
}
return false;
} }
struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) { struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {

20
source/ubl-settings-datetime.h
Unescape View File

@ -26,7 +26,7 @@
#endif #endif
#define link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-datetime" #define const_link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-datetime"
#define cmd_xdg "xdg-open " #define cmd_xdg "xdg-open "
#define cmd_execute "su -l %s -c \" DISPLAY=$DISPLAY %s \"" #define cmd_execute "su -l %s -c \" DISPLAY=$DISPLAY %s \""
#define get_NTPSERVERS_DEFAULT "ubconfig --source default get [] NTPSERVERS_DEFAULT" #define get_NTPSERVERS_DEFAULT "ubconfig --source default get [] NTPSERVERS_DEFAULT"
@ -91,7 +91,7 @@
#define always_redirect _("Always redirect") #define always_redirect _("Always redirect")
#define nothing_save _("Nothing to save!") #define nothing_save _("Nothing to save!")
#define read_documentation_web _("Would you like to read documentation in the Web?") #define read_documentation_web _("Would you like to read documentation in the Web?")
#define redirected_documentation _("You will be redirected to documentation site, where user help pages are ""translated and supported by community.") #define redirected_documentation _("You will be redirected to documentation website where documentation is\n""translated and supported by community.")
#define str_help_h _("Setting up the date and time for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version Show package version\n"" --lock-datetime Lock date and time changes\n"" --lock-timezone Lock time zone changes\n"" --lock-ntp-mode Lock NTP mode selection\n"" --lock-ntp-edit Lock editing NTP servers\n"" --lock-sync-hwclock Lock sync hwclock mode selection\n"" --lock-save Lock saving local and global configuration\n"" --lock-save-local Lock save global configuration\n"" --lock-save-global Lock load global configuration\n"" --lock-load-global Lock load global configuration\n") #define str_help_h _("Setting up the date and time for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version Show package version\n"" --lock-datetime Lock date and time changes\n"" --lock-timezone Lock time zone changes\n"" --lock-ntp-mode Lock NTP mode selection\n"" --lock-ntp-edit Lock editing NTP servers\n"" --lock-sync-hwclock Lock sync hwclock mode selection\n"" --lock-save Lock saving local and global configuration\n"" --lock-save-local Lock save global configuration\n"" --lock-save-global Lock load global configuration\n"" --lock-load-global Lock load global configuration\n")
#define str_version _("ubl-settings-datetime version: ") #define str_version _("ubl-settings-datetime version: ")
#define local_read_error _("Local configuration reading error") #define local_read_error _("Local configuration reading error")
@ -207,7 +207,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::MenuItem *btnLoadGlob; Gtk::MenuItem *btnLoadGlob;
Gtk::MenuItem *btnLoadLocal; Gtk::MenuItem *btnLoadLocal;
Gtk::MenuItem *btnAbout; Gtk::MenuItem *btnAbout;
Gtk::MenuItem *btnSynopsis; Gtk::MenuItem *btnhelp;
Gtk::HeaderBar *headerBar; Gtk::HeaderBar *headerBar;
Gtk::Label *lblHeader; Gtk::Label *lblHeader;
Gtk::Label *lblHW; Gtk::Label *lblHW;
@ -255,6 +255,7 @@ class MainWindow : public Gtk::ApplicationWindow {
int minute; int minute;
string str_region_buff = ""; string str_region_buff = "";
string str_zone_buff = ""; string str_zone_buff = "";
string global_lick_doc = "";
int count_edit = 0; int count_edit = 0;
bool flag_global = false; bool flag_global = false;
bool flag_local = false; bool flag_local = false;
@ -285,13 +286,15 @@ class MainWindow : public Gtk::ApplicationWindow {
void log_mess_error(string &cmd); void log_mess_error(string &cmd);
void set_hardware_clock(string &local, string &etc); void set_hardware_clock(string &local, string &etc);
void info_warning_error(int mess); void info_warning_error(int mess);
void synopsis_show(); void help_show();
void temp_help_show();
void open_help();
void get_hardware_clock(string cmd); void get_hardware_clock(string cmd);
void save_global_local_cfg(); void save_global_local_cfg();
void fill_in_reg_zone(string cmd); void fill_in_reg_zone(string cmd);
void load_globl_cfg(); void load_globl_cfg();
void save_local_cfg(); void save_local_cfg();
void template_open_browser(); void template_open_browser(string link_doc);
void event_zone(); void event_zone();
bool focus_ntp(GdkEventFocus* event); bool focus_ntp(GdkEventFocus* event);
bool check_config(string key, int key_save); bool check_config(string key, int key_save);
@ -306,8 +309,13 @@ class MainWindow : public Gtk::ApplicationWindow {
void settings(); void settings();
void flag_block_gui(); void flag_block_gui();
void add_CSS(); void add_CSS();
bool check_is_string_ntp(string &str_ntp);
bool check_is_num_ntp(string &str_ntp);
void get_builder(); void get_builder();
void event(); void event();
bool wrapper_check_ntp(string &str_ntp);
bool validate_domen(string &str_ntp);
bool validate_ip_address(string &str_ntp);
void gui_mess_close(); void gui_mess_close();
bool focus_ntp_text() ; bool focus_ntp_text() ;
void event_entry_cbDhcp(); void event_entry_cbDhcp();
@ -364,6 +372,6 @@ private:
Gtk::Widget *parent; Gtk::Widget *parent;
}; };
void wrapper_synopsis_show(); void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data);
void help(); void help();
#endif #endif

145
ubl-settings-datetime.glade
Unescape View File

@ -27,8 +27,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="pixel-size">50</property> <property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property> <property name="icon-name">gtk-dialog-warning</property>
</object> </object>
@ -45,8 +45,8 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="label" translatable="yes">Enter DHCP !</property> <property name="label" translatable="yes">Enter DHCP !</property>
</object> </object>
<packing> <packing>
@ -96,7 +96,7 @@
<property name="program-name">ubl-settings-datetime</property> <property name="program-name">ubl-settings-datetime</property>
<property name="version">1.0</property> <property name="version">1.0</property>
<property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property> <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
<property name="comments" translatable="yes">Setting the date and time</property> <property name="comments" translatable="yes">Date and Time</property>
<property name="website">https://ublinux.ru/</property> <property name="website">https://ublinux.ru/</property>
<property name="website-label" translatable="yes">Project Home Page</property> <property name="website-label" translatable="yes">Project Home Page</property>
<property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий. <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
@ -163,8 +163,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="pixel-size">69</property> <property name="pixel-size">69</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</property> <property name="icon-name">com.ublinux.ubl-settings-datetime</property>
</object> </object>
@ -192,7 +192,8 @@
<property name="width-request">255</property> <property name="width-request">255</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Date and time settings</property> <property name="label" translatable="yes">Date and Time</property>
<property name="xalign">0.25</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
<attribute name="size" value="15360"/> <attribute name="size" value="15360"/>
@ -271,7 +272,7 @@
<property name="reserve-toggle-size">False</property> <property name="reserve-toggle-size">False</property>
<property name="rect-anchor-dy">4</property> <property name="rect-anchor-dy">4</property>
<child> <child>
<object class="GtkMenuItem" id="btnSynopsis"> <object class="GtkMenuItem" id="btnhelp">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Help</property> <property name="label" translatable="yes">Help</property>
@ -354,8 +355,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="pixel-size">25</property> <property name="pixel-size">25</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</object> </object>
@ -374,8 +375,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
<attribute name="foreground" value="#4d4d4d4d4d4d"/> <attribute name="foreground" value="#4d4d4d4d4d4d"/>
@ -473,8 +474,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="label" translatable="yes" context="Time" comments="Time">Time:</property> <property name="label" translatable="yes" context="Time" comments="Time">Time:</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -493,8 +494,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="width-chars">2</property> <property name="width-chars">2</property>
<property name="progress-pulse-step">0.099999999776482579</property> <property name="progress-pulse-step">0.099999999776482579</property>
<property name="numeric">True</property> <property name="numeric">True</property>
@ -525,8 +526,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="width-chars">2</property> <property name="width-chars">2</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</object> </object>
@ -552,8 +553,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<property name="label" translatable="yes" context="Date" comments="Date">Date:</property> <property name="label" translatable="yes" context="Date" comments="Date">Date:</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -564,26 +565,6 @@
<property name="position">4</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="txtDate">
<property name="width-request">-1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
Format: DD.MM.YYYY</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="btnChooseDate"> <object class="GtkButton" id="btnChooseDate">
<property name="visible">True</property> <property name="visible">True</property>
@ -594,8 +575,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property> <property name="margin-right">10</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">10</property> <property name="margin-end">10</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
@ -607,7 +588,27 @@ Format: DD.MM.YYYY</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="txtDate">
<property name="width-request">-1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
Format: DD.MM.YYYY</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -631,8 +632,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">7</property> <property name="margin-start">7</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -709,8 +710,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property> <property name="margin-right">10</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">10</property> <property name="margin-end">10</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
<child> <child>
<object class="GtkLabel" id="lblTimeBios"> <object class="GtkLabel" id="lblTimeBios">
<property name="visible">True</property> <property name="visible">True</property>
@ -792,8 +793,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -811,8 +812,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property> <property name="margin-right">10</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">10</property> <property name="margin-end">10</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">5</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -879,7 +880,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">8</property> <property name="margin-start">8</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">13</property> <property name="margin-bottom">13</property>
<property name="label" translatable="yes">Synchronize hardware time:</property> <property name="label" translatable="yes">Synchronize hardware time:</property>
</object> </object>
@ -897,7 +898,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">10</property> <property name="margin-end">10</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
@ -938,7 +939,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">8</property> <property name="margin-start">8</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">13</property> <property name="margin-bottom">13</property>
<property name="label" translatable="yes" context="Region" comments="Region">Region:</property> <property name="label" translatable="yes" context="Region" comments="Region">Region:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -957,7 +958,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
@ -976,7 +977,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">13</property> <property name="margin-bottom">13</property>
<property name="label" translatable="yes" context="Zone" comments="Zone">Area:</property> <property name="label" translatable="yes" context="Zone" comments="Zone">Area:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -987,6 +988,18 @@ Format: DD.MM.YYYY</property>
<property name="position">4</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="width-request">5</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child> <child>
<object class="GtkComboBoxText" id="cbZone"> <object class="GtkComboBoxText" id="cbZone">
<property name="visible">True</property> <property name="visible">True</property>
@ -995,7 +1008,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
@ -1006,18 +1019,6 @@ Format: DD.MM.YYYY</property>
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="width-request">5</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -1321,7 +1322,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-top">20</property> <property name="margin-top">20</property>
<property name="margin-bottom">20</property> <property name="margin-bottom">20</property>
<property name="icon-name">dialog-warning-symbolic</property> <property name="icon-name">dialog-warning-symbolic</property>
<property name="icon_size">6</property> <property name="icon_size">5</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1422,7 +1423,7 @@ Format: DD.MM.YYYY</property>
<property name="xpad">20</property> <property name="xpad">20</property>
<property name="ypad">20</property> <property name="ypad">20</property>
<property name="icon-name">dialog-question-symbolic</property> <property name="icon-name">dialog-question-symbolic</property>
<property name="icon_size">6</property> <property name="icon_size">5</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

2
ubl-settings-datetime.pot
Unescape View File

@ -2030,7 +2030,7 @@ msgstr ""
#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84
#: source/ubl-settings-datetime.cc:169 #: source/ubl-settings-datetime.cc:169
msgid "" msgid ""
"You will be redirected to documentation site, where user help pages are " "You will be redirected to documentation website where documentation is\n"
"translated and supported by community." "translated and supported by community."
msgstr "" msgstr ""

13
ubl-settings-datetime_ru.po
Unescape View File

@ -78,7 +78,7 @@ msgstr "О программе"
#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 #: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70
#: source/ubl-settings-datetime.cc:137 #: source/ubl-settings-datetime.cc:137
msgid "About ubl-settings-datetime" msgid "About ubl-settings-datetime"
msgstr "О программе Настройка даты и времени" msgstr "О программе Дата и время"
msgid "Accra" msgid "Accra"
msgstr "Аккра" msgstr "Аккра"
@ -2058,10 +2058,10 @@ msgstr "Ереван"
#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84
#: source/ubl-settings-datetime.cc:169 #: source/ubl-settings-datetime.cc:169
msgid "" msgid ""
"You will be redirected to documentation site, where user help pages are " "You will be redirected to documentation website where documentation is\n"
"translated and supported by community." "translated and supported by community."
msgstr "" msgstr ""
"Вы будете перенаправлены на сайт с документацией где страницы помощи " "Вы будете перенаправлены на сайт с документацией где страницы помощи\n"
"переводятся и поддерживаются сообществом." "переводятся и поддерживаются сообществом."
msgid "Yukon" msgid "Yukon"
@ -2097,17 +2097,12 @@ msgid ""
msgstr "" msgstr ""
"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
#: source/ubl-settings-datetime.cc:174
#, fuzzy
msgid "ubl-settings-bootloader"
msgstr "О программе Загрузка системы"
#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 #: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66
#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 #: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155
#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 #: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151
#: source/ubl-settings-datetime.cc:146 #: source/ubl-settings-datetime.cc:146
msgid "ubl-settings-datetime" msgid "ubl-settings-datetime"
msgstr "Настройка даты и времени" msgstr "Дата и время"
#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 #: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86
#: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651 #: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651

Write Preview
Loading…
Cancel
Save