Merge pull request 'develop' (#63) from develop into master

Reviewed-on: #63
pull/72/head
Dmitry Razumov 3 years ago
commit 8b449ba444

@ -141,7 +141,7 @@ void MainWindow::lacalization(){
cbDhcp->append(_("Disabled")); cbDhcp->append(_("Disabled"));
lblDateTimeSetting->set_text(_("Current date and time")); lblDateTimeSetting->set_text(_("Current date and time"));
lblHead->set_text(_("Settings the date and time")); lblHead->set_text(_("Setting the date and time"));
lblTime->set_text(_("Time")); lblTime->set_text(_("Time"));
lblData->set_text(_("Date")); lblData->set_text(_("Date"));
lblTimeZone->set_text(_("Time zone")); lblTimeZone->set_text(_("Time zone"));
@ -223,7 +223,6 @@ void MainWindow::get_builder(){
builder->get_widget("btnUpdateDateTime", btnUpdateDateTime); builder->get_widget("btnUpdateDateTime", btnUpdateDateTime);
builder->get_widget("btnChooseDate", btnChooseDate); builder->get_widget("btnChooseDate", btnChooseDate);
builder->get_widget("btnMessClose", btnMessClose); builder->get_widget("btnMessClose", btnMessClose);
builder->get_widget("popCalendar", popCalendar);
builder->get_widget("numTimeHrs", numTimeHrs); builder->get_widget("numTimeHrs", numTimeHrs);
builder->get_widget("numTimeMin", numTimeMin); builder->get_widget("numTimeMin", numTimeMin);
builder->get_widget("cbDhcp", cbDhcp); builder->get_widget("cbDhcp", cbDhcp);
@ -255,9 +254,6 @@ void MainWindow::get_builder(){
builder->get_widget("boxInfoError", boxInfoError); builder->get_widget("boxInfoError", boxInfoError);
builder->get_widget("lblWarning", lblWarning); builder->get_widget("lblWarning", lblWarning);
builder->get_widget("imgInfo", imgInfo); builder->get_widget("imgInfo", imgInfo);
builder->get_widget("popDownloadMenu", popDownloadMenu);
builder->get_widget("popSaveMenu", popSaveMenu);
builder->get_widget("popAbout", popAbout);
builder->get_widget("btnSave", btnSave); builder->get_widget("btnSave", btnSave);
builder->get_widget("btnSettings", btnSettings); builder->get_widget("btnSettings", btnSettings);
builder->get_widget("btnDownload", btnDownload); builder->get_widget("btnDownload", btnDownload);
@ -272,6 +268,7 @@ void MainWindow::get_builder(){
builder->get_widget("lblHeader", lblHeader); builder->get_widget("lblHeader", lblHeader);
builder->get_widget("lblHW", lblHW); builder->get_widget("lblHW", lblHW);
builder->get_widget("cbHw", cbHw); builder->get_widget("cbHw", cbHw);
builder->get_widget("popCalendar", popCalendar);
this->add_CSS(); this->add_CSS();
} }
void MainWindow::gui_exit(){ void MainWindow::gui_exit(){
@ -295,22 +292,19 @@ 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));
mess_sudo->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit_2)); mess_sudo->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit_2));
btnDownload->signal_clicked().connect([&](){popDownloadMenu->show();}); btnAbout->signal_activate().connect([&](){aboutWindows->show();});
btnSave->signal_clicked().connect([&](){popSaveMenu->show();}); btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show));
btnSettings->signal_clicked().connect([&](){popAbout->show();}); btnDonwlodLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
btnAbout->signal_clicked().connect([&](){aboutWindows->show();}); btnDonwlolGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg));
btnSynopsis->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); btnSaveLocalGlob->signal_activate().connect([&](){save_global_local_cfg();});
btnDonwlodLocal->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg)); btnSaveLocal->signal_activate().connect([&](){save_local_cfg();});
btnDonwlolGlob->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg)); btnSaveGlob->signal_activate().connect([&](){save_global_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(){ void MainWindow::synopsis_show(){
int start_error = error_info; int start_error = error_info;
wrapper_system("xdg-open https://wiki.ublinux.ru/ru/home &"); wrapper_system("xdg-open https://wiki.ublinux.ru/ru/home", "&");
//gtk_show_uri_on_window(NULL, "https://wiki.ublinux.ru/ru/home", 0, 0); //gtk_show_uri_on_window(NULL, "https://wiki.ublinux.ru/ru/home", 0, 0);
if (start_error!=error_info){ if (start_error!=error_info){
error_info=start_error; error_info=start_error;
@ -336,7 +330,7 @@ void MainWindow::download_globl_cfg(){
this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp);
string cmd = "/usr/bin/ubconfig --default --source global get clock ZONE"; string cmd = "/usr/bin/ubconfig --default --source global get clock ZONE";
this->fill_in_reg_zone(cmd); this->fill_in_reg_zone(cmd);
string hw = "/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"; string hw = "/usr/bin/ubconfig get clock HWCLOCK_SYNC";
this->entry_hardware_clock(hw); this->entry_hardware_clock(hw);
info_warning_error(1); info_warning_error(1);
} }
@ -428,7 +422,8 @@ void MainWindow::info_warning_error(int mess){
} }
void MainWindow::wrapper_system(string cmd){ void MainWindow::wrapper_system(string cmd, string thread_str=""){
cmd=cmd + " " + thread_str;
int response_cmd = system(cmd.c_str()); int response_cmd = system(cmd.c_str());
if (response_cmd!=0){ if (response_cmd!=0){
error_info+=1; error_info+=1;
@ -436,13 +431,13 @@ void MainWindow::wrapper_system(string cmd){
} }
void MainWindow::hardware_clock_global(string &local, string &utc){ void MainWindow::hardware_clock_global(string &local, string &etc){
int index = cbHw->get_active_row_number(); int index = cbHw->get_active_row_number();
if (index == 0){ if (index == 0){
wrapper_system(local); wrapper_system(local, "&");
} }
else if (index == 1){ else if (index == 1){
wrapper_system(utc); wrapper_system(etc, "&");
} }
} }
@ -452,10 +447,14 @@ void MainWindow::entry_hardware_clock(string &cmd){
if (obj_result.response == "localtime"){ if (obj_result.response == "localtime"){
cbHw->set_active(0); cbHw->set_active(0);
} }
else{ else if (obj_result.response == "etc"){
cbHw->set_active(1); cbHw->set_active(1);
} }
} }
else if (obj_result.error == 3){
warning_info-=1;
cbHw->set_active(-1);
}
} }
void MainWindow::hardware_clock(){ void MainWindow::hardware_clock(){
@ -491,7 +490,7 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp){
} }
if ((flag_error==false) && (flag_error_check_ntp==false)){ if ((flag_error==false) && (flag_error_check_ntp==false)){
cmd = cmd_set_ntp + str_ntp + "\""; cmd = cmd_set_ntp + str_ntp + "\"";
wrapper_system(cmd); wrapper_system(cmd, "&");
} }
else{ else{
if (flag_error==true){ if (flag_error==true){
@ -649,17 +648,17 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove
} }
else if (activ_index==0){ else if (activ_index==0){
wrapper_system(cmd_default); wrapper_system(cmd_default, "&");
} }
else if (activ_index==1){ else if (activ_index==1){
wrapper_system(cmd_dhcp); wrapper_system(cmd_dhcp, "&");
} }
else if (activ_index==2){ else if (activ_index==2){
this->focus_ntp(cmd_set_ntp); this->focus_ntp(cmd_set_ntp);
} }
else if (activ_index==3){ else if (activ_index==3){
int start_error = error_info; int start_error = error_info;
wrapper_system(remove); wrapper_system(remove, "&");
if (start_error != error_info){ if (start_error != error_info){
error_info=start_error; error_info=start_error;
} }
@ -829,7 +828,7 @@ void MainWindow::enter_zone(string &cmd){
str_zone=zone_text; str_zone=zone_text;
str_region=reg_text; str_region=reg_text;
cmd = cmd + str_region + "/" + str_zone; cmd = cmd + str_region + "/" + str_zone;
wrapper_system(cmd); wrapper_system(cmd, "&");
} }
else{ else{
str_zone=""; str_zone="";

@ -62,9 +62,6 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Window *mess_dchp; Gtk::Window *mess_dchp;
Gtk::Window *mess_sudo; Gtk::Window *mess_sudo;
Gtk::Popover *popCalendar; Gtk::Popover *popCalendar;
Gtk::Popover *popSaveMenu;
Gtk::Popover *popDownloadMenu;
Gtk::Popover *popAbout;
Gtk::Calendar *cldrDate; Gtk::Calendar *cldrDate;
Gtk::Label *lblMessage; Gtk::Label *lblMessage;
Gtk::Label *lblMessageSudo; Gtk::Label *lblMessageSudo;
@ -97,13 +94,13 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Image *imgInfo; Gtk::Image *imgInfo;
std::map <string, vector<string>> time_reg_map; std::map <string, vector<string>> time_reg_map;
std::map <string, vector<string>> time_reg_map_local; std::map <string, vector<string>> time_reg_map_local;
Gtk::ModelButton *btnSaveLocalGlob; Gtk::MenuItem *btnSaveLocalGlob;
Gtk::ModelButton *btnSaveLocal; Gtk::MenuItem *btnSaveLocal;
Gtk::ModelButton *btnSaveGlob; Gtk::MenuItem *btnSaveGlob;
Gtk::ModelButton *btnDonwlolGlob; Gtk::MenuItem *btnDonwlolGlob;
Gtk::ModelButton *btnDonwlodLocal; Gtk::MenuItem *btnDonwlodLocal;
Gtk::ModelButton *btnAbout; Gtk::MenuItem *btnAbout;
Gtk::ModelButton *btnSynopsis; Gtk::MenuItem *btnSynopsis;
Gtk::HeaderBar *headerBar; Gtk::HeaderBar *headerBar;
Gtk::Label *lblHeader; Gtk::Label *lblHeader;
Gtk::Label *lblHW; Gtk::Label *lblHW;
@ -130,7 +127,7 @@ class MainWindow : public Gtk::ApplicationWindow {
MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder); MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
MainWindow(Glib::RefPtr<Gtk::Builder> const& builder); MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
virtual ~MainWindow() = default; virtual ~MainWindow() = default;
void hardware_clock_global(string &local, string &utc); void hardware_clock_global(string &local, string &etc);
void info_warning_error(int mess); void info_warning_error(int mess);
void synopsis_show(); void synopsis_show();
void entry_hardware_clock(string &cmd); void entry_hardware_clock(string &cmd);
@ -172,7 +169,7 @@ class MainWindow : public Gtk::ApplicationWindow {
void gui_exit(); void gui_exit();
bool gui_exit_2(GdkEventAny* event); bool gui_exit_2(GdkEventAny* event);
void wind_close_ntp(); void wind_close_ntp();
void wrapper_system(string cmd); void wrapper_system(string cmd, string thread_str);
void info_status_app(string stule); void info_status_app(string stule);
void wrapper_update_time_date(); void wrapper_update_time_date();
string zone_file_read(string zone); string zone_file_read(string zone);

@ -13,4 +13,73 @@
.textHeaderBar{ .textHeaderBar{
font-weight: bold; font-weight: bold;
} }
.menuitemtop *{
margin:2px 2px 0 2px;
padding: 5px 10px 3px 5px;
}
.menuitemmiddle *{
margin:0 2px 0 2px;
padding: 3px 10px 3px 5px;
}
.menuitembottom *{
margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px;
}
.menuitemtop:hover {
background:@theme_bg_color;
}
.menuitemmiddle:hover {
background:@theme_bg_color;
}
.menuitembottom:hover {
background:@theme_bg_color;
}
.menuitemtop:hover* {
margin:2px 2px 0 2px;
padding: 5px 10px 3px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menuitemmiddle:hover* {
margin:0 2px 0 2px;
padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menuitembottom:hover* {
margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menuitembottom{
margin-top:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-radius:0 0 5px 5px;
border-left-width:1px;
border-bottom-width:1px;
border-right-width:1px;
}
.menuitemmiddle{
margin-top:0px;
margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-left-width:1px;
border-right-width:1px;
}
.menuitemtop{
margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-radius:5px 5px 0 0;
border-left-width:1px;
border-top-width:1px;
border-right-width:1px;
}

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=Date & time settings Name=Date & time settings
Name[ru]=Настройка даты времени Name[ru]=Настройка даты и времени
GenericName=Date & time settings GenericName=Date & time settings
GenericName[ru]=Настройка даты и времени GenericName[ru]=Настройка даты и времени
Comment=Date time settings Comment=Date time settings

@ -49,354 +49,101 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkWindow" id="mess_dchp"> <object class="GtkMenu" id="menu">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="type-hint">dialog</property>
<child>
<object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="take-focus">False</property>
<child> <property name="reserve-toggle-size">False</property>
<object class="GtkBox"> <property name="rect-anchor-dy">4</property>
<property name="visible">True</property>
<property name="can-focus">False</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>
<child> <child>
<object class="GtkImage"> <object class="GtkMenuItem" id="btnDonwlodLocal">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-right">5</property> <property name="label" translatable="yes">Download local</property>
<property name="margin-start">5</property> <property name="use-underline">True</property>
<property name="margin-end">5</property> <style>
<property name="margin-top">6</property> <class name="menuitemtop"/>
<property name="margin-bottom">6</property> </style>
<property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="lblMessage"> <object class="GtkMenuItem" id="btnDonwlolGlob">
<property name="width-request">160</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="halign">start</property> <property name="label" translatable="yes">Download global</property>
<property name="valign">center</property> <property name="use-underline">True</property>
<property name="margin-top">6</property> <style>
<property name="margin-bottom">6</property> <class name="menuitembottom"/>
<property name="label" translatable="yes">Enter DHCP !</property> </style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnMessClose">
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</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">3</property>
<property name="margin-bottom">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkWindow" id="mess_sudo"> <object class="GtkMenu" id="menu1">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="window-position">center</property>
<property name="type-hint">dialog</property>
<child>
<object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="take-focus">False</property>
<property name="reserve-toggle-size">False</property>
<property name="rect-anchor-dy">4</property>
<child> <child>
<object class="GtkBox"> <object class="GtkMenuItem" id="btnSynopsis">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="label" translatable="yes">Synopsis</property>
<property name="margin-right">5</property> <property name="use-underline">True</property>
<property name="margin-start">5</property> <style>
<property name="margin-end">5</property> <class name="menuitemtop"/>
<child> </style>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</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>
<property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="lblMessageSudo"> <object class="GtkMenuItem" id="btnAbout">
<property name="width-request">160</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="halign">start</property> <property name="label" translatable="yes">About the program</property>
<property name="valign">center</property> <property name="use-underline">True</property>
<property name="margin-left">5</property> <style>
<property name="margin-right">5</property> <class name="menuitembottom"/>
<property name="margin-start">5</property> </style>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes">Enter DHCP !</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnMessCloseSudo">
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</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">3</property>
<property name="margin-bottom">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkPopover" id="popAbout"> <object class="GtkMenu" id="menu2">
<property name="can-focus">False</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="top-padding">5</property> <property name="take-focus">False</property>
<property name="bottom-padding">5</property> <property name="reserve-toggle-size">False</property>
<property name="left-padding">5</property> <property name="rect-anchor-dy">4</property>
<property name="right-padding">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkMenuItem" id="btnSaveLocalGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="label" translatable="yes">Save to global and local configuration</property>
<child> <property name="use-underline">True</property>
<object class="GtkModelButton" id="btnSynopsis"> <style>
<property name="visible">True</property> <class name="menuitemtop"/>
<property name="can-focus">True</property> </style>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Synopsis</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="btnAbout">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="text" translatable="yes">About the program</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object> </object>
</child> </child>
</object>
<object class="GtkPopover" id="popDownloadMenu">
<property name="can-focus">False</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="top-padding">5</property>
<property name="bottom-padding">5</property>
<property name="left-padding">5</property>
<property name="right-padding">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkMenuItem" id="btnSaveLocal">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="label" translatable="yes">Save to local configuration</property>
<child> <property name="use-underline">True</property>
<object class="GtkModelButton" id="btnDonwlodLocal"> <style>
<property name="visible">True</property> <class name="menuitemmiddle"/>
<property name="can-focus">True</property> </style>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Download local</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="btnDonwlolGlob">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Download global</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object> </object>
</child> </child>
</object>
<object class="GtkPopover" id="popSaveMenu">
<property name="can-focus">False</property>
<child> <child>
<object class="GtkFrame"> <object class="GtkMenuItem" id="btnSaveGlob">
<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-xalign">0</property> <property name="label" translatable="yes">Save to Global configuration</property>
<property name="shadow-type">none</property> <property name="use-underline">True</property>
<child> <style>
<object class="GtkAlignment"> <class name="menuitembottom"/>
<property name="visible">True</property> </style>
<property name="can-focus">False</property>
<property name="top-padding">5</property>
<property name="bottom-padding">5</property>
<property name="left-padding">5</property>
<property name="right-padding">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkModelButton" id="btnSaveLocalGlob">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Save to global and local configuration</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="btnSaveLocal">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Save to local configuration</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="btnSaveGlob">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="text" translatable="yes">Save to Global configuration</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1024,17 +771,17 @@ Format: DD.MM.YYYY</property>
<object class="GtkComboBoxText" id="cbHw"> <object class="GtkComboBoxText" id="cbHw">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">10</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">10</property>
<property name="margin-top">6</property> <property name="margin-top">6</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>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -1082,6 +829,7 @@ Format: DD.MM.YYYY</property>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="cbRegion"> <object class="GtkComboBoxText" id="cbRegion">
<property name="width-request">167</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="margin-left">5</property> <property name="margin-left">5</property>
@ -1132,7 +880,7 @@ Format: DD.MM.YYYY</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
@ -1243,8 +991,8 @@ Format: DD.MM.YYYY</property>
<property name="focus-on-click">False</property> <property name="focus-on-click">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<property name="popup">menu</property>
<property name="direction">none</property> <property name="direction">none</property>
<property name="popover">popDownloadMenu</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -1266,7 +1014,16 @@ Format: DD.MM.YYYY</property>
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">pan-down-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -1296,8 +1053,8 @@ Format: DD.MM.YYYY</property>
<property name="focus-on-click">False</property> <property name="focus-on-click">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<property name="popup">menu2</property>
<property name="direction">none</property> <property name="direction">none</property>
<property name="popover">popSaveMenu</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -1322,7 +1079,16 @@ Format: DD.MM.YYYY</property>
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">pan-down-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -1340,10 +1106,14 @@ Format: DD.MM.YYYY</property>
<property name="focus-on-click">False</property> <property name="focus-on-click">False</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<property name="popup">menu1</property>
<property name="direction">none</property> <property name="direction">none</property>
<property name="popover">popAbout</property>
<child> <child>
<placeholder/> <object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">open-menu-symbolic</property>
</object>
</child> </child>
</object> </object>
<packing> <packing>
@ -1387,4 +1157,171 @@ Format: DD.MM.YYYY</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkWindow" id="mess_dchp">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="type-hint">dialog</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</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>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</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>
<property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lblMessage">
<property name="width-request">160</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes">Enter DHCP !</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnMessClose">
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</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">3</property>
<property name="margin-bottom">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="mess_sudo">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="window-position">center</property>
<property name="type-hint">dialog</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</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>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</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>
<property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lblMessageSudo">
<property name="width-request">160</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">center</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>
<property name="label" translatable="yes">Enter DHCP !</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnMessCloseSudo">
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</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">3</property>
<property name="margin-bottom">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface> </interface>

@ -62,7 +62,7 @@ msgid "OK"
msgstr "OK" msgstr "OK"
msgid "Setting the date and time" msgid "Setting the date and time"
msgstr "Настройка даты времени" msgstr "Настройка даты и времени"
msgid "Successfully saved local and global configuration" msgid "Successfully saved local and global configuration"
msgstr "Успешно сохранена локальная и глобальная конфигурация" msgstr "Успешно сохранена локальная и глобальная конфигурация"
@ -83,7 +83,7 @@ msgid "Change the NTPSERVERS parameter"
msgstr "Изменить параметр NTPSERVERS" msgstr "Изменить параметр NTPSERVERS"
msgid "ubl-settings-datetime" msgid "ubl-settings-datetime"
msgstr "Настройки даты и времени" msgstr "Настройка даты и времени"
msgid "Time" msgid "Time"
msgstr "Время" msgstr "Время"

Loading…
Cancel
Save