From 731250044ae742ad00e314351ce3f61853c48a7a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 5 May 2023 09:04:53 +0600 Subject: [PATCH 1/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 6 +++--- ubl-settings-datetime.pot | 6 +++--- ubl-settings-datetime_ru.po | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 3c526f4..5439232 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -301,7 +301,7 @@ True False - Save in global and local configuration + Save to global and local configuration @@ -311,7 +311,7 @@ True False - Save in global configuration + Save to global configuration @@ -321,7 +321,7 @@ True False - Save in local configuration + Save to local configuration diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index ba7aa22..371e067 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1656,15 +1656,15 @@ msgid "Save" msgstr "" #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 -msgid "Save in global configuration" +msgid "Save to global configuration" msgstr "" #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 -msgid "Save in local configuration" +msgid "Save to local configuration" msgstr "" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save in global and local configuration" +msgid "Save to global and local configuration" msgstr "" msgid "Scoresbysund" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 8e3d375..1454e86 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1682,15 +1682,15 @@ msgid "Save" msgstr "Сохранить" #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 -msgid "Save in global configuration" +msgid "Save to global configuration" msgstr "Сохранить в глобальную конфигурацию" #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 -msgid "Save in local configuration" +msgid "Save to local configuration" msgstr "Сохранить в локальную конфигурацию" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save in global and local configuration" +msgid "Save to global and local configuration" msgstr "Сохранить в глобальную и локальную конфигурацию" msgid "Scoresbysund" -- 2.35.1 From 2d9a268413f31ae04642e4cec38746217b466cba Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 5 May 2023 09:07:50 +0600 Subject: [PATCH 2/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- source/ubl-settings-datetime.h | 2 +- ubl-settings-datetime.pot | 2 +- ubl-settings-datetime_ru.po | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0864937..b9f04cc 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ $ sudo make uninstall # Usage ```sh $ ubl-settings-datetime --help -GTK settings datetime for UBLinux +Setting up the date and time for UBLinux Usage: ubl-settings-datetime [OPTIONS...] Options: diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index b5949fc..32af888 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -83,7 +83,7 @@ #define nothing_save _("Nothing to save!") #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 str_help_h _("GTK settings datetime 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 local_read_error _("Local configuration reading error") #define global_read_error _("Global configuration read error") diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 371e067..5d0ae3f 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -755,7 +755,7 @@ msgstr "" #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" -"GTK settings datetime for UBLinux\n" +"Setting up the date and time for UBLinux\n" "\n" "Usage: ubl-settings-datetime [OPTIONS...]\n" "Options:\n" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 1454e86..76459f1 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -763,7 +763,7 @@ msgstr "ГМТ-3" #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" -"GTK settings datetime for UBLinux\n" +"Setting up the date and time for UBLinux\n" "\n" "Usage: ubl-settings-datetime [OPTIONS...]\n" "Options:\n" -- 2.35.1 From d5caf8c4c7544d851bb70aa9b902250e37e76b77 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 5 May 2023 09:12:41 +0600 Subject: [PATCH 3/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20README=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b9f04cc..9d6282c 100644 --- a/README.md +++ b/README.md @@ -36,16 +36,17 @@ Setting up the date and time for UBLinux Usage: ubl-settings-datetime [OPTIONS...] Options: - -h, --help Show this help - -V, --version Show package version - --lock-datetime Locking date and time changes - --lock-timezone Locking time zone change - --lock-ntp-mode Locking the NTP mode selection - --lock-ntp-edit Lock editing NTP servers - --lock-save Locking of local and global configuration saving - --lock-save-local Locking the local configuration save - --lock-save-global Locking the global configuration save - --lock-load-global Lock load global configuration + -h, --help Show this help + -V, --version Show package version + --lock-datetime Lock date and time changes + --lock-timezone Lock time zone changes + --lock-ntp-mode Lock NTP mode selection + --lock-ntp-edit Lock editing NTP servers + --lock-sync-hwclock Lock sync hwclock mode selection + --lock-save Lock saving local and global configuration + --lock-save-local Lock save global configuration + --lock-save-global Lock load global configuration + --lock-load-global Lock load global configuration $ ubl-settings-datetime --version ubl-settings-datetime version: x.xx -- 2.35.1 From e2456032a78785a8334669be64e8bf2cd5ec4b84 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 10 May 2023 13:47:56 +0600 Subject: [PATCH 4/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 32af888..c23b895 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -41,11 +41,11 @@ #define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime" #define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime" #define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc" -#define remove_global_NTPSERVERS "ubconfig --target global remove network NTPSERVERS" +#define remove_global_NTPSERVERS "ubconfig --target global --noexecute set/remove network NTPSERVERS" #define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default" #define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" #define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\"" -#define remove_system_NTPSERVERS "ubconfig --target system remove network NTPSERVERS" +#define remove_system_NTPSERVERS "ubconfig --target system --noexecute set/remove network NTPSERVERS" #define set_global_ZONE "ubconfig --target global set clock ZONE=" #define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default" #define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp" -- 2.35.1 From d5dce2fa9e321b3e5b4904b1c4c8adcabf6d0cf6 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 10 May 2023 17:14:08 +0600 Subject: [PATCH 5/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5?= =?UTF-8?q?=20=D0=B1=D0=B5=D0=B7=20root?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/main.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/main.cc b/source/main.cc index 4e6c94d..3426522 100644 --- a/source/main.cc +++ b/source/main.cc @@ -8,7 +8,11 @@ int main(int argc, char* argv[]) { for (int i=1; i Date: Wed, 10 May 2023 17:20:22 +0600 Subject: [PATCH 6/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= =?UTF-8?q?=20"=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82=D1=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 2 +- ubl-settings-datetime.pot | 2 +- ubl-settings-datetime_ru.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 5439232..e4e4767 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -301,7 +301,7 @@ True False - Save to global and local configuration + Save configuration diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 5d0ae3f..2110e3a 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1664,7 +1664,7 @@ msgid "Save to local configuration" msgstr "" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save to global and local configuration" +msgid "Save configuration" msgstr "" msgid "Scoresbysund" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 76459f1..d25c7fd 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1690,8 +1690,8 @@ msgid "Save to local configuration" msgstr "Сохранить в локальную конфигурацию" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save to global and local configuration" -msgstr "Сохранить в глобальную и локальную конфигурацию" +msgid "Save configuration" +msgstr "Сохранить конфигурацию" msgid "Scoresbysund" msgstr "Скорсбисунд" -- 2.35.1 From fd5c25513cd4c56212e9712dbe775edeae9434d6 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 10 May 2023 17:34:55 +0600 Subject: [PATCH 7/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 62 ++++++--------------------------- source/ubl-settings-datetime.h | 13 +++++-- 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 46359d0..b12414e 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -530,61 +530,21 @@ void MainWindow::save_global_local_cfg() { lblWarning->set_text(nothing_save); } else { - string cmd = ""; - string cmd_default = ""; - string cmd_dhcp = ""; - string cmd_set_ntp = ""; - string remove = ""; - string local = ""; - string hw = ""; - string remove_ntp = ""; - string cmd_zone = ""; - if (flag_local == false) {} - if (flag_global == false) {} - if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { - if (flag_local == false) { - cmd_zone = set_system_ZONE; - this->enter_zone(cmd_zone); - } - } + string cmd = set_all_ZONE; + string cmd_default = set_all_NTPSERVERS_default; + string cmd_dhcp = set_all_NTPSERVERS_dhcp; + string cmd_set_ntp = set_all_NTPSERVERS; + string remove_ntp = remove_all_NTPSERVERS; + string local = set_all_HWCLOCK_SYNC_localtime; + string hw = set_all_HWCLOCK_SYNC_utc; if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) { - if (flag_global == false) { - cmd_zone = set_global_ZONE; - this->enter_zone(cmd_zone); - } - } - - if (this->check_config("dhcp", 0) == false) { - if (flag_local == false) { - cmd_default = set_system_NTPSERVERS_default; - cmd_dhcp = set_system_NTPSERVERS_dhcp; - cmd_set_ntp = set_system_NTPSERVERS; - remove_ntp = remove_system_NTPSERVERS; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - } - } - if (this->check_config("dhcp", 1) == false) { - if (flag_global == false) { - cmd_default = set_global_NTPSERVERS_default; - cmd_dhcp = set_global_NTPSERVERS_dhcp; - cmd_set_ntp = set_global_NTPSERVERS; - remove_ntp = remove_global_NTPSERVERS; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - } + this->enter_zone(cmd); } - if (this->check_config("hw", 0) == false) { - if (flag_local == false) { - local = set_system_HWCLOCK_SYNC_localtime; - hw = set_system_HWCLOCK_SYNC_utc; - this->set_hardware_clock(local, hw); - } + if (this->check_config("dhcp", 1) == false) { + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); } if (this->check_config("hw", 1) == false) { - if (flag_global == false) { - local = set_global_HWCLOCK_SYNC_localtime; - hw = set_global_HWCLOCK_SYNC_utc; - this->set_hardware_clock(local, hw); - } + this->set_hardware_clock(local, hw); } map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index c23b895..c585869 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -41,12 +41,21 @@ #define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime" #define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime" #define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc" -#define remove_global_NTPSERVERS "ubconfig --target global --noexecute set/remove network NTPSERVERS" +#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS" #define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default" #define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" #define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\"" -#define remove_system_NTPSERVERS "ubconfig --target system --noexecute set/remove network NTPSERVERS" +#define remove_system_NTPSERVERS "ubconfig --target system --noexecute remove network NTPSERVERS" #define set_global_ZONE "ubconfig --target global set clock ZONE=" + +#define set_all_ZONE "ubconfig --noexecute set clock ZONE=" +#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default" +#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp" +#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\"" +#define remove_all_NTPSERVERS "ubconfig --noexecute remove network NTPSERVERS" +#define set_all_HWCLOCK_SYNC_localtime "ubconfig --noexecute set clock HWCLOCK_SYNC=localtime" +#define set_all_HWCLOCK_SYNC_utc "ubconfig --noexecute set clock HWCLOCK_SYNC=utc" + #define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default" #define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp" #define set_global_NTPSERVERS "ubconfig --target global set network NTPSERVERS=\"" -- 2.35.1 From f4a6ae70bea6790d5ac7bbf6ec4fd86f6670c6f0 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 10 May 2023 17:46:59 +0600 Subject: [PATCH 8/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index c585869..1c3b164 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -36,17 +36,17 @@ #define get_system_HWCLOCK_SYNC "ubconfig --default --source system get clock HWCLOCK_SYNC" #define get_global_ZONE "ubconfig --default --source global get clock ZONE" #define get_global_HWCLOCK_SYNC "ubconfig --source global get clock HWCLOCK_SYNC" -#define set_system_ZONE "ubconfig --target system set clock ZONE=" -#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global set clock HWCLOCK_SYNC=utc" -#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime" -#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime" -#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc" +#define set_system_ZONE "ubconfig --target system --noexecute set clock ZONE=" +#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc" +#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime" +#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=localtime" +#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=utc" #define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS" -#define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default" -#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" -#define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\"" +#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default" +#define set_system_NTPSERVERS_dhcp "ubconfig --target system --noexecute set network NTPSERVERS=dhcp" +#define set_system_NTPSERVERS "ubconfig --target system --noexecute set network NTPSERVERS=\"" #define remove_system_NTPSERVERS "ubconfig --target system --noexecute remove network NTPSERVERS" -#define set_global_ZONE "ubconfig --target global set clock ZONE=" +#define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE=" #define set_all_ZONE "ubconfig --noexecute set clock ZONE=" #define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default" @@ -56,9 +56,9 @@ #define set_all_HWCLOCK_SYNC_localtime "ubconfig --noexecute set clock HWCLOCK_SYNC=localtime" #define set_all_HWCLOCK_SYNC_utc "ubconfig --noexecute set clock HWCLOCK_SYNC=utc" -#define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default" -#define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp" -#define set_global_NTPSERVERS "ubconfig --target global set network NTPSERVERS=\"" +#define set_global_NTPSERVERS_default "ubconfig --target global --noexecute set network NTPSERVERS=default" +#define set_global_NTPSERVERS_dhcp "ubconfig --target global --noexecute set network NTPSERVERS=dhcp" +#define set_global_NTPSERVERS "ubconfig --target global --noexecute set network NTPSERVERS=\"" #define set_hwclock "hwclock --systohc" #define icon_checked "com.ublinux.ubl-settings-datetime.checked" #define icon_warning "com.ublinux.ubl-settings-datetime.warning" -- 2.35.1 From 3d18f5d3bd3247e02d8bfb97d3328f9421d7dcee Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 11 May 2023 09:12:34 +0600 Subject: [PATCH 9/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 1c3b164..e0cf99d 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -36,25 +36,25 @@ #define get_system_HWCLOCK_SYNC "ubconfig --default --source system get clock HWCLOCK_SYNC" #define get_global_ZONE "ubconfig --default --source global get clock ZONE" #define get_global_HWCLOCK_SYNC "ubconfig --source global get clock HWCLOCK_SYNC" -#define set_system_ZONE "ubconfig --target system --noexecute set clock ZONE=" +#define set_system_ZONE "ubconfig --target system set clock ZONE=" #define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc" #define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime" -#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=localtime" -#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system --noexecute set clock HWCLOCK_SYNC=utc" +#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime" +#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc" #define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS" -#define set_system_NTPSERVERS_default "ubconfig --target system --noexecute set network NTPSERVERS=default" -#define set_system_NTPSERVERS_dhcp "ubconfig --target system --noexecute set network NTPSERVERS=dhcp" -#define set_system_NTPSERVERS "ubconfig --target system --noexecute set network NTPSERVERS=\"" -#define remove_system_NTPSERVERS "ubconfig --target system --noexecute remove network NTPSERVERS" +#define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default" +#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" +#define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\"" +#define remove_system_NTPSERVERS "ubconfig --target system remove network NTPSERVERS" #define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE=" -#define set_all_ZONE "ubconfig --noexecute set clock ZONE=" -#define set_all_NTPSERVERS_default "ubconfig --noexecute set network NTPSERVERS=default" -#define set_all_NTPSERVERS_dhcp "ubconfig --noexecute set network NTPSERVERS=dhcp" -#define set_all_NTPSERVERS "ubconfig --noexecute set network NTPSERVERS=\"" -#define remove_all_NTPSERVERS "ubconfig --noexecute remove network NTPSERVERS" -#define set_all_HWCLOCK_SYNC_localtime "ubconfig --noexecute set clock HWCLOCK_SYNC=localtime" -#define set_all_HWCLOCK_SYNC_utc "ubconfig --noexecute set clock HWCLOCK_SYNC=utc" +#define set_all_ZONE "ubconfig set clock ZONE=" +#define set_all_NTPSERVERS_default "ubconfig set network NTPSERVERS=default" +#define set_all_NTPSERVERS_dhcp "ubconfig set network NTPSERVERS=dhcp" +#define set_all_NTPSERVERS "ubconfig set network NTPSERVERS=\"" +#define remove_all_NTPSERVERS "ubconfig remove network NTPSERVERS" +#define set_all_HWCLOCK_SYNC_localtime "ubconfig set clock HWCLOCK_SYNC=localtime" +#define set_all_HWCLOCK_SYNC_utc "ubconfig set clock HWCLOCK_SYNC=utc" #define set_global_NTPSERVERS_default "ubconfig --target global --noexecute set network NTPSERVERS=default" #define set_global_NTPSERVERS_dhcp "ubconfig --target global --noexecute set network NTPSERVERS=dhcp" -- 2.35.1