From 9d194d75f40ef28e569e11ddd2e0627934a859e6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 23 Sep 2025 17:50:55 +0600 Subject: [PATCH 1/6] Buttons minimum size --- ubl-settings-datetime.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css index c148da2..30b76db 100644 --- a/ubl-settings-datetime.css +++ b/ubl-settings-datetime.css @@ -134,4 +134,9 @@ border-color:alpha(@theme_text_color, 0.01); .marginright image{ margin-right: 2px; +} + +button { + min-width: 26px; + min-height: 24px; } \ No newline at end of file From a95cf85cf8bed955f3def7eedab84eab13ee0d9b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Oct 2025 14:05:47 +0600 Subject: [PATCH 2/6] Added root button --- source/ubl-settings-datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index cdd8d5d..45b0ba9 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -566,7 +566,6 @@ void yon_main_window_complete(main_window **window){ widgets->DateCalendar = yon_gtk_builder_get_widget(builder,"DateCalendar"); widgets->DateCancelButton = yon_gtk_builder_get_widget(builder,"DateCancelButton"); widgets->DateAcceptButton = yon_gtk_builder_get_widget(builder,"DateAcceptButton"); - widgets->zone_list = GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1")); } // Signal configuration @@ -699,6 +698,7 @@ int main(int argc, char *argv[]){ yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL); gtk_init(&argc,&argv); template_main_window *widgets = yon_ubl_window_setup(); + yon_root_button_setup((template_main_window*)widgets,argv,argc); yon_main_window_complete((main_window**)&widgets); if (getuid()!=0){ textdomain(template_ui_LocaleName); From 3eabce70fe05ee206a5edfc3a3dfab096c5e0bc0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Oct 2025 14:09:28 +0600 Subject: [PATCH 3/6] Changed wili link --- source/ubl-settings-datetime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index f4322df..ddfa2fd 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -15,7 +15,7 @@ #endif #include "ubl-strings.h" -#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-TEMPLATE" +#define WIKI_LINK "https://wiki.ublinux.com/Software/Programs_and_utilities/All/ubl-settings-datetime" #define _(String) gettext(String) From 8e4232aee35385dda62e66d51bf0a8552ca6a3ee Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 8 Oct 2025 15:48:40 +0600 Subject: [PATCH 4/6] zone loading changes --- source/ubl-settings-datetime.c | 29 +++++++++++++++++++++-------- source/ubl-settings-datetime.h | 1 + 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 45b0ba9..85ea033 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -307,8 +307,8 @@ void on_date_clicked(GtkWidget *,main_window *widgets){ } void on_region_changed(GtkComboBox *self, main_window *widgets){ - char *active = (char*)gtk_combo_box_get_active_id(self); - active = yon_char_append("/usr/share/zoneinfo/",active); + char *active_name = (char*)gtk_combo_box_get_active_id(self); + char *active = yon_char_append("/usr/share/zoneinfo/",active_name); int size; gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ZoneCombo)); if (yon_file_is_directory(active)){ @@ -316,12 +316,25 @@ void on_region_changed(GtkComboBox *self, main_window *widgets){ config_str parsed_sorted = yon_char_parsed_sort(parsed,size); yon_char_parsed_free(parsed,size); for (int i=0;iZoneCombo),parsed_sorted[i],_(parsed_sorted[i])); + char *name_string = NULL; + if (strstr(parsed_sorted[i],"GMT")){ + char *temp = yon_char_unite("UTC",parsed_sorted[i]+3," (",parsed_sorted[i],")",NULL); + free(parsed_sorted[i]); + parsed_sorted[i]=temp; + } else if (strcmp(active_name,"Etc")){ + char *zonereg = yon_char_unite(active,"/",parsed_sorted[i],NULL); + if (g_setenv("TZ",zonereg,1)){ + time_t curtime = time(NULL); + struct tm *local = localtime(&curtime); + char *hour_str = yon_char_from_long(local->tm_gmtoff/3600); + char *minute = yon_char_from_long((local->tm_gmtoff%3600)/60); + name_string = yon_char_unite("(UTC ",local->tm_gmtoff>0?"+":"-",hour_str,":",minute,") ",_(parsed_sorted[i]),NULL); + free(hour_str); + free(minute); + free(zonereg); + } + } + gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ZoneCombo),parsed_sorted[i],name_string?name_string:_(parsed_sorted[i])); } if (size) yon_char_parsed_free(parsed_sorted,size); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index ddfa2fd..0997f2e 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include From 0ae6660527155297a643127adbda8ebf5b80c491 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 8 Oct 2025 17:17:40 +0600 Subject: [PATCH 5/6] Fixes --- locale/ubl-settings-datetime_ru.po | 12 ++++++++++++ source/ubl-settings-datetime.c | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/locale/ubl-settings-datetime_ru.po b/locale/ubl-settings-datetime_ru.po index c2997c6..8663fbd 100644 --- a/locale/ubl-settings-datetime_ru.po +++ b/locale/ubl-settings-datetime_ru.po @@ -160,6 +160,18 @@ msgstr "ММ-ДД-ГГГГ" msgid "Stopped" msgstr "Остановлен" +msgid "Argentina" +msgstr "Аргентина" + +msgid "Kentucky" +msgstr "Кентукки" + +msgid "Currie" +msgstr "Карри" + +msgid "Kosrae" +msgstr "Косраэ" + msgid "Abidjan" msgstr "Абиджан" diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 85ea033..8b1fce3 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -327,10 +327,8 @@ void on_region_changed(GtkComboBox *self, main_window *widgets){ time_t curtime = time(NULL); struct tm *local = localtime(&curtime); char *hour_str = yon_char_from_long(local->tm_gmtoff/3600); - char *minute = yon_char_from_long((local->tm_gmtoff%3600)/60); - name_string = yon_char_unite("(UTC ",local->tm_gmtoff>0?"+":"-",hour_str,":",minute,") ",_(parsed_sorted[i]),NULL); + name_string = yon_char_unite("(UTC ",local->tm_gmtoff>0?"+":"",strlen(hour_str)<2&&local->tm_gmtoff!=0?"0":"",hour_str,") ",_(parsed_sorted[i]),NULL); free(hour_str); - free(minute); free(zonereg); } } @@ -544,7 +542,10 @@ void config_init(){ if (size>0){ if (strcmp(parsed[0],"(null)\n")){ yon_char_remove_last_symbol(parsed[0],'\n'); - main_config.ntp_default = parsed[0]; + if (strstr(parsed[0],"[")&&strstr(parsed[0],"]")) + main_config.ntp_default = strstr(parsed[0],"] ")+2; + else + main_config.ntp_default = parsed[0]; } } } From 551e26588bf80936f4e028e5b7bbdd1453b66905 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 8 Oct 2025 17:40:18 +0600 Subject: [PATCH 6/6] Localisation fix --- locale/ubl-settings-datetime_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ubl-settings-datetime_ru.po b/locale/ubl-settings-datetime_ru.po index 8663fbd..13ad9b2 100644 --- a/locale/ubl-settings-datetime_ru.po +++ b/locale/ubl-settings-datetime_ru.po @@ -1216,7 +1216,7 @@ msgstr "Норонья" msgid "North" msgstr "Север" -msgid "North_Dokota" +msgid "North_Dakota" msgstr "Северная Докота" msgid "Nouakchott"