diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 9e410d3..6787caf 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -298,6 +298,11 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
gtk_widget_hide(widgets->CancelInstallButton);
gtk_widget_set_sensitive(widgets->BackButton,0);
gtk_widget_set_sensitive(widgets->NextButton,1);
+ gtk_widget_set_sensitive(widgets->BackButton,0);
+ gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL);
+ gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),CANCEL_LABEL);
+ gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.ubinstall-gtk.arrow-right-symbolic",GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.ubinstall-gtk.circle-exit-symbolic",GTK_ICON_SIZE_BUTTON);
} break;
case YON_PAGE_LICENCE:{
gtk_widget_show(widgets->CancelInstallButton);
@@ -330,8 +335,17 @@ 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_COMPLETION:
- gtk_widget_set_sensitive(widgets->NextButton,0);
+ case YON_PAGE_COMPLETION:{
+ gtk_widget_set_sensitive(widgets->BackButton,0);
+ 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);
+
+ int size=0;
+ config_str parameters = yon_config_get_all(&size);
+ main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
+ }
break;
case YON_PAGE_INSTALL_COMMON:
case YON_PAGE_INSTALL_SEPARATE:
@@ -581,7 +595,12 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
yon_config_register(autologin_parameter,autologin_parameter_command,autologin);
yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,hostname);
yon_config_register(hostname_parameter,hostname_parameter_command,root_password);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
}break;
+ case YON_PAGE_COMPLETION:
+ if (!system("reboot"))
+ return;
+ break;
}
} break;
case -1: { // Previous
@@ -637,12 +656,12 @@ void on_additional_software_toggled(){
}
-void on_near_installation_device_changed(GtkWidget *, main_window *widgets);
-void on_near_installation_device_changed(GtkWidget *, main_window *widgets){
+void on_near_installation_device_changed(GtkWidget *self, main_window *widgets);
+void on_near_installation_device_changed(GtkWidget *self, main_window *widgets){
gtk_list_store_clear(widgets->PartitionsList);
GtkTreeIter iter;
GtkTreeModel *model;
- if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->InstallationNearSysDevicesTree)),&model,&iter)){
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(self)),&model,&iter)){
char *disk_path="";
gtk_tree_model_get(model,&iter,0,&disk_path,-1);
int size;
@@ -835,6 +854,7 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->SectionsToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
+ g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(widgets->LayoutsFilter),3);
g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_locale_changed),widgets);
@@ -877,7 +897,7 @@ main_window *yon_main_window_complete(){
config_str cur = yon_char_parse(parsed[i],&cur_size,";");
if (cur_size){
gtk_list_store_append(widgets->LanguagesList,&iter);
- gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,cur[1],2,cur[0],-1);
+ gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,_(cur[1]),2,cur[0],-1);
}
yon_char_parsed_free(cur,cur_size);
}
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
old mode 100644
new mode 100755
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 0396055..f6e1f2c 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -79,4 +79,26 @@
#define PASSWORD_TITLE_LABEL _("Password input")
#define PASSWORD_MISMATCH_LABEL _("Password mismatch")
#define EMPTY_IMPORTANT_LABEL _("Empty important field")
-#define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters"))
\ No newline at end of file
+#define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters"))
+
+#define RESTART_LABEL _("Restart PC")
+#define EXIT_LABEL _("Exit")
+#define CHOOSE_LABEL _("Choose file system type for the section:")
+#define SECTION_NAME_LABEL _("Section name:")
+#define FORMAT_LABEL _("Format")
+
+#define SUCCESS_LABEL _("You have UBLinux installed on your computer.\nYou can reboot and use your new system\nor continue working in the UBLinux Live environment.")
+
+#define LANGUAGES_TITLE_LABEL _("Available languages in the system")
+#define LAYOUTS_TITLE_LABEL _("Keyboard layout language")
+#define APPLY_LABEL _("Apply")
+#define SUCCESS_HEADER_LABEL _("Success")
+#define LAYOUT_LABEL _("Layout")
+#define DESIGNATION_LABEL _("Designation")
+#define SERIAL_LABEL _("Serial")
+#define SECTION_LABEL _("Section")
+#define CAPACITY_LABEL _("Capacity")
+#define FREE_SPACE_LABEL _("Free space")
+#define FS_LABEL _("File system")
+#define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)")
+#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)")
\ No newline at end of file
diff --git a/ubinstall-gtk-keyboard.glade b/ubinstall-gtk-keyboard.glade
index 8ca0241..bbfee24 100644
--- a/ubinstall-gtk-keyboard.glade
+++ b/ubinstall-gtk-keyboard.glade
@@ -6,6 +6,7 @@
200
400
False
+ True
800
com.ublinux.libublsettingsui-gtk3
diff --git a/ubinstall-gtk-language.glade b/ubinstall-gtk-language.glade
index acec6b0..2c3886b 100644
--- a/ubinstall-gtk-language.glade
+++ b/ubinstall-gtk-language.glade
@@ -16,6 +16,7 @@
200
400
False
+ True
800
com.ublinux.ubinstall-gui
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 25c0b2f..1e97473 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -1411,7 +1411,7 @@ and help you install UBLinux on your computer
True
@@ -2176,7 +2176,6 @@ and help you install UBLinux on your computer
@@ -2185,6 +2184,43 @@ and help you install UBLinux on your computer
1
+
+
+
+ True
+ True
+ 2
+
+
+
+
+
+ True
+ True
+ 3
+
+
9
@@ -2985,6 +3021,7 @@ installed.