From 387331773599e6541ad3f455a33549eac0cc3ddf Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 8 Feb 2024 12:48:49 +0600 Subject: [PATCH] Fixes --- source/ubl-settings-datetime.cc | 4 +- ubl-settings-datetime.glade | 742 +++++++++++++++----------------- 2 files changed, 339 insertions(+), 407 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index d398b75..c09896c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -1032,8 +1032,8 @@ struct MainWindow::Result MainWindow::wrapper_call(string cmd) { if ((response.find("(null)") == std::string::npos) && (response.length() != 0 )) { if (response.find("=") != std::string::npos) { if (response.find("\n") != std::string::npos) { - response = response.substr(response.find("=")+2,response.length()); - response = response.substr(0,response.find("\n")-1); + response = response.substr(response.find("\"")+1,response.length()); + response = response.substr(0,response.find("\"")); obj_result.response = response; obj_result.error = 0; } diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index f2de001..5a7b10c 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -85,6 +85,22 @@ + + both + True + + + + + + + both + True + + + + + False False @@ -645,35 +661,81 @@ translated and supported by community. 0.019999999552965164 in - + True False - 5 - 5 - 5 - vertical + 5 + 5 + 5 True False + vertical + 5 - + True False + 5 - - 0 + True False - 5 - 5 - 5 - 5 - 5 - 5 - Time: - True - 0 + 5 + + + True + False + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 2 + True + + + False + True + 3 + + False @@ -682,253 +744,168 @@ translated and supported by community. - + + 20 True - True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - 0.099999999776482579 - True + False + Date: + True + 0 False True - 1 + 4 - + True - False - : + True + True + Интерактивный выбор даты + + + True + False + x-office-calendar + + False True - 2 + 5 - + + -1 True True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - True + Date +Format: DD.MM.YYYY - False + True True - 3 + 5 False True - 0 + 1 - - 20 + True False - 5 - 5 - 5 - 5 - 5 - 5 - Date: - True - 0 - - - False - True - 4 - - - - - True - True - True - Интерактивный выбор даты - 5 - 10 - 5 - 10 - 5 - 5 + 5 - + + 0 + True + True + True + + + True + False + center + center + + + True + False + 5 + 5 + 5 + 5 + media-playlist-repeat + + + False + True + 0 + + + + + True + False + center + center + Sync by + + + False + True + 1 + + + + + + + True + True + 0 + + + + True False - x-office-calendar + + False + True + 1 + - - - False - True - 5 - - - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 5 - - - - - False - True - 1 - - - - - True - False - - - 0 - True - True - True - 7 - 5 - 7 - 5 - 5 - 5 - + True False - center - center - - - True - False - 5 - 5 - 5 - 5 - media-playlist-repeat - - - False - True - 0 - - + + + False + True + 2 + + + + + True + True + True - + True False center center - Sync by + Synchronize hardware time - - False - True - 1 - + + True + True + 3 + - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - False True - 2 - - - - - True - True - True - 5 - 10 - 5 - 10 - 5 - 5 - - - True - False - center - center - Synchronize hardware time - - - - - True - True 3 - - False - True - 3 - @@ -969,27 +946,46 @@ Format: DD.MM.YYYY 0.019999999552965164 in - + True False - 5 - 5 - 5 - vertical + 5 + 5 + 5 True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 - 5 + 5 + + + True + False + + + False + True + 1 + + + + + True + True + Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces. + center + + + True + True + 3 + + False @@ -997,31 +993,7 @@ Format: DD.MM.YYYY 1 - - - True - True - Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces. - center - 5 - 10 - 5 - 10 - 5 - 5 - - - True - True - 3 - - - - False - True - 1 - @@ -1058,26 +1030,49 @@ Format: DD.MM.YYYY 0.019999999552965164 in - + True False - vertical + 5 + 5 + 5 True False + vertical + 5 - + True False - start - 8 - 5 - 8 - 5 - 5 - 13 - Synchronize hardware time: + 5 + + + True + False + start + Synchronize hardware time: + + + False + True + 0 + + + + + True + False + False + False + + + True + True + 2 + + False @@ -1086,151 +1081,104 @@ Format: DD.MM.YYYY - + True False - 10 - 5 - 5 - 10 - 5 - 10 - False - False + 5 + + + True + False + + + False + True + 1 + + + + + True + False + Region: + 0 + + + False + True + 2 + + + + + True + False + False + False + + + True + True + 3 + + + + + True + False + Area: + 0 + + + False + True + 4 + + + + + 5 + True + False + + + False + True + 5 + + + + + True + False + False + False + + + True + True + 5 + + + + + True + False + + + False + True + 7 + + True True - 2 - - - - - False - True - 0 - - - - - True - False - - - True - False - - - False - True 1 - - - True - False - 8 - 5 - 8 - 5 - 5 - 13 - Region: - 0 - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 10 - False - False - - - True - True - 3 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 13 - Area: - 0 - - - False - True - 4 - - - - - 5 - True - False - - - False - True - 5 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 10 - False - False - - - True - True - 5 - - - - - True - False - - - False - True - 7 - - - - False - True - 1 - @@ -1440,22 +1388,6 @@ Format: DD.MM.YYYY - - both - True - - - - - - - both - True - - - - - 240 185