Merge pull request 'master' (#99) from Igor1/ubl-settings-datetime:master into develop

Reviewed-on: #99
pull/98/head
Dmitry Razumov 3 years ago
commit d97bc94c1d

@ -149,7 +149,7 @@ void MainWindow::lacalization() {
lblZone->set_text(gettext("Zone:"));
lblSynchronizeBtn->set_text(gettext("Sync by"));
lblHeader->set_text(gettext("ubl-settings-datetime"));
windowMessDchp->set_title(gettext("Warning!"));
windowMessDchp->set_title(gettext("Attention"));
lblTimeBios->set_text(gettext("Synchronize hardware time"));
lblHW->set_text(gettext("Synchronize hardware time:"));
array_hw_local[0] = gettext("UTC time");
@ -278,8 +278,6 @@ void MainWindow::get_builder() {
builder->get_widget("lblSynchronizeBtn", lblSynchronizeBtn);
builder->get_widget("lblTimeBios", lblTimeBios);
builder->get_widget("btnHardwareTime",btnHardwareTime);
builder->get_widget("lblMessageSudo", lblMessageSudo);
builder->get_widget("btnMessCloseSudo",btnMessCloseSudo);
builder->get_widget("lblSave", lblSave);
builder->get_widget("lblLoad", lblLoad);
builder->get_widget("aboutWindows", aboutWindows);
@ -317,14 +315,9 @@ void MainWindow::get_builder() {
}
void MainWindow::gui_exit() {
exit(1);
}
void MainWindow::event() {
btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock));
btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close));
btnMessCloseSudo->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_exit));
//cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
btnUpdateDateTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::update_time_date));
btnChooseDate->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::calendar_show));

@ -54,7 +54,6 @@ class MainWindow : public Gtk::ApplicationWindow {
Glib::RefPtr<Gtk::Builder> builder;
Gtk::Button *btnUpdateDateTime;
Gtk::Button *btnChooseDate;
Gtk::Button *btnMessCloseSudo;
Gtk::Button *btnMessClose;
Gtk::ComboBoxText *cbDhcp;
Gtk::SpinButton *numTimeHrs;
@ -66,7 +65,6 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Popover *popCalendar;
Gtk::Calendar *cldrDate;
Gtk::Label *lblMessage;
Gtk::Label *lblMessageSudo;
Gtk::Label *lblDateTimeSetting;
Gtk::Label *lblHead;
Gtk::Label *lblTime;
@ -203,7 +201,6 @@ class MainWindow : public Gtk::ApplicationWindow {
void parse_text_date();
void hardware_clock();
void set_ntp_toggle_glob();
void gui_exit();
void wind_close_ntp();
void wrapper_system(string cmd, string thread_str);
void info_status_app(string stule);

@ -6,7 +6,8 @@
background-color: #f3f0ac;
}
.textHead{
text-shadow: 1px 1px #ffffff;
text-shadow: 2px 2px @theme_bg_color;
color: @theme_text_color;
}
.textHeaderBar{
font-weight: bold;

@ -2,6 +2,88 @@
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</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">
<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">
<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="GtkAboutDialog" id="aboutWindows">
<property name="can-focus">False</property>
<property name="title" translatable="yes">О Программе</property>
@ -94,9 +176,7 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Date and time settings</property>
<attributes>
<attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#000023233232"/>
<attribute name="size" value="15360"/>
</attributes>
</object>
@ -233,6 +313,7 @@
<object class="GtkWindow" id="window">
<property name="width-request">659</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</property>
<child>
<object class="GtkBox" id="plugBox">
<property name="visible">True</property>
@ -279,7 +360,7 @@
<property name="margin-bottom">6</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#000000000000"/>
<attribute name="foreground" value="#4d4d4d4d4d4d"/>
</attributes>
</object>
<packing>
@ -309,6 +390,7 @@
<object class="GtkImage" id="imgHeadBackground">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
</object>
<packing>
<property name="index">-1</property>
@ -1197,9 +1279,8 @@ Format: DD.MM.YYYY</property>
</object>
<object class="GtkWindow" id="windowMessDchp">
<property name="can-focus">False</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</property>
<property name="type-hint">dialog</property>
<property name="valign">start</property>
<property name="resizable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -1209,55 +1290,59 @@ Format: DD.MM.YYYY</property>
<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>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin-left">20</property>
<property name="margin-right">20</property>
<property name="margin-start">20</property>
<property name="margin-end">20</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="icon-name">dialog-warning-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</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="halign">center</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>
<property name="margin-left">10</property>
<property name="margin-right">25</property>
<property name="margin-start">10</property>
<property name="margin-end">25</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="label">Enter DHCP !</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnMessClose">
<property name="label" translatable="yes">OK</property>
<property name="label" translatable="yes">Close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
@ -1265,102 +1350,31 @@ Format: DD.MM.YYYY</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>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="windowMessSudo">
<property name="can-focus">False</property>
<property name="type">popup</property>
<property name="title" translatable="yes">Внимание!</property>
<property name="window-position">center</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</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">
<child type="titlebar">
<object class="GtkHeaderBar">
<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>
<property name="title" translatable="yes">Attention</property>
<property name="show-close-button">True</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>
<property name="pixel-size">32</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</property>
<property name="icon_size">5</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>

@ -1815,7 +1815,7 @@ msgid "Wallis"
msgstr ""
#: source/ubl-settings-datetime.cc:147
msgid "Warning!"
msgid "Attention"
msgstr ""
msgid "Warsaw"

@ -1839,8 +1839,8 @@ msgid "Wallis"
msgstr "Уоллис"
#: source/ubl-settings-datetime.cc:147
msgid "Warning!"
msgstr "Внимание!"
msgid "Attention"
msgstr "Внимание"
msgid "Warsaw"
msgstr "Варшава"

Loading…
Cancel
Save