Fixes; initialization fixes; build fixes

source/ubinstall-gtk-components.c

@@ -283,7 +283,7 @@ void yon_software_init(main_window *widgets){
     }
     g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner);
         yon_char_parsed_free(base,base_size);
-    return NULL;
+    return ;
 }
 
 int yon_pacman_software_save(main_window *widgets){

source/ubinstall-gtk-installation.c

@@ -502,18 +502,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
         }
     }
     if (format_switch){
-        char *format = config(part_format_parameter);
-        if ((!yon_char_is_empty(format)&&!strcmp(format,"yes"))||format_switch==widgets->CommonFormatSwitch){
-            gtk_switch_set_active(GTK_SWITCH(format_switch),1);
-            if (device_label){
-                char *parameter = config(part_label_parameter);
-                if (!yon_char_is_empty(parameter)){
-                    gtk_entry_set_text(GTK_ENTRY(device_label),parameter);
-                } else {
-                    gtk_entry_set_text(GTK_ENTRY(device_label),"");
-                }
-            }
-            if (fs_type_combo){
+        if (fs_type_combo){
                 gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(fs_type_combo));
                 int size;
                 config_str fs_types = yon_resource_open_file(fs_types_path,&size);
@@ -533,6 +522,30 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
                     gtk_combo_box_set_active(GTK_COMBO_BOX(fs_type_combo),0);
                 }
             }
+
+        if (partition_encryption_combo && partition_encryption_entry){
+            int size;
+            gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(partition_encryption_combo));
+                gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(partition_encryption_combo),NULL,yon_char_get_localised_from_lib(DEFAULT_LABEL));
+            config_str encryptions = yon_char_parsed_new(&size,encryptions_list,NULL);
+            for (int i=0;i<size;i++){
+                gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(partition_encryption_combo),encryptions[i],encryptions[i]);
+            }
+            yon_char_parsed_free(encryptions,size);
+            gtk_combo_box_set_active(GTK_COMBO_BOX(partition_encryption_combo),0);
+        }
+        char *format = config(part_format_parameter);
+        if ((!yon_char_is_empty(format)&&!strcmp(format,"yes"))||format_switch==widgets->CommonFormatSwitch){
+            gtk_switch_set_active(GTK_SWITCH(format_switch),1);
+            if (device_label){
+                char *parameter = config(part_label_parameter);
+                if (!yon_char_is_empty(parameter)){
+                    gtk_entry_set_text(GTK_ENTRY(device_label),parameter);
+                } else {
+                    gtk_entry_set_text(GTK_ENTRY(device_label),"");
+                }
+            }
+            
             if (partition_size_spin&&partition_size_combo){
                 char *parameter = config(part_size_parameter);
                 if (!yon_char_is_empty(parameter)){

source/ubinstall-gtk.c

@@ -913,6 +913,7 @@ void yon_main_window_create(main_window *widgets){
         widgets->OSSysSectionTree = yon_gtk_builder_get_widget(builder,"OSSysSectionTree");
         widgets->GpartedOSButton = yon_gtk_builder_get_widget(builder,"GpartedOSButton");
         widgets->OSFormatSwitch = yon_gtk_builder_get_widget(builder,"OSFormatSwitch");
+        widgets->OSRevealer = yon_gtk_builder_get_widget(builder,"OSRevealer");
         widgets->OSFormatSizeSpin = yon_gtk_builder_get_widget(builder,"OSFormatSizeSpin");
         widgets->OSFormatSizeCombo = yon_gtk_builder_get_widget(builder,"OSFormatSizeCombo");
         widgets->OSFormatPartitionEntry = yon_gtk_builder_get_widget(builder,"OSFormatPartitionEntry");
@@ -925,6 +926,7 @@ void yon_main_window_create(main_window *widgets){
         widgets->UserdataSysSectionTree = yon_gtk_builder_get_widget(builder,"UserdataSysSectionTree");
         widgets->GpartedUserdataButton = yon_gtk_builder_get_widget(builder,"UserdataGpartedButton");
         widgets->UserdataFormatSwitch = yon_gtk_builder_get_widget(builder,"UserdataFormatSwitch");
+        widgets->UserdataRevealer = yon_gtk_builder_get_widget(builder,"UserdataRevealer");
         widgets->UserdataFormatSizeSpin = yon_gtk_builder_get_widget(builder,"UserdataFormatSizeSpin");
         widgets->UserdataFormatSizeCombo = yon_gtk_builder_get_widget(builder,"UserdataFormatSizeCombo");
         widgets->UserdataFormatPartitionEntry = yon_gtk_builder_get_widget(builder,"UserdataFormatPartitionEntry");
@@ -1124,6 +1126,8 @@ void yon_main_window_create(main_window *widgets){
 
     yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->NextInstallationFormatRevealer),GTK_SWITCH(widgets->NextInstallationFormatSwitch));
     yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->SameInstallationFormatRevealer),GTK_SWITCH(widgets->SameInstallationFormatSwitch));
+    yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->OSRevealer),GTK_SWITCH(widgets->OSFormatSwitch));
+    yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->UserdataRevealer),GTK_SWITCH(widgets->UserdataFormatSwitch));
     
     g_signal_connect(G_OBJECT(widgets->PacmanSoftwareAllCell),"toggled",G_CALLBACK(on_pacman_software_all_toggled),widgets);
     g_signal_connect(G_OBJECT(widgets->PacmanSoftwareChosenCell),"toggled",G_CALLBACK(on_pacman_software_chosen_toggled),widgets);
@@ -1196,10 +1200,12 @@ void yon_main_window_create(main_window *widgets){
         config_str parsed = NULL;
         parsed = yon_file_open(licence_path,&size);
         if (size){
+            textdomain("ublinux-init-eula");
             char *licence = yon_char_parsed_to_string(parsed,size,"");
-            gtk_label_set_text(GTK_LABEL(widgets->LicenceLabel),licence);
+            gtk_label_set_text(GTK_LABEL(widgets->LicenceLabel),_(licence));
             free(licence);
             yon_char_parsed_free(parsed,size);
+            textdomain(LocaleName);
         }
     }
     {

source/ubinstall-gtk.h

@@ -562,6 +562,7 @@ typedef struct {
 	GtkWidget *OSDevicesTree;
 	GtkWidget *OSSysSectionTree;
 	GtkWidget *OSFormatSwitch;
+	GtkWidget *OSRevealer;
 	GtkWidget *OSFormatSizeSpin;
 	GtkWidget *OSFormatSizeCombo;
 	GtkWidget *OSFormatPartitionEntry;
@@ -576,6 +577,7 @@ typedef struct {
 	GtkWidget *UserdataDevicesTree;
 	GtkWidget *UserdataSysSectionTree;
 	GtkWidget *UserdataFormatSwitch;
+	GtkWidget *UserdataRevealer;
 	GtkWidget *UserdataFormatSizeSpin;
 	GtkWidget *UserdataFormatSizeCombo;
 	GtkWidget *UserdataFormatPartitionEntry;