diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 401abdb..70ac936 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -39,13 +39,17 @@ void yon_save_parameters(GtkWidget *self, main_window *widgets){ if (self == widgets->DHCPCombo||self == widgets->NTPEntry){ int mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->DHCPCombo)); switch(mode){ - case 0:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"default"); + case 0:yon_config_remove_by_key(NTPSERVERS_parameter); break; - case 1:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"stop"); + case 1:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"dhcp"); break; - case 2:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"dhcp"); + case 2:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"default"); break; - case 3: + case 3:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"ntp-ru"); + break; + case 5:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"stop"); + break; + case 4: char *value = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NTPEntry)); if (yon_char_is_empty(value)) { yon_ubl_status_box_render(EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); @@ -212,22 +216,24 @@ void yon_interface_update(main_window *widgets){ } char *ntp = config(NTPSERVERS_parameter); if (!yon_char_is_empty(ntp)){ - if (!strcmp(ntp,"stop")){ - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),1); gtk_widget_set_sensitive(widgets->NTPEntry,0); + if (!strcmp(ntp,"dhcp")){ + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),1); } else if (!strcmp(ntp,"default")){ - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),0); - gtk_widget_set_sensitive(widgets->NTPEntry,0); - } else if (!strcmp(ntp,"dhcp")){ gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),2); - gtk_widget_set_sensitive(widgets->NTPEntry,0); - } else { + } else if (!strcmp(ntp,"ntp-ru")){ gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),3); + } else if (!strcmp(ntp,"stop")||!strcmp(ntp,"no")||!strcmp(ntp,"disable")){ + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),5); + } else { + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),4); gtk_widget_set_sensitive(widgets->NTPEntry,1); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),ntp); } } else { + gtk_widget_set_sensitive(widgets->NTPEntry,0); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),0); } char *hwclock_sync = config(HWCLOCK_SYNC_parameter); @@ -376,19 +382,20 @@ void on_sync_clicked(GtkWidget *, main_window *widgets){ void on_ntp_sync(GtkWidget *, main_window *widgets){ int mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->DHCPCombo)); + gtk_widget_set_sensitive(widgets->NTPEntry,0); switch(mode){ case 0: - gtk_widget_set_sensitive(widgets->NTPEntry,0); if (main_config.ntp_default){ gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default); } break; case 1: case 2: - gtk_widget_set_sensitive(widgets->NTPEntry,0); + case 3: + case 5: gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; - case 3: + case 4: gtk_widget_set_sensitive(widgets->NTPEntry,1); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 63dd709..2ead441 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -16,6 +16,8 @@ #define SYNC_NTP_LABEL _("Synchronize via NTP") #define DEFAULT_LABEL _("Default") #define STOPPED_LABEL _("Stopped") +#define NTP_LABEL _("NTP-servers") +#define NTO_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") diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 65c5bbc..3e6b1c4 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -272,9 +272,11 @@ format False 0 - Stopped DHCP + NTP-servers + NTP-servers (RU) Manual + Stopped diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 075040f..af16f27 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -97,6 +97,14 @@ msgstr "" msgid "Manual" msgstr "" +#: source/ubl-strings.h:17 +msgid "NTP-servers" +msgstr "" + +#: source/ubl-strings.h:17 +msgid "NTP-servers (RU)" +msgstr "" + #: source/ubl-strings.h:18 msgid "" "Enter the name of the ntp server or its ip address. When entering multiple " diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index e752e53..fe5e2a3 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -101,6 +101,14 @@ msgstr "Остановлен" msgid "Manual" msgstr "Вручную" +#: source/ubl-strings.h:17 +msgid "NTP-servers" +msgstr "NTP-серверы" + +#: source/ubl-strings.h:17 +msgid "NTP-servers (RU)" +msgstr "NTP-серверы (RU)" + #: source/ubl-strings.h:18 msgid "" "Enter the name of the ntp server or its ip address. When entering multiple "