Fixed default parameters

pull/169/head
parent 575ca196da
commit c766e96d2e

@ -544,9 +544,50 @@ void yon_main_window_complete(main_window **window){
g_signal_connect(G_OBJECT(widgets->ZoneCombo),"changed",G_CALLBACK(yon_save_parameters),widgets);
}
// Initial data loading
char *ntp_default = NULL;
char *time_sync_default = NULL;
{
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(widgets->DHCPCombo),yon_get_default_label_with_parameter("network",NTPSERVERS_parameter));
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(widgets->TimeSyncTypeCombo),yon_get_default_label_with_parameter("clock",HWCLOCK_SYNC_parameter));
{
int size;
config_str parsed = yon_config_load(NTPSERVERS_parameter_command,&size);
if (size&&!yon_char_is_empty(parsed[0])){
yon_char_remove_last_symbol(parsed[0],'\n');
free(yon_char_divide_search(parsed[0],"=",-1));
if (!strcmp(parsed[0],"dhcp")){
ntp_default = DHCP_LABEL;
} else if (!strcmp(parsed[0],"default")){
ntp_default = NTP_LABEL;
} else if (!strcmp(parsed[0],"ntp-ru")){
ntp_default = NTp_RU_LABEL;
} else if (!strcmp(parsed[0],"disable")||!strcmp(parsed[0],"stop")){
ntp_default = STOPPED_LABEL;
} else {
ntp_default = yon_char_new(parsed[0]);
}
yon_char_parsed_free(parsed,size);
}
}
{
int size;
config_str parsed = yon_config_load(HWCLOCK_SYNC_parameter_command,&size);
yon_char_remove_last_symbol(parsed[0],'\n');
if (size&&!yon_char_is_empty(parsed[0])){
free(yon_char_divide_search(parsed[0],"=",-1));
if (!strcmp(parsed[0],"utc")){
time_sync_default = UTC_LABEL;
} else if (!strcmp(parsed[0],"localtime")){
time_sync_default = LOCAL_TIME_LABEL;
} else {
}
}
}
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(widgets->DHCPCombo),DEFAULT_CUSTOM_LABEL(ntp_default));
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(widgets->TimeSyncTypeCombo),DEFAULT_CUSTOM_LABEL(time_sync_default));
int size;
config_str parsed = yon_dir_get_contents(zone_path,&size);

@ -16,8 +16,10 @@
#define SYNC_NTP_LABEL _("Synchronize via NTP")
#define DEFAULT_LABEL _("Default")
#define STOPPED_LABEL _("Stopped")
#define DHCP_LABEL "DHCP"
#define UTC_LABEL "UTC"
#define NTP_LABEL _("NTP-servers")
#define NTO_RU_LABEL _("NTP-servers (RU)")
#define NTp_RU_LABEL _("NTP-servers (RU)")
#define MANUAL_LABEL _("Manual")
#define MANUAL_TOOLTIP_LABEL _("Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.")
#define TIME_ZONE_LABEL _("Time Zone")

Loading…
Cancel
Save