From d8a9df611d6d02e61a7393c60b6dab10f9818a77 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 3 Apr 2025 16:46:11 +0600 Subject: [PATCH 1/4] Fixed status message --- source/ubl-settings-system.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 825fa71..2666ff6 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -381,7 +381,8 @@ void on_language_changed(GtkComboBox *self, main_window *widgets){ void on_terminal_command_ended(VteTerminal *terminal, gint status, domain_info_window *window){ textdomain(template_ui_LocaleName); - yon_ubl_status_box_despawn_infinite(GTK_CONTAINER(window->StatusBox)); + // yon_ubl_status_box_despawn_infinite(GTK_CONTAINER(window->StatusBox)); + printf("%d\n",status); if (!status) yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"success",yon_char_get_localised_from_lib(SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); else { From b8960fe96a8f8f9d5572def1bbe493cfc3fb6618 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 15:11:05 +0600 Subject: [PATCH 2/4] Fixed localisation; Added default button to localisations window --- source/ubl-settings-system.c | 40 ++- source/ubl-settings-system.h | 1 + ubl-settings-system-layouts.glade | 16 +- ubl-settings-system.pot | 390 ++++++++++++++++++++++ ubl-settings-system_ru.po | 520 +++++++++++++++--------------- 5 files changed, 693 insertions(+), 274 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 2666ff6..c1e5fbd 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -248,21 +248,28 @@ void on_locale_accept(GtkWidget *self, dictionary *dict){ main_window *widgets = yon_dictionary_get_data(dict->first,main_window*); locals_window *window = yon_dictionary_get_data(dict->first->next,locals_window*); GtkTreeIter iter; - gboolean is_active; - char *final_string = ""; - char *final_ids = ""; - char *name, *id; - int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter); - for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){ - gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&name,1,&id,2,&is_active,-1); - if (is_active){ - final_string = yon_char_unite(strcmp(final_string,"") ? yon_char_append(final_string,"; ") : final_string,name,NULL); - final_ids = yon_char_unite(strcmp(final_ids,"") ? yon_char_append(final_ids,",") : final_ids,id,NULL); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DefaultCheck))){ + yon_config_remove_by_key(locale_parameter); + gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); + for_iter (GTK_TREE_MODEL(widgets->languagelist),&iter){ + gtk_list_store_set(widgets->languagelist,&iter,2,0,-1); + } + } else { + gboolean is_active; + char *final_string = ""; + char *final_ids = ""; + char *name, *id; + int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter); + for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){ + gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&name,1,&id,2,&is_active,-1); + if (is_active){ + final_string = yon_char_unite(strcmp(final_string,"") ? yon_char_append(final_string,"; ") : final_string,name,NULL); + final_ids = yon_char_unite(strcmp(final_ids,"") ? yon_char_append(final_ids,",") : final_ids,id,NULL); + } } + yon_config_register(locale_parameter,LOCALE_get_command,final_ids); + gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),final_string); } - gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),final_string); - if (yon_config_get_by_key("LOCALE")) yon_config_set("LOCALE",final_ids); - else yon_config_register("LOCALE",LOCALE_get_command,final_ids); on_subwindow_close(self); } @@ -273,6 +280,7 @@ void on_locale_open(GtkWidget *self, main_window *widgets){ window->MainTree = yon_gtk_builder_get_widget(builder,"localesTree"); window->CloseButton = yon_gtk_builder_get_widget(builder,"localesCancelButton"); window->AcceptButton = yon_gtk_builder_get_widget(builder,"localesAcceptButton"); + window->DefaultCheck = yon_gtk_builder_get_widget(builder,"DefaultCheck"); window->ToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"toggleCell")); gtk_tree_view_set_model(GTK_TREE_VIEW(window->MainTree), GTK_TREE_MODEL(widgets->languagelist)); @@ -280,10 +288,16 @@ void on_locale_open(GtkWidget *self, main_window *widgets){ yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); + g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); + g_signal_connect(G_OBJECT(window->DefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->MainTree); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_locale_accept),dict); g_signal_connect(G_OBJECT(window->MainTree),"row-activated",G_CALLBACK(on_locale_toggle),window); + if (!config(locale_parameter)){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DefaultCheck),1); + } + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),TITLE_LABEL,main_icon,"LocalesWindow"); gtk_dialog_run(GTK_DIALOG(window->Window)); diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h index 5f04d17..0f168ba 100644 --- a/source/ubl-settings-system.h +++ b/source/ubl-settings-system.h @@ -145,6 +145,7 @@ typedef struct { GtkWidget *CloseButton; GtkWidget *AcceptButton; + GtkWidget *DefaultCheck; GtkCellRenderer *ToggleCell; } locals_window; diff --git a/ubl-settings-system-layouts.glade b/ubl-settings-system-layouts.glade index e3caeb8..6ab0e03 100644 --- a/ubl-settings-system-layouts.glade +++ b/ubl-settings-system-layouts.glade @@ -81,6 +81,20 @@ 2 vertical 10 + + + Default + True + True + False + True + + + False + True + 0 + + True @@ -125,7 +139,7 @@ True True - 0 + 1 diff --git a/ubl-settings-system.pot b/ubl-settings-system.pot index 7fcbe88..7c0d2c3 100644 --- a/ubl-settings-system.pot +++ b/ubl-settings-system.pot @@ -228,3 +228,393 @@ msgstr "" #: source/ubl-strings.h:65 msgid "Check" msgstr "" + +msgid "Domain connection" +msgstr "" + +msgid "Afrikaans, South Africa" +msgstr "" + +msgid "Arabic, United Arab Emirates" +msgstr "" + +msgid "Arabic, Bahrain" +msgstr "" + +msgid "Arabic, Algeria" +msgstr "" + +msgid "Arabic, Egypt" +msgstr "" + +msgid "Arabic, Iraq" +msgstr "" + +msgid "Arabic, Jordan" +msgstr "" + +msgid "Arabic, Kuwait" +msgstr "" + +msgid "Arabic, Libya" +msgstr "" + +msgid "Arabic, Morocco" +msgstr "" + +msgid "Arabic, Oman" +msgstr "" + +msgid "Arabic, Qatar" +msgstr "" + +msgid "Arabic, Saudi Arabia" +msgstr "" + +msgid "Arabic, Tunisia" +msgstr "" + +msgid "Arabic, Yemen" +msgstr "" + +msgid "Assamese, India" +msgstr "" + +msgid "Azerbaijani, Azerbaijan" +msgstr "" + +msgid "Belarusian, Belarus" +msgstr "" + +msgid "Bulgarian, Bulgaria" +msgstr "" + +msgid "Bengali, India" +msgstr "" + +msgid "Bosnian, Bosnia and Herzegovina" +msgstr "" + +msgid "Catalan, Spain" +msgstr "" + +msgid "Czech, Czech Republic" +msgstr "" + +msgid "Danish, Denmark" +msgstr "" + +msgid "German, Austria" +msgstr "" + +msgid "German, Belgium" +msgstr "" + +msgid "German, Switzerland" +msgstr "" + +msgid "German, Germany" +msgstr "" + +msgid "German, Liechtenstein" +msgstr "" + +msgid "German, Luxembourg" +msgstr "" + +msgid "Greek, Cyprus" +msgstr "" + +msgid "Greek, Greece" +msgstr "" + +msgid "English, Australia" +msgstr "" + +msgid "English, Botswana" +msgstr "" + +msgid "English, Canada" +msgstr "" + +msgid "English, United Kingdom" +msgstr "" + +msgid "English, Hong Kong SAR China" +msgstr "" + +msgid "English, Ireland" +msgstr "" + +msgid "English, India" +msgstr "" + +msgid "English, Malta" +msgstr "" + +msgid "English, New Zealand" +msgstr "" + +msgid "English, Philippines" +msgstr "" + +msgid "English, Singapore" +msgstr "" + +msgid "English, U.S.A." +msgstr "" + +msgid "English, Zimbabwe" +msgstr "" + +msgid "Spanish, Argentina" +msgstr "" + +msgid "Spanish, Bolivia" +msgstr "" + +msgid "Spanish, Chile" +msgstr "" + +msgid "Spanish, Colombia" +msgstr "" + +msgid "Spanish, Costa Rica" +msgstr "" + +msgid "Spanish, Dominican Republic" +msgstr "" + +msgid "Spanish, Ecuador" +msgstr "" + +msgid "Spanish, Spain" +msgstr "" + +msgid "Spanish, Guatemala" +msgstr "" + +msgid "Spanish, Honduras" +msgstr "" + +msgid "Spanish, Mexico" +msgstr "" + +msgid "Spanish, Nicaragua" +msgstr "" + +msgid "Spanish, Panama" +msgstr "" + +msgid "Spanish, Peru" +msgstr "" + +msgid "Spanish, Puerto Rico" +msgstr "" + +msgid "Spanish, Paraguay" +msgstr "" + +msgid "Spanish, El Salvador" +msgstr "" + +msgid "Spanish, U.S.A." +msgstr "" + +msgid "Spanish, Uruguay" +msgstr "" + +msgid "Spanish, Venezuela" +msgstr "" + +msgid "Estonian, Estonia" +msgstr "" + +msgid "Finnish, Finland" +msgstr "" + +msgid "French, Belgium" +msgstr "" + +msgid "French, Canada" +msgstr "" + +msgid "French, Switzerland" +msgstr "" + +msgid "French, France" +msgstr "" + +msgid "French, Luxembourg" +msgstr "" + +msgid "Gujarati, India" +msgstr "" + +msgid "Hebrew, Israel" +msgstr "" + +msgid "Hindi, India" +msgstr "" + +msgid "Croatian, Croatia" +msgstr "" + +msgid "Hungarian, Hungary" +msgstr "" + +msgid "Armenian, Armenia" +msgstr "" + +msgid "Indonesian, Indonesia" +msgstr "" + +msgid "Icelandic, Iceland" +msgstr "" + +msgid "Italian, Switzerla" +msgstr "" + +msgid "Italian, Italy" +msgstr "" + +msgid "Japanese, Japan" +msgstr "" + +msgid "Georgian, Georgia" +msgstr "" + +msgid "Kazakh, Kazakhstan" +msgstr "" + +msgid "Kannada, India" +msgstr "" + +msgid "Korean, Korea" +msgstr "" + +msgid "Kashmiri, India" +msgstr "" + +msgid "Kurdish, Turkey" +msgstr "" + +msgid "Kurdish (Sorani), Turkey" +msgstr "" + +msgid "Kirghiz, Kyrgyzstan" +msgstr "" + +msgid "Lithuanian, Lithuania" +msgstr "" + +msgid "Latvian, Latvia" +msgstr "" + +msgid "Macedonian, Macedonia" +msgstr "" + +msgid "Malayalam, India" +msgstr "" + +msgid "Marathi, India" +msgstr "" + +msgid "Malay, Malaysia" +msgstr "" + +msgid "Maltese, Malta" +msgstr "" + +msgid "Bokmal, Norway" +msgstr "" + +msgid "Dutch, Belgium" +msgstr "" + +msgid "Dutch, Netherlands" +msgstr "" + +msgid "Nynorsk, Norway" +msgstr "" + +msgid "Oriya, India" +msgstr "" + +msgid "Punjabi, India" +msgstr "" + +msgid "Polish, Poland" +msgstr "" + +msgid "Portuguese, Brazil" +msgstr "" + +msgid "Portuguese, Portugal" +msgstr "" + +msgid "Romanian, Romania" +msgstr "" + +msgid "Russian, Russia" +msgstr "" + +msgid "Russian, Ukraine" +msgstr "" + +msgid "Sanskrit, India" +msgstr "" + +msgid "Slovak, Slovakia" +msgstr "" + +msgid "Slovenian, Slovenia" +msgstr "" + +msgid "Albanian, Albania" +msgstr "" + +msgid "Serbian, Montenegro" +msgstr "" + +msgid "Serbian, Montenegro (Latin)" +msgstr "" + +msgid "Serbian, Serbia" +msgstr "" + +msgid "Serbian, Serbia (Latin)" +msgstr "" + +msgid "" +msgstr "" + +msgid "Tamil, India" +msgstr "" + +msgid "Telugu, India" +msgstr "" + +msgid "Thai, Thailand" +msgstr "" + +msgid "Turkish, Turkey" +msgstr "" + +msgid "Ukrainian, Ukraine" +msgstr "" + +msgid "Vietnamese, Vietnam" +msgstr "" + +msgid "Simplified Chinese, China" +msgstr "" + +msgid "Traditional Chinese, Hong Kong SAR China" +msgstr "" + +msgid "Chinese, Singapore" +msgstr "" + +msgid "Traditional Chinese, Taiwan" +msgstr "" diff --git a/ubl-settings-system_ru.po b/ubl-settings-system_ru.po index f5c7b76..729b34a 100644 --- a/ubl-settings-system_ru.po +++ b/ubl-settings-system_ru.po @@ -230,392 +230,392 @@ msgstr "Загрузка..." msgid "Check" msgstr "Проверка" -#~ msgid "Domain connection" -#~ msgstr "Соединение домена" +msgid "Domain connection" +msgstr "Соединение домена" -#~ msgid "Afrikaans, South Africa" -#~ msgstr "Африканский, Южная Африка" +msgid "Afrikaans, South Africa" +msgstr "Африканский, Южная Африка" -#~ msgid "Arabic, United Arab Emirates" -#~ msgstr "Арабский, ЮАР" +msgid "Arabic, United Arab Emirates" +msgstr "Арабский, ЮАР" -#~ msgid "Arabic, Bahrain" -#~ msgstr "Арабский, Бахрейн" +msgid "Arabic, Bahrain" +msgstr "Арабский, Бахрейн" -#~ msgid "Arabic, Algeria" -#~ msgstr "Арабский, Алжир" +msgid "Arabic, Algeria" +msgstr "Арабский, Алжир" -#~ msgid "Arabic, Egypt" -#~ msgstr "Арабский, Египет" +msgid "Arabic, Egypt" +msgstr "Арабский, Египет" -#~ msgid "Arabic, Iraq" -#~ msgstr "Арабский, Ирак" +msgid "Arabic, Iraq" +msgstr "Арабский, Ирак" -#~ msgid "Arabic, Jordan" -#~ msgstr "Арабский, Иордания" +msgid "Arabic, Jordan" +msgstr "Арабский, Иордания" -#~ msgid "Arabic, Kuwait" -#~ msgstr "Арабский, Кувейт" +msgid "Arabic, Kuwait" +msgstr "Арабский, Кувейт" -#~ msgid "Arabic, Libya" -#~ msgstr "Арабский, Ливия" +msgid "Arabic, Libya" +msgstr "Арабский, Ливия" -#~ msgid "Arabic, Morocco" -#~ msgstr "Арабский, Морокко" +msgid "Arabic, Morocco" +msgstr "Арабский, Морокко" -#~ msgid "Arabic, Oman" -#~ msgstr "Арабский, Оман" +msgid "Arabic, Oman" +msgstr "Арабский, Оман" -#~ msgid "Arabic, Qatar" -#~ msgstr "Арабский, Катар" +msgid "Arabic, Qatar" +msgstr "Арабский, Катар" -#~ msgid "Arabic, Saudi Arabia" -#~ msgstr "Арабский, Саудовская Аравия" +msgid "Arabic, Saudi Arabia" +msgstr "Арабский, Саудовская Аравия" -#~ msgid "Arabic, Tunisia" -#~ msgstr "Арабский, Тунис" +msgid "Arabic, Tunisia" +msgstr "Арабский, Тунис" -#~ msgid "Arabic, Yemen" -#~ msgstr "Арабский, Йемен" +msgid "Arabic, Yemen" +msgstr "Арабский, Йемен" -#~ msgid "Assamese, India" -#~ msgstr "Ассамский, Индия" +msgid "Assamese, India" +msgstr "Ассамский, Индия" -#~ msgid "Azerbaijani, Azerbaijan" -#~ msgstr "Азербайджанский,Азербайджан" +msgid "Azerbaijani, Azerbaijan" +msgstr "Азербайджанский,Азербайджан" -#~ msgid "Belarusian, Belarus" -#~ msgstr "Беларусский, Беларусь" +msgid "Belarusian, Belarus" +msgstr "Беларусский, Беларусь" -#~ msgid "Bulgarian, Bulgaria" -#~ msgstr "Болгарский, Болгария" +msgid "Bulgarian, Bulgaria" +msgstr "Болгарский, Болгария" -#~ msgid "Bengali, India" -#~ msgstr "Бенгальский, Индия" +msgid "Bengali, India" +msgstr "Бенгальский, Индия" -#~ msgid "Bosnian, Bosnia and Herzegovina" -#~ msgstr "Боснийский, Босния и Герцеговина" +msgid "Bosnian, Bosnia and Herzegovina" +msgstr "Боснийский, Босния и Герцеговина" -#~ msgid "Catalan, Spain" -#~ msgstr "Каталонский, Испания" +msgid "Catalan, Spain" +msgstr "Каталонский, Испания" -#~ msgid "Czech, Czech Republic" -#~ msgstr "Чешский, Чехия" +msgid "Czech, Czech Republic" +msgstr "Чешский, Чехия" -#~ msgid "Danish, Denmark" -#~ msgstr "Датский, Дания" +msgid "Danish, Denmark" +msgstr "Датский, Дания" -#~ msgid "German, Austria" -#~ msgstr "Немецкий, Австрия" +msgid "German, Austria" +msgstr "Немецкий, Австрия" -#~ msgid "German, Belgium" -#~ msgstr "Немецкий, Бельгия" +msgid "German, Belgium" +msgstr "Немецкий, Бельгия" -#~ msgid "German, Switzerland" -#~ msgstr "Немецкий, Швейцария" +msgid "German, Switzerland" +msgstr "Немецкий, Швейцария" -#~ msgid "German, Germany" -#~ msgstr "Немецкий, Германия" +msgid "German, Germany" +msgstr "Немецкий, Германия" -#~ msgid "German, Liechtenstein" -#~ msgstr "Немецкий, Лихтенштейн" +msgid "German, Liechtenstein" +msgstr "Немецкий, Лихтенштейн" -#~ msgid "German, Luxembourg" -#~ msgstr "Немецкий, Люксембург" +msgid "German, Luxembourg" +msgstr "Немецкий, Люксембург" -#~ msgid "Greek, Cyprus" -#~ msgstr "Греческий, Кипр" +msgid "Greek, Cyprus" +msgstr "Греческий, Кипр" -#~ msgid "Greek, Greece" -#~ msgstr "Греческий, Греция" +msgid "Greek, Greece" +msgstr "Греческий, Греция" -#~ msgid "English, Australia" -#~ msgstr "Английский, Австралия" +msgid "English, Australia" +msgstr "Английский, Австралия" -#~ msgid "English, Botswana" -#~ msgstr "Английский, ботсвана" +msgid "English, Botswana" +msgstr "Английский, ботсвана" -#~ msgid "English, Canada" -#~ msgstr "Английский, Канада" +msgid "English, Canada" +msgstr "Английский, Канада" -#~ msgid "English, United Kingdom" -#~ msgstr "Английский, Великобритания" +msgid "English, United Kingdom" +msgstr "Английский, Великобритания" -#~ msgid "English, Hong Kong SAR China" -#~ msgstr "Английский, Гонконг" +msgid "English, Hong Kong SAR China" +msgstr "Английский, Гонконг" -#~ msgid "English, Ireland" -#~ msgstr "Английский, Ирландия" +msgid "English, Ireland" +msgstr "Английский, Ирландия" -#~ msgid "English, India" -#~ msgstr "Английский, Индия" +msgid "English, India" +msgstr "Английский, Индия" -#~ msgid "English, Malta" -#~ msgstr "Английский, Мальта" +msgid "English, Malta" +msgstr "Английский, Мальта" -#~ msgid "English, New Zealand" -#~ msgstr "Английский, Новая Зеландия" +msgid "English, New Zealand" +msgstr "Английский, Новая Зеландия" -#~ msgid "English, Philippines" -#~ msgstr "Английский, Филиппины" +msgid "English, Philippines" +msgstr "Английский, Филиппины" -#~ msgid "English, Singapore" -#~ msgstr "Английский, Сингапур" +msgid "English, Singapore" +msgstr "Английский, Сингапур" -#~ msgid "English, U.S.A." -#~ msgstr "Английский, США" +msgid "English, U.S.A." +msgstr "Английский, США" -#~ msgid "English, Zimbabwe" -#~ msgstr "Английский, Зимбабве" +msgid "English, Zimbabwe" +msgstr "Английский, Зимбабве" -#~ msgid "Spanish, Argentina" -#~ msgstr "Испанский, Аргентина" +msgid "Spanish, Argentina" +msgstr "Испанский, Аргентина" -#~ msgid "Spanish, Bolivia" -#~ msgstr "Испанский, Боливия" +msgid "Spanish, Bolivia" +msgstr "Испанский, Боливия" -#~ msgid "Spanish, Chile" -#~ msgstr "Испанский, Чили" +msgid "Spanish, Chile" +msgstr "Испанский, Чили" -#~ msgid "Spanish, Colombia" -#~ msgstr "Испанский, Колумбия" +msgid "Spanish, Colombia" +msgstr "Испанский, Колумбия" -#~ msgid "Spanish, Costa Rica" -#~ msgstr "Испанский, Коста-Рика" +msgid "Spanish, Costa Rica" +msgstr "Испанский, Коста-Рика" -#~ msgid "Spanish, Dominican Republic" -#~ msgstr "Испанский, Доминиканская республика" +msgid "Spanish, Dominican Republic" +msgstr "Испанский, Доминиканская республика" -#~ msgid "Spanish, Ecuador" -#~ msgstr "Испанский, Эквадор" +msgid "Spanish, Ecuador" +msgstr "Испанский, Эквадор" -#~ msgid "Spanish, Spain" -#~ msgstr "Испанский, Испания" +msgid "Spanish, Spain" +msgstr "Испанский, Испания" -#~ msgid "Spanish, Guatemala" -#~ msgstr "Испанский, Гватемала" +msgid "Spanish, Guatemala" +msgstr "Испанский, Гватемала" -#~ msgid "Spanish, Honduras" -#~ msgstr "Испанский, Гондурас" +msgid "Spanish, Honduras" +msgstr "Испанский, Гондурас" -#~ msgid "Spanish, Mexico" -#~ msgstr "Испанский, Мексика" +msgid "Spanish, Mexico" +msgstr "Испанский, Мексика" -#~ msgid "Spanish, Nicaragua" -#~ msgstr "Испанский, Никарагуа" +msgid "Spanish, Nicaragua" +msgstr "Испанский, Никарагуа" -#~ msgid "Spanish, Panama" -#~ msgstr "Испанский, Панама" +msgid "Spanish, Panama" +msgstr "Испанский, Панама" -#~ msgid "Spanish, Peru" -#~ msgstr "Испанский, Перу" +msgid "Spanish, Peru" +msgstr "Испанский, Перу" -#~ msgid "Spanish, Puerto Rico" -#~ msgstr "Испанский, Пуэрто-Рико" +msgid "Spanish, Puerto Rico" +msgstr "Испанский, Пуэрто-Рико" -#~ msgid "Spanish, Paraguay" -#~ msgstr "Испанский, Парагвай" +msgid "Spanish, Paraguay" +msgstr "Испанский, Парагвай" -#~ msgid "Spanish, El Salvador" -#~ msgstr "Испанский, Сальвадор" +msgid "Spanish, El Salvador" +msgstr "Испанский, Сальвадор" -#~ msgid "Spanish, U.S.A." -#~ msgstr "Испанский, США" +msgid "Spanish, U.S.A." +msgstr "Испанский, США" -#~ msgid "Spanish, Uruguay" -#~ msgstr "Испанский, Уругвай" +msgid "Spanish, Uruguay" +msgstr "Испанский, Уругвай" -#~ msgid "Spanish, Venezuela" -#~ msgstr "Испанский, Венесуэла" +msgid "Spanish, Venezuela" +msgstr "Испанский, Венесуэла" -#~ msgid "Estonian, Estonia" -#~ msgstr "Эстонский, Эстония" +msgid "Estonian, Estonia" +msgstr "Эстонский, Эстония" -#~ msgid "Finnish, Finland" -#~ msgstr "Финский, Финляндия" +msgid "Finnish, Finland" +msgstr "Финский, Финляндия" -#~ msgid "French, Belgium" -#~ msgstr "Французский, Бельгия" +msgid "French, Belgium" +msgstr "Французский, Бельгия" -#~ msgid "French, Canada" -#~ msgstr "Французский, Канада" +msgid "French, Canada" +msgstr "Французский, Канада" -#~ msgid "French, Switzerland" -#~ msgstr "Французский, Швейцария" +msgid "French, Switzerland" +msgstr "Французский, Швейцария" -#~ msgid "French, France" -#~ msgstr "Французский, Франция" +msgid "French, France" +msgstr "Французский, Франция" -#~ msgid "French, Luxembourg" -#~ msgstr "Французский, Люксембург" +msgid "French, Luxembourg" +msgstr "Французский, Люксембург" -#~ msgid "Gujarati, India" -#~ msgstr "Гуджаратский, Индия" +msgid "Gujarati, India" +msgstr "Гуджаратский, Индия" -#~ msgid "Hebrew, Israel" -#~ msgstr "Иврит, Израиль" +msgid "Hebrew, Israel" +msgstr "Иврит, Израиль" -#~ msgid "Hindi, India" -#~ msgstr "Хинди, Индия" +msgid "Hindi, India" +msgstr "Хинди, Индия" -#~ msgid "Croatian, Croatia" -#~ msgstr "Хорватский, Хорватия" +msgid "Croatian, Croatia" +msgstr "Хорватский, Хорватия" -#~ msgid "Hungarian, Hungary" -#~ msgstr "Венгерский, Венгрия" +msgid "Hungarian, Hungary" +msgstr "Венгерский, Венгрия" -#~ msgid "Armenian, Armenia" -#~ msgstr "Армянский, Армения" +msgid "Armenian, Armenia" +msgstr "Армянский, Армения" -#~ msgid "Indonesian, Indonesia" -#~ msgstr "Индонезийский, Индонезия" +msgid "Indonesian, Indonesia" +msgstr "Индонезийский, Индонезия" -#~ msgid "Icelandic, Iceland" -#~ msgstr "Исландский, Исландия" +msgid "Icelandic, Iceland" +msgstr "Исландский, Исландия" -#~ msgid "Italian, Switzerla" -#~ msgstr "Итальянский, Швейцария" +msgid "Italian, Switzerla" +msgstr "Итальянский, Швейцария" -#~ msgid "Italian, Italy" -#~ msgstr "Итальянский, Италия" +msgid "Italian, Italy" +msgstr "Итальянский, Италия" -#~ msgid "Japanese, Japan" -#~ msgstr "Японский, Япония" +msgid "Japanese, Japan" +msgstr "Японский, Япония" -#~ msgid "Georgian, Georgia" -#~ msgstr "Грузинский, Грузия" +msgid "Georgian, Georgia" +msgstr "Грузинский, Грузия" -#~ msgid "Kazakh, Kazakhstan" -#~ msgstr "Казахский, Казахстан" +msgid "Kazakh, Kazakhstan" +msgstr "Казахский, Казахстан" -#~ msgid "Kannada, India" -#~ msgstr "Каннада, Индия" +msgid "Kannada, India" +msgstr "Каннада, Индия" -#~ msgid "Korean, Korea" -#~ msgstr "Корейский, Корея" +msgid "Korean, Korea" +msgstr "Корейский, Корея" -#~ msgid "Kashmiri, India" -#~ msgstr "Кашмирский, Индия" +msgid "Kashmiri, India" +msgstr "Кашмирский, Индия" -#~ msgid "Kurdish, Turkey" -#~ msgstr "Курдский, Турция" +msgid "Kurdish, Turkey" +msgstr "Курдский, Турция" -#~ msgid "Kurdish (Sorani), Turkey" -#~ msgstr "Курдский (Сорани), Турция" +msgid "Kurdish (Sorani), Turkey" +msgstr "Курдский (Сорани), Турция" -#~ msgid "Kirghiz, Kyrgyzstan" -#~ msgstr "Киргизский, Кыргызстан" +msgid "Kirghiz, Kyrgyzstan" +msgstr "Киргизский, Кыргызстан" -#~ msgid "Lithuanian, Lithuania" -#~ msgstr "Литовский, Литва" +msgid "Lithuanian, Lithuania" +msgstr "Литовский, Литва" -#~ msgid "Latvian, Latvia" -#~ msgstr "Латышский, Латвия" +msgid "Latvian, Latvia" +msgstr "Латышский, Латвия" -#~ msgid "Macedonian, Macedonia" -#~ msgstr "Македонский, Северная Македония" +msgid "Macedonian, Macedonia" +msgstr "Македонский, Северная Македония" -#~ msgid "Malayalam, India" -#~ msgstr "Малаялам, Индия" +msgid "Malayalam, India" +msgstr "Малаялам, Индия" -#~ msgid "Marathi, India" -#~ msgstr "Маратхи, Индия" +msgid "Marathi, India" +msgstr "Маратхи, Индия" -#~ msgid "Malay, Malaysia" -#~ msgstr "Малайский, Малайзия" +msgid "Malay, Malaysia" +msgstr "Малайский, Малайзия" -#~ msgid "Maltese, Malta" -#~ msgstr "Мальтийский, Мальта" +msgid "Maltese, Malta" +msgstr "Мальтийский, Мальта" -#~ msgid "Bokmal, Norway" -#~ msgstr "Букмол, Норвегия" +msgid "Bokmal, Norway" +msgstr "Букмол, Норвегия" -#~ msgid "Dutch, Belgium" -#~ msgstr "Нидерландский, Бельгия" +msgid "Dutch, Belgium" +msgstr "Нидерландский, Бельгия" -#~ msgid "Dutch, Netherlands" -#~ msgstr "Нидерландский, Нидерланды" +msgid "Dutch, Netherlands" +msgstr "Нидерландский, Нидерланды" -#~ msgid "Nynorsk, Norway" -#~ msgstr "Норвежский, Норвегия" +msgid "Nynorsk, Norway" +msgstr "Норвежский, Норвегия" -#~ msgid "Oriya, India" -#~ msgstr "Ория, Индия" +msgid "Oriya, India" +msgstr "Ория, Индия" -#~ msgid "Punjabi, India" -#~ msgstr "Панджаби, Индия" +msgid "Punjabi, India" +msgstr "Панджаби, Индия" -#~ msgid "Polish, Poland" -#~ msgstr "Польский, Польша" +msgid "Polish, Poland" +msgstr "Польский, Польша" -#~ msgid "Portuguese, Brazil" -#~ msgstr "Португальский, Бразилия" +msgid "Portuguese, Brazil" +msgstr "Португальский, Бразилия" -#~ msgid "Portuguese, Portugal" -#~ msgstr "Португальский, Португалия" +msgid "Portuguese, Portugal" +msgstr "Португальский, Португалия" -#~ msgid "Romanian, Romania" -#~ msgstr "Румынский, Румыния" +msgid "Romanian, Romania" +msgstr "Румынский, Румыния" -#~ msgid "Russian, Russia" -#~ msgstr "Русский, Россия" +msgid "Russian, Russia" +msgstr "Русский, Россия" -#~ msgid "Russian, Ukraine" -#~ msgstr "Русский, Украина" +msgid "Russian, Ukraine" +msgstr "Русский, Украина" -#~ msgid "Sanskrit, India" -#~ msgstr "Санскрит, Индия" +msgid "Sanskrit, India" +msgstr "Санскрит, Индия" -#~ msgid "Slovak, Slovakia" -#~ msgstr "Словацкий, Словакия" +msgid "Slovak, Slovakia" +msgstr "Словацкий, Словакия" -#~ msgid "Slovenian, Slovenia" -#~ msgstr "Словенский, Словения" +msgid "Slovenian, Slovenia" +msgstr "Словенский, Словения" -#~ msgid "Albanian, Albania" -#~ msgstr "Албанский, Албания" +msgid "Albanian, Albania" +msgstr "Албанский, Албания" -#~ msgid "Serbian, Montenegro" -#~ msgstr "Сербский, Черногория" +msgid "Serbian, Montenegro" +msgstr "Сербский, Черногория" -#~ msgid "Serbian, Montenegro (Latin)" -#~ msgstr "Сербский, Черногория" +msgid "Serbian, Montenegro (Latin)" +msgstr "Сербский, Черногория" -#~ msgid "Serbian, Serbia" -#~ msgstr "Сербский, Сербия" +msgid "Serbian, Serbia" +msgstr "Сербский, Сербия" -#~ msgid "Serbian, Serbia (Latin)" -#~ msgstr "Сербский, Сербия" +msgid "Serbian, Serbia (Latin)" +msgstr "Сербский, Сербия" -#~ msgid "Swedish, Sweden" -#~ msgstr "Шведский, Швеция" +msgid "Swedish, Sweden" +msgstr "Шведский, Швеция" -#~ msgid "Tamil, India" -#~ msgstr "Тамильский, Индия" +msgid "Tamil, India" +msgstr "Тамильский, Индия" -#~ msgid "Telugu, India" -#~ msgstr "Тулугу, Индия" +msgid "Telugu, India" +msgstr "Тулугу, Индия" -#~ msgid "Thai, Thailand" -#~ msgstr "Тайский, Тайланд" +msgid "Thai, Thailand" +msgstr "Тайский, Тайланд" -#~ msgid "Turkish, Turkey" -#~ msgstr "Турецкий, Турция" +msgid "Turkish, Turkey" +msgstr "Турецкий, Турция" -#~ msgid "Ukrainian, Ukraine" -#~ msgstr "Украинский, Украина" +msgid "Ukrainian, Ukraine" +msgstr "Украинский, Украина" -#~ msgid "Vietnamese, Vietnam" -#~ msgstr "Вьетнамский, Вьетнам" +msgid "Vietnamese, Vietnam" +msgstr "Вьетнамский, Вьетнам" -#~ msgid "Simplified Chinese, China" -#~ msgstr "Упрощённый Китайский, Китай" +msgid "Simplified Chinese, China" +msgstr "Упрощённый Китайский, Китай" -#~ msgid "Traditional Chinese, Hong Kong SAR China" -#~ msgstr "Традиционный Китайский, Гонконг" +msgid "Traditional Chinese, Hong Kong SAR China" +msgstr "Традиционный Китайский, Гонконг" -#~ msgid "Chinese, Singapore" -#~ msgstr "Китайский, Сингапур" +msgid "Chinese, Singapore" +msgstr "Китайский, Сингапур" -#~ msgid "Traditional Chinese, Taiwan" -#~ msgstr "Традиционный Китайский, Тайвань" +msgid "Traditional Chinese, Taiwan" +msgstr "Традиционный Китайский, Тайвань" From 64944ef1a24bae05cf8a39013a7d8cd2637c199d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 16:09:41 +0600 Subject: [PATCH 3/4] Fixed domain windows closing --- source/ubl-settings-system.c | 50 +++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index c1e5fbd..b46d564 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -297,7 +297,7 @@ void on_locale_open(GtkWidget *self, main_window *widgets){ if (!config(locale_parameter)){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DefaultCheck),1); } - + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),TITLE_LABEL,main_icon,"LocalesWindow"); gtk_dialog_run(GTK_DIALOG(window->Window)); @@ -448,9 +448,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DOMAIN_CONNECTING_LABEL); gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); + gtk_widget_destroy(window->Window); + free(window); } @@ -566,9 +567,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DISCONNECTION_LABEL); gtk_window_set_title(GTK_WINDOW(dialog->Window),DISCONNECTION_LABEL); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); - gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); - gtk_widget_show(dialog->Window); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); + gtk_widget_show(dialog->Window); + gtk_widget_destroy(window->Window); + free(window); } domain_window *yon_domain_window_new(){ @@ -591,28 +593,28 @@ domain_window *yon_domain_window_new(){ void on_domain_opened(GtkWidget *self, main_window *widgets){ if (main_config.domain_connected){ - domain_window *window = yon_domain_window_new(); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),DOMAIN_CONNECTING_LABEL); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),DISCONNECTION_LABEL,"com.ublinux.ubl-settings-system","DomainWindow"); - char *domain = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); - char *password = yon_config_get_by_key(DOMAIN_ADMANGER); - char *login = yon_char_divide_search(password,":",-1); - char *dns = config(DOMAIN_DNS); - if (!yon_char_is_empty(login)) - gtk_entry_set_text(GTK_ENTRY(window->LoginEntry),login); - if (!yon_char_is_empty(password)) - gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),password); - if (!yon_char_is_empty(domain)) - gtk_entry_set_text(GTK_ENTRY(window->AdressEntry),domain); - if (!yon_char_is_empty(dns)) - gtk_entry_set_text(GTK_ENTRY(window->DNSEntry),dns); - dictionary *dict = NULL; - yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); - yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); - g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_domain_disconnect),dict); + domain_window *window = yon_domain_window_new(); + gtk_label_set_text(GTK_LABEL(window->HeadLabel),DOMAIN_CONNECTING_LABEL); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),DISCONNECTION_LABEL,"com.ublinux.ubl-settings-system","DomainWindow"); + char *domain = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); + char *password = yon_config_get_by_key(DOMAIN_ADMANGER); + char *login = yon_char_divide_search(password,":",-1); + char *dns = config(DOMAIN_DNS); + if (!yon_char_is_empty(login)) + gtk_entry_set_text(GTK_ENTRY(window->LoginEntry),login); + if (!yon_char_is_empty(password)) + gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),password); + if (!yon_char_is_empty(domain)) + gtk_entry_set_text(GTK_ENTRY(window->AdressEntry),domain); + if (!yon_char_is_empty(dns)) + gtk_entry_set_text(GTK_ENTRY(window->DNSEntry),dns); + dictionary *dict = NULL; + yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); + yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); + g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_domain_disconnect),dict); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_check_domain_connected),widgets); - gtk_widget_show(window->Window); + gtk_widget_show(window->Window); } else { connection_window *window = yon_connection_window_new(); gtk_label_set_text(GTK_LABEL(window->HeadLabel),DOMAIN_CONNECTING_LABEL); From da1c4ebd1c49799d542148d3467f00f77a235028 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 16:14:29 +0600 Subject: [PATCH 4/4] Localisation fix --- ubl-settings-system-connection.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubl-settings-system-connection.glade b/ubl-settings-system-connection.glade index 9c3576d..0e03510 100644 --- a/ubl-settings-system-connection.glade +++ b/ubl-settings-system-connection.glade @@ -1,5 +1,5 @@ - + @@ -331,7 +331,7 @@ Sssd client Winbind client Samba client - Switch client off or autometically + Switch client off or automatically