Added error page

source/ubinstall-gtk.c

@@ -322,7 +322,8 @@ void *on_config_save(void *data){
             fclose(file);
         char *command = save_config_command(yon_char_parsed_to_string(parameters,size," "));
         if (system(command)){
-                yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE);
+            gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALL_ERROR);
+                // yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE);
         };
         main_config.install_thread=NULL;
         main_config.install_complete=1;
@@ -437,6 +438,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
         case YON_PAGE_USERS:
             gtk_widget_set_sensitive(widgets->NextButton,1);
             break;
+        case YON_PAGE_INSTALL_ERROR:
         case YON_PAGE_COMPLETION:{
             gtk_widget_set_sensitive(widgets->BackButton,0);
             gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress));
@@ -449,10 +451,6 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
             gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
             gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
             gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.libublsettingsui-gtk3.sync-symbolic",GTK_ICON_SIZE_BUTTON);
-            // gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
-            
-                // pthread_t tid;
-                // pthread_create(&tid,NULL,on_config_save,widgets);
             }
             break;
         case YON_PAGE_INSTALL_COMMON:

source/ubinstall-gtk.h

@@ -150,7 +150,9 @@ enum YON_PAGES {
 	YON_PAGE_COMPLETED,
 	YON_PAGE_INSTALL_COMMON,
 	YON_PAGE_INSTALL_SEPARATE,
-	YON_PAGE_INSTALL_SAME_PARTITION
+	YON_PAGE_INSTALL_SAME_PARTITION,
+	YON_PAGE_INSTALL_OPTIONS,
+	YON_PAGE_INSTALL_ERROR
 };
 
 typedef struct { 

source/ubl-strings.h

@@ -115,4 +115,6 @@
 #define DOCUMENTATION_CHECK_LABEL _("Always redirect to online documentation")
 #define OPEN_DOCUMENTATION_LABEL _("Open documentation")
 
-#define INSTALLATION_ERROR _("Installation error")
+#define INSTALLATION_ERROR_LABEL _("Installation error")
+#define ERROR_TOPIC_LABEL _("Error")
+#define ERROR_LABEL _("Error has occured during installation process.")

ubinstall-gtk.pot

@@ -462,6 +462,18 @@ msgstr ""
 msgid "Open documentation"
 msgstr ""
 
+#: source/ubl-strings.h:102
+msgid "Installation error"
+msgstr ""
+
+#: source/ubl-strings.h:102
+msgid "Error"
+msgstr ""
+
+#: source/ubl-strings.h:102
+msgid "Error has occured during installation process."
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -2675,18 +2687,12 @@ msgstr ""
 msgid "Uzbek (Afghanistan)"
 msgstr ""
 
-msgid "Albanian"
-msgstr ""
-
 msgid "Albanian (Plisi)"
 msgstr ""
 
 msgid "Albanian (Veqilharxhi)"
 msgstr ""
 
-msgid "Armenian"
-msgstr ""
-
 msgid "Armenian (alt. eastern)"
 msgstr ""
 
@@ -2726,9 +2732,6 @@ msgstr ""
 msgid "APL symbols (unified)"
 msgstr ""
 
-msgid "Arabic"
-msgstr ""
-
 msgid "Arabic (AZERTY)"
 msgstr ""
 
@@ -2780,15 +2783,9 @@ msgstr ""
 msgid "English (Australian)"
 msgstr ""
 
-msgid "Azerbaijani"
-msgstr ""
-
 msgid "Azerbaijani (Cyrillic)"
 msgstr ""
 
-msgid "Bosnian"
-msgstr ""
-
 msgid "Bosnian (with guillemets)"
 msgstr ""
 
@@ -2828,9 +2825,6 @@ msgstr ""
 msgid "Belgian (Wang 724 AZERTY)"
 msgstr ""
 
-msgid "Bulgarian"
-msgstr ""
-
 msgid "Bulgarian (new phonetic)"
 msgstr ""
 
@@ -2885,9 +2879,6 @@ msgstr ""
 msgid "Tswana"
 msgstr ""
 
-msgid "Belarusian"
-msgstr ""
-
 msgid "Belarusian (intl.)"
 msgstr ""
 
@@ -2981,9 +2972,6 @@ msgstr ""
 msgid "Cameroon Multilingual (QWERTY, intl.)"
 msgstr ""
 
-msgid "Chinese"
-msgstr ""
-
 msgid "Hanyu Pinyin Letters (with AltGr dead keys)"
 msgstr ""
 
@@ -3020,10 +3008,7 @@ msgstr ""
 msgid "A user-defined custom Layout"
 msgstr ""
 
-msgid "Czech"
+msgid "Czech (with <\\"
-msgstr ""
-
-msgid "Czech (with <\"
 msgstr ""
 
 msgid "Czech (coder)"
@@ -3059,9 +3044,6 @@ msgstr ""
 msgid "Czech (UCW, only accented letters)"
 msgstr ""
 
-msgid "German"
-msgstr ""
-
 msgid "German (Aus der Neo-Welt)"
 msgstr ""
 
@@ -3155,9 +3137,6 @@ msgstr ""
 msgid "German (US)"
 msgstr ""
 
-msgid "Danish"
-msgstr ""
-
 msgid "Danish (Dvorak)"
 msgstr ""
 
@@ -3194,9 +3173,6 @@ msgstr ""
 msgid "Kabyle (QWERTY, US, with dead keys)"
 msgstr ""
 
-msgid "Estonian"
-msgstr ""
-
 msgid "Estonian (Dvorak)"
 msgstr ""
 
@@ -3218,9 +3194,6 @@ msgstr ""
 msgid "Esperanto (legacy)"
 msgstr ""
 
-msgid "Spanish"
-msgstr ""
-
 msgid "Asturian (Spain, with bottom-dot H and L)"
 msgstr ""
 
@@ -3251,9 +3224,6 @@ msgstr ""
 msgid "EurKEY (US)"
 msgstr ""
 
-msgid "Finnish"
-msgstr ""
-
 msgid "Finnish (classic)"
 msgstr ""
 
@@ -3284,9 +3254,6 @@ msgstr ""
 msgid "Faroese (no dead keys)"
 msgstr ""
 
-msgid "French"
-msgstr ""
-
 msgid "French (AZERTY, AFNOR)"
 msgstr ""
 
@@ -3383,9 +3350,6 @@ msgstr ""
 msgid "English (UK, Sun Type 6/7)"
 msgstr ""
 
-msgid "Georgian"
-msgstr ""
-
 msgid "Georgian (ergonomic)"
 msgstr ""
 
@@ -3428,9 +3392,6 @@ msgstr ""
 msgid "N'Ko (AZERTY)"
 msgstr ""
 
-msgid "Greek"
-msgstr ""
-
 msgid "Greek (Colemak)"
 msgstr ""
 
@@ -3449,9 +3410,6 @@ msgstr ""
 msgid "Greek (Sun Type 6/7)"
 msgstr ""
 
-msgid "Croatian"
-msgstr ""
-
 msgid "Croatian (with guillemets)"
 msgstr ""
 
@@ -3464,9 +3422,6 @@ msgstr ""
 msgid "Croatian (US)"
 msgstr ""
 
-msgid "Hungarian"
-msgstr ""
-
 msgid "Hungarian (QWERTY, 101-key, comma, dead keys)"
 msgstr ""
 
@@ -3554,9 +3509,6 @@ msgstr ""
 msgid "Irish (UnicodeExpert)"
 msgstr ""
 
-msgid "Hebrew"
-msgstr ""
-
 msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
@@ -3569,9 +3521,6 @@ msgstr ""
 msgid "Hebrew (phonetic)"
 msgstr ""
 
-msgid "Indian"
-msgstr ""
-
 msgid "Bangla (India, Baishakhi)"
 msgstr ""
 
@@ -3599,9 +3548,6 @@ msgstr ""
 msgid "English (India, with rupee)"
 msgstr ""
 
-msgid "Gujarati"
-msgstr ""
-
 msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
@@ -3620,18 +3566,12 @@ msgstr ""
 msgid "Kannada (KaGaPa, phonetic)"
 msgstr ""
 
-msgid "Kannada"
-msgstr ""
-
 msgid "Malayalam (enhanced InScript, with rupee)"
 msgstr ""
 
 msgid "Malayalam (Lalitha)"
 msgstr ""
 
-msgid "Malayalam"
-msgstr ""
-
 msgid "Marathi (enhanced InScript)"
 msgstr ""
 
@@ -3647,9 +3587,6 @@ msgstr ""
 msgid "Oriya (Bolnagri)"
 msgstr ""
 
-msgid "Oriya"
-msgstr ""
-
 msgid "Oriya (Wx)"
 msgstr ""
 
@@ -3680,9 +3617,6 @@ msgstr ""
 msgid "Telugu (Sarala)"
 msgstr ""
 
-msgid "Telugu"
-msgstr ""
-
 msgid "Urdu (Navees)"
 msgstr ""
 
@@ -3731,9 +3665,6 @@ msgstr ""
 msgid "Persian (with Persian keypad)"
 msgstr ""
 
-msgid "Icelandic"
-msgstr ""
-
 msgid "Icelandic (Dvorak)"
 msgstr ""
 
@@ -3743,9 +3674,6 @@ msgstr ""
 msgid "Icelandic (Macintosh, legacy)"
 msgstr ""
 
-msgid "Italian"
-msgstr ""
-
 msgid "Italian (Dvorak)"
 msgstr ""
 
@@ -3782,9 +3710,6 @@ msgstr ""
 msgid "Italian (Windows)"
 msgstr ""
 
-msgid "Japanese"
-msgstr ""
-
 msgid "Japanese (Dvorak)"
 msgstr ""
 
@@ -3827,18 +3752,12 @@ msgstr ""
 msgid "Khmer (Cambodia)"
 msgstr ""
 
-msgid "Korean"
-msgstr ""
-
 msgid "Korean (101/104-key compatible)"
 msgstr ""
 
 msgid "Korean (Sun Type 6/7)"
 msgstr ""
 
-msgid "Kazakh"
-msgstr ""
-
 msgid "Kazakh (extended)"
 msgstr ""
 
@@ -3887,9 +3806,6 @@ msgstr ""
 msgid "Sinhala (US)"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr ""
-
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr ""
 
@@ -3917,9 +3833,6 @@ msgstr ""
 msgid "Lithuanian (US)"
 msgstr ""
 
-msgid "Latvian"
-msgstr ""
-
 msgid "Latvian (adapted)"
 msgstr ""
 
@@ -4028,9 +3941,6 @@ msgstr ""
 msgid "Montenegrin (Latin, QWERTY)"
 msgstr ""
 
-msgid "Macedonian"
-msgstr ""
-
 msgid "Macedonian (no dead keys)"
 msgstr ""
 
@@ -4067,9 +3977,6 @@ msgstr ""
 msgid "Mongolian"
 msgstr ""
 
-msgid "Maltese"
-msgstr ""
-
 msgid "Maltese (UK, with AltGr overrides)"
 msgstr ""
 
@@ -4100,9 +4007,6 @@ msgstr ""
 msgid "Yoruba"
 msgstr ""
 
-msgid "Dutch"
-msgstr ""
-
 msgid "Dutch (Macintosh)"
 msgstr ""
 
@@ -4196,9 +4100,6 @@ msgstr ""
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-msgid "Polish"
-msgstr ""
-
 msgid "Polish (Colemak-DH)"
 msgstr ""
 
@@ -4244,9 +4145,6 @@ msgstr ""
 msgid "Silesian"
 msgstr ""
 
-msgid "Portuguese"
-msgstr ""
-
 msgid "Portuguese (Colemak)"
 msgstr ""
 
@@ -4271,9 +4169,6 @@ msgstr ""
 msgid "Portuguese (Sun Type 6/7)"
 msgstr ""
 
-msgid "Romanian"
-msgstr ""
-
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
@@ -4289,9 +4184,6 @@ msgstr ""
 msgid "Romanian (Windows)"
 msgstr ""
 
-msgid "Serbian"
-msgstr ""
-
 msgid "Serbian (Cyrillic, with guillemets)"
 msgstr ""
 
@@ -4319,9 +4211,6 @@ msgstr ""
 msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
 msgstr ""
 
-msgid "Russian"
-msgstr ""
-
 msgid "Bashkirian"
 msgstr ""
 
@@ -4418,9 +4307,6 @@ msgstr ""
 msgid "Kalmyk"
 msgstr ""
 
-msgid "Swedish"
-msgstr ""
-
 msgid "Swedish (Dvorak A5)"
 msgstr ""
 
@@ -4460,18 +4346,12 @@ msgstr ""
 msgid "Swedish (US)"
 msgstr ""
 
-msgid "Slovenian"
-msgstr ""
-
 msgid "Slovenian (with guillemets)"
 msgstr ""
 
 msgid "Slovenian (US)"
 msgstr ""
 
-msgid "Slovak"
-msgstr ""
-
 msgid "Slovak (ACC layout, only accented letters)"
 msgstr ""
 
@@ -4511,9 +4391,6 @@ msgstr ""
 msgid "French (Togo)"
 msgstr ""
 
-msgid "Thai"
-msgstr ""
-
 msgid "Thai (Pattachote)"
 msgstr ""
 
@@ -4538,9 +4415,6 @@ msgstr ""
 msgid "International Phonetic Alphabet (QWERTY)"
 msgstr ""
 
-msgid "Turkish"
-msgstr ""
-
 msgid "Turkish (Alt-Q)"
 msgstr ""
 
@@ -4589,9 +4463,6 @@ msgstr ""
 msgid "Swahili (Tanzania)"
 msgstr ""
 
-msgid "Ukrainian"
-msgstr ""
-
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
@@ -4775,9 +4646,6 @@ msgstr ""
 msgid "Uzbek (Latin)"
 msgstr ""
 
-msgid "Vietnamese"
-msgstr ""
-
 msgid "Vietnamese (AÐERTY)"
 msgstr ""
 

ubinstall-gtk_ru.po

@@ -468,8 +468,13 @@ msgid "Would you like to read documentation in the Web?"
 msgstr "Вы хотите прочитать документацию в Сети?"
 
 #: source/ubl-strings.h:102
-msgid "You will be redirected to documentation website where documentation is\ntranslated and supported by community."
+msgid ""
-msgstr "Вы будете перенаправлены на сайт с документацией, где документация переводится\nи поддерживается сообществом"
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
+msgstr ""
+"Вы будете перенаправлены на сайт с документацией, где документация "
+"переводится\n"
+"и поддерживается сообществом"
 
 #: source/ubl-strings.h:102
 msgid "Always redirect to online documentation"
@@ -479,6 +484,18 @@ msgstr "Всегда перенаправлять"
 msgid "Open documentation"
 msgstr "Открыть документацию"
 
+#: source/ubl-strings.h:102
+msgid "Installation error"
+msgstr "Ошибка установки"
+
+#: source/ubl-strings.h:102
+msgid "Error"
+msgstr "Ошибка"
+
+#: source/ubl-strings.h:102
+msgid "Error has occured during installation process."
+msgstr "Во время процесса установки произошла ошибка."
+
 msgid "Afrikaans"
 msgstr "Африканский"
 
@@ -3025,7 +3042,7 @@ msgstr "Уйгурский"
 msgid "A user-defined custom Layout"
 msgstr "Пользовательский макет"
 
-msgid "Czech (with <\""
+msgid "Czech (with <\\"
 msgstr "Чешский (с <\")"
 
 msgid "Czech (coder)"
@@ -4450,6 +4467,15 @@ msgstr "Курдский (Турция, F)"
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Курдский (Турция, латиница Q)"
 
+msgid "Ottoman (F)"
+msgstr "Османская (F)"
+
+msgid "Old Turkic (F)"
+msgstr "Старый тюркский (F)"
+
+msgid "Old Turkic"
+msgstr "Старый тюркский"
+
 msgid "Ottoman (Q)"
 msgstr "Османская (Q)"
 
@@ -4541,13 +4567,16 @@ msgid "English (Carpalx)"
 msgstr "Английский (Carpalx)"
 
 msgid "English (Carpalx, full optimization, intl., with AltGr dead keys)"
-msgstr "Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами AltGr)"
+msgstr ""
+"Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами "
+"AltGr)"
 
 msgid "English (Carpalx, full optimization)"
 msgstr "Английский (Carpalx, полная оптимизация)"
 
 msgid "English (Carpalx, full optimization, intl., with dead keys)"
-msgstr "Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами)"
+msgstr ""
+"Английский (Carpalx, полная оптимизация, международный, с мёртвыми клавишами)"
 
 msgid "English (Carpalx, intl., with dead keys)"
 msgstr "Английский (Carpalx, международный, с мёртвыми клавишами)"
@@ -4571,7 +4600,8 @@ msgid "Czech Slovak and German (US)"
 msgstr "Чешский, словацкий и немецкий (США)"
 
 msgid "Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US)"
-msgstr "Чешский, словацкий, польский, испанский, финский, шведский и немецкий (США)"
+msgstr ""
+"Чешский, словацкий, польский, испанский, финский, шведский и немецкий (США)"
 
 msgid "German, Swedish and Finnish (US)"
 msgstr "Немецкий, шведский и финский (США)"