diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index f7df02d..2271d1b 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -272,6 +272,10 @@ msgstr "" msgid "No device were chosen" msgstr "" +#: source/ubl-strings.h:71 +msgid "No partition were chosen" +msgstr "" + #: source/ubl-strings.h:73 msgid "Installation parameters" msgstr "" @@ -1166,7 +1170,7 @@ msgid "Source" msgstr "" #: source/ubl-strings.h:331 -msgid "Skip installation" +msgid "Skip configuration" msgstr "" #: source/ubl-strings.h:331 diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index ce95a19..033d640 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -284,6 +284,10 @@ msgstr "Доступные языки в системе" msgid "No device were chosen" msgstr "Устройство не выбрано" +#: source/ubl-strings.h:71 +msgid "No partition were chosen" +msgstr "Раздел не выбран" + #: source/ubl-strings.h:73 msgid "Installation parameters" msgstr "Параметры установки" @@ -1205,8 +1209,8 @@ msgid "Source" msgstr "Источник" #: source/ubl-strings.h:331 -msgid "Skip installation" -msgstr "Пропустить установку" +msgid "Skip configuration" +msgstr "Пропустить настройку" msgid "" "Attention! The system will be installed in the selected partition. " diff --git a/source/ubinstall-gtk-grub.c b/source/ubinstall-gtk-grub.c index 749f496..4b70364 100644 --- a/source/ubinstall-gtk-grub.c +++ b/source/ubinstall-gtk-grub.c @@ -11,7 +11,7 @@ int yon_grub_install_save(main_window *widgets){ char *cur_device; gtk_tree_model_get(model,&iter,0,&cur_device,-1); if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GrubInstallPartitionTree)),&model,&iter)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_PART_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->GrubInstallPartitionTree)); return 0; } @@ -45,7 +45,7 @@ int yon_grub_update_save(main_window *widgets){ char *cur_device; gtk_tree_model_get(model,&iter,0,&cur_device,-1); if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GrubUpdatePartitionTree)),&model,&iter)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_PART_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->GrubUpdatePartitionTree)); return 0; } diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index 15a1863..a4b4390 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -54,7 +54,7 @@ int yon_install_separate_save(main_window *widgets){ char *device; gtk_tree_model_get(model,&iter,0,&device,-1); if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->NextInstallationSysSectionTree)),&model,&iter)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_PART_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->CommonInstallationDevicesTree)); return 0; } @@ -124,7 +124,7 @@ int yon_install_same_partition_save(main_window *widgets){ char *device; gtk_tree_model_get(model,&iter,0,&device,-1); if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SamePlacePartTree)),&model,&iter)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_PART_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->CommonInstallationDevicesTree)); return 0; } diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index 2ca7d6e..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); } @@ -211,6 +211,7 @@ void on_language_clicked(GtkWidget *, 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->SaveButton),"clicked",G_CALLBACK(on_language_window_accept),dict); + gtk_tree_view_column_clicked(gtk_tree_view_get_column(GTK_TREE_VIEW(window->LanguagesTree),0)); gtk_widget_show(window->MainWindow); } diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 65def82..ef05a46 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -430,14 +430,16 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); yon_page_update(widgets); - dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); - data->action_text=INTERRUPT_TEXT_LABEL; - data->title=WARNING_TITLE_LABEL; - if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){ - if (main_config.install_thread){ - gtk_widget_hide(gtk_widget_get_parent(widgets->InstallationProgress)); - gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); - pthread_cancel((pthread_t)main_config.install_thread); + if (main_config.install_thread){ + dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); + data->action_text=INTERRUPT_TEXT_LABEL; + data->title=WARNING_TITLE_LABEL; + if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){ + if (main_config.install_thread){ + gtk_widget_hide(gtk_widget_get_parent(widgets->InstallationProgress)); + gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); + pthread_cancel((pthread_t)main_config.install_thread); + } } } } diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index 9732ec9..e8ff73c 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -77,16 +77,16 @@ void yon_region_init(main_window *widgets){ GtkTreeIter iter; gtk_list_store_clear(widgets->LanguagesList); - parsed = yon_file_open(languages_path,&size); + + yon_locale_init(); + + 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,_(cur[1]),2,cur[0],-1); - } - yon_char_parsed_free(cur,cur_size); + gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,parsed[0],2,parsed[1],3,parsed[2],-1); } yon_char_parsed_free(parsed,size); if (lang) diff --git a/source/ubinstall-gtk-separate.c b/source/ubinstall-gtk-separate.c index 5403d94..1fc8930 100644 --- a/source/ubinstall-gtk-separate.c +++ b/source/ubinstall-gtk-separate.c @@ -9,7 +9,7 @@ int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char * return 0; } if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(part_tree)),&model2,&itar)){ - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_PART_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(part_tree)); return 0; } 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,7 +75,9 @@ True True liststore1 - False + 1 + both + True @@ -89,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..e20465b 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1,5 +1,5 @@ - + @@ -108,11 +108,13 @@ - + - + - + + + @@ -10672,7 +10674,7 @@ separately into the selected partition. - Skip installation + Skip configuration True True image28