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

Исправлена работа сохранения

Browse Source
pull/111/head
Igor Belitskiy 3 years ago
parent c24d5eb788
commit fd5c25513c
2 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -530,62 +530,22 @@ void MainWindow::save_global_local_cfg() {
lblWarning->set_text(nothing_save); lblWarning->set_text(nothing_save);
} }
else { else {
string cmd = ""; string cmd = set_all_ZONE;
string cmd_default = ""; string cmd_default = set_all_NTPSERVERS_default;
string cmd_dhcp = ""; string cmd_dhcp = set_all_NTPSERVERS_dhcp;
string cmd_set_ntp = ""; string cmd_set_ntp = set_all_NTPSERVERS;
string remove = ""; string remove_ntp = remove_all_NTPSERVERS;
string local = ""; string local = set_all_HWCLOCK_SYNC_localtime;
string hw = ""; string hw = set_all_HWCLOCK_SYNC_utc;
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);
}
}
if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) { if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) {
if (flag_global == false) { this->enter_zone(cmd);
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 (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->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
} }
}
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("hw", 1) == false) { 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_global_old = map_config_data_global;
map_config_data_local_old = map_config_data_local; map_config_data_local_old = map_config_data_local;
info_warning_error(4); info_warning_error(4);

13
source/ubl-settings-datetime.h
Unescape View File

@ -41,12 +41,21 @@
#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime" #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_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_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_default "ubconfig --target system set network NTPSERVERS=default"
#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" #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 "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_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_default "ubconfig --target global set network NTPSERVERS=default"
#define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp" #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 "ubconfig --target global set network NTPSERVERS=\""

Write Preview
Loading…
Cancel
Save