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

Fixes

Browse Source
pull/143/head
Ivan Dmitrievich Yartsev 2 years ago
parent f632a28ca7
commit 3873317735
2 changed files with 339 additions and 407 deletions
Show Stats Download Patch File Download Diff File

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

@ -1032,8 +1032,8 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
if ((response.find("(null)") == std::string::npos) && (response.length() != 0 )) { if ((response.find("(null)") == std::string::npos) && (response.length() != 0 )) {
if (response.find("=") != std::string::npos) { if (response.find("=") != std::string::npos) {
if (response.find("\n") != std::string::npos) { if (response.find("\n") != std::string::npos) {
response = response.substr(response.find("=")+2,response.length()); response = response.substr(response.find("\"")+1,response.length());
response = response.substr(0,response.find("\n")-1); response = response.substr(0,response.find("\""));
obj_result.response = response; obj_result.response = response;
obj_result.error = 0; obj_result.error = 0;
} }

172
ubl-settings-datetime.glade
Unescape View File

@ -85,6 +85,22 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="cbRegion"/>
<widget name="cbZone"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="btnUpdateDateTime"/>
<widget name="btnHardwareTime"/>
</widgets>
</object>
<object class="GtkAboutDialog" id="aboutWindows"> <object class="GtkAboutDialog" id="aboutWindows">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="resizable">False</property> <property name="resizable">False</property>
@ -644,33 +660,33 @@ translated and supported by community.</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="label-xalign">0.019999999552965164</property> <property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</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="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="margin-left">5</property>
<property name="margin-start">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox"> <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="spacing">5</property>
<child> <child>
<object class="GtkBox" id="boxTime"> <object class="GtkBox" id="boxTime">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkLabel" id="lblTime"> <object class="GtkLabel" id="lblTime">
<property name="width-request">0</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-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>
<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>
@ -685,12 +701,6 @@ translated and supported by community.</property>
<object class="GtkSpinButton" id="numTimeHrs"> <object class="GtkSpinButton" id="numTimeHrs">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">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">5</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>
@ -717,12 +727,6 @@ translated and supported by community.</property>
<object class="GtkSpinButton" id="numTimeMin"> <object class="GtkSpinButton" id="numTimeMin">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">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">5</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>
@ -744,12 +748,6 @@ translated and supported by community.</property>
<property name="width-request">20</property> <property name="width-request">20</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-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>
<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>
@ -766,12 +764,6 @@ translated and supported by community.</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes" context="Interactive date picker" comments="Interactive date picker">Интерактивный выбор даты</property> <property name="tooltip-text" translatable="yes" context="Interactive date picker" comments="Interactive date picker">Интерактивный выбор даты</property>
<property name="margin-left">5</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">5</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>
@ -793,12 +785,6 @@ translated and supported by community.</property>
<property name="can-focus">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 <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> 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> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -817,18 +803,13 @@ Format: DD.MM.YYYY</property>
<object class="GtkBox"> <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="spacing">5</property>
<child> <child>
<object class="GtkButton" id="btnUpdateDateTime"> <object class="GtkButton" id="btnUpdateDateTime">
<property name="width-request">0</property> <property name="width-request">0</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-left">7</property>
<property name="margin-right">5</property>
<property name="margin-start">7</property>
<property name="margin-end">5</property>
<property name="margin-top">5</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>
@ -901,12 +882,6 @@ Format: DD.MM.YYYY</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-left">5</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">5</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>
@ -932,6 +907,8 @@ Format: DD.MM.YYYY</property>
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblDateTimeSetting"> <object class="GtkLabel" id="lblDateTimeSetting">
<property name="visible">True</property> <property name="visible">True</property>
@ -968,28 +945,27 @@ Format: DD.MM.YYYY</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="label-xalign">0.019999999552965164</property> <property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</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="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="margin-left">5</property>
<property name="margin-start">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox"> <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="spacing">5</property>
<child> <child>
<object class="GtkComboBoxText" id="cbDhcp"> <object class="GtkComboBoxText" id="cbDhcp">
<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-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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1003,12 +979,6 @@ Format: DD.MM.YYYY</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property> <property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin-left">5</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -1025,6 +995,8 @@ Format: DD.MM.YYYY</property>
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblSynchronizebChkGLob"> <object class="GtkLabel" id="lblSynchronizebChkGLob">
<property name="visible">True</property> <property name="visible">True</property>
@ -1057,26 +1029,29 @@ Format: DD.MM.YYYY</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="label-xalign">0.019999999552965164</property> <property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</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="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="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox"> <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="spacing">5</property>
<child> <child>
<object class="GtkLabel" id="lblHW"> <object class="GtkLabel" id="lblHW">
<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="halign">start</property>
<property name="margin-left">8</property>
<property name="margin-right">5</property>
<property name="margin-start">8</property>
<property name="margin-end">5</property>
<property name="margin-top">5</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>
<packing> <packing>
@ -1089,12 +1064,6 @@ 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">10</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">5</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>
@ -1115,6 +1084,7 @@ Format: DD.MM.YYYY</property>
<object class="GtkBox"> <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="spacing">5</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -1130,12 +1100,6 @@ Format: DD.MM.YYYY</property>
<object class="GtkLabel" id="lblReg"> <object class="GtkLabel" id="lblReg">
<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">8</property>
<property name="margin-right">5</property>
<property name="margin-start">8</property>
<property name="margin-end">5</property>
<property name="margin-top">5</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>
</object> </object>
@ -1149,12 +1113,6 @@ Format: DD.MM.YYYY</property>
<object class="GtkComboBoxText" id="cbRegion"> <object class="GtkComboBoxText" id="cbRegion">
<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-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">10</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
</object> </object>
@ -1168,12 +1126,6 @@ Format: DD.MM.YYYY</property>
<object class="GtkLabel" id="lblZone"> <object class="GtkLabel" id="lblZone">
<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-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">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>
</object> </object>
@ -1199,12 +1151,6 @@ Format: DD.MM.YYYY</property>
<object class="GtkComboBoxText" id="cbZone"> <object class="GtkComboBoxText" id="cbZone">
<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-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">10</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
</object> </object>
@ -1227,13 +1173,15 @@ Format: DD.MM.YYYY</property>
</child> </child>
</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>
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="lblTimeZone"> <object class="GtkLabel" id="lblTimeZone">
<property name="visible">True</property> <property name="visible">True</property>
@ -1440,22 +1388,6 @@ Format: DD.MM.YYYY</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="cbRegion"/>
<widget name="cbZone"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="btnUpdateDateTime"/>
<widget name="btnHardwareTime"/>
</widgets>
</object>
<object class="GtkPopover" id="popCalendar"> <object class="GtkPopover" id="popCalendar">
<property name="width-request">240</property> <property name="width-request">240</property>
<property name="height-request">185</property> <property name="height-request">185</property>

Write Preview
Loading…
Cancel
Save