diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index 01c4ff9..fb9508a 100644 --- a/source/ubinstall-gtk-keyboard.c +++ b/source/ubinstall-gtk-keyboard.c @@ -114,7 +114,7 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){ char *final = ""; for_iter(widgets->LanguagesList,&iter){ char *code, *labl; - gtk_tree_model_get(GTK_TREE_MODEL(widgets->LanguagesList),&iter,1,&labl,2,&code,-1); + gtk_tree_model_get(GTK_TREE_MODEL(widgets->LanguagesList),&iter,1,&code,2,&labl,-1); if (yon_char_parsed_check_exist(lang_parsed,size,code)!=-1){ gtk_list_store_set(widgets->LanguagesList,&iter,0,1,-1); char *tmp = yon_char_unite(final,!yon_char_is_empty(final)?";":"",labl,NULL); @@ -137,7 +137,7 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){ for_iter(GTK_TREE_MODEL(window->liststore1),&iter){ char *current; int status; - gtk_tree_model_get(GTK_TREE_MODEL(window->liststore1),&iter,0,&status,1,¤t,-1); + gtk_tree_model_get(GTK_TREE_MODEL(window->liststore1),&iter,0,&status,2,¤t,-1); if (status) yon_char_parsed_add_or_create_if_exists(parsed,&size,current); } diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index 9a467d8..e8ff73c 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -80,24 +80,14 @@ void yon_region_init(main_window *widgets){ yon_locale_init(); - parsed = yon_locale_get_all_codes(&size); - textdomain(LOCALES_DOMAIN_NAME); + config_str languages = yon_config_load(languages_command,&size); + for (int i=0;iLanguagesList,&iter); - gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,full_name,2,parsed[i],-1); - } + gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,parsed[0],2,parsed[1],3,parsed[2],-1); } - textdomain(LocaleName); yon_char_parsed_free(parsed,size); if (lang) yon_char_parsed_free(lang,langsize); diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index fd64d2c..ef027ca 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -554,6 +554,18 @@ void config_init(){ main_config.force_ini=NULL; main_config.network_types = g_hash_table_new(g_str_hash,g_str_equal); main_config.cur_slide=0; + + main_config.languages = g_hash_table_new(g_str_hash,g_str_equal); + int size; + config_str languages = yon_config_load(languages_command,&size); + for (int i=0;i - + - + - + + + @@ -73,16 +75,14 @@ True True liststore1 - False 1 - 1 + both + True - True - 1 @@ -93,14 +93,51 @@ + Locale - + + word + 150 + 1 + + + autosize + 35 + Language + True + + + word + 100 + + + 2 + + + + + + + autosize + Territory + True + + + word + 125 + + + 3 + + + + diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index e27fb4e..72a6f9d 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1,5 +1,5 @@ - + @@ -108,11 +108,13 @@ - + - + - + + +