From cb340c80a61395c5fde4bcf40b20994f30ac48ae Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 12 Sep 2025 10:29:58 +0600
Subject: [PATCH] Changed filesystem type combo boxes filling

---
 filesystems-format-list.csv         | 10 ++++++
 gresource.xml                       |  1 +
 source/CMakeLists.txt               |  1 +
 source/ubinstall-gtk-installation.c | 12 +++++++
 source/ubinstall-gtk.h              |  1 +
 ubinstall-gtk.glade                 | 56 -----------------------------
 6 files changed, 25 insertions(+), 56 deletions(-)
 create mode 100644 filesystems-format-list.csv

diff --git a/filesystems-format-list.csv b/filesystems-format-list.csv
new file mode 100644
index 0000000..e1e5271
--- /dev/null
+++ b/filesystems-format-list.csv
@@ -0,0 +1,10 @@
+STATUS;NAME
+1;ext4
+1;ext3
+1;exfat
+1;fat32
+1;fat16
+1;riserfs
+0;udf
+0;xfs
+1;zfs
\ No newline at end of file
diff --git a/gresource.xml b/gresource.xml
index c7a8641..8cfa3cf 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -56,5 +56,6 @@
     <file>kernel-list-addon.csv</file>
     <file>services-list.csv</file>
     <file>network-list.csv</file>
+    <file>filesystems-format-list.csv</file>
   </gresource>
 </gresources>
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 1e9ccda..3174321 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -78,6 +78,7 @@ set(DEPENDFILES
                 ../kernel-list-addon.csv
                 ../services-list.csv
                 ../network-list.csv
+                ../filesystems-format-list.csv
                 ../icons-builtin/install_type_custom_normal.png
                 ../icons-builtin/install_type_data_only_normal.png
                 ../icons-builtin/install_type_fast_normal.png
diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c
index 5c5f8f1..817e6d9 100644
--- a/source/ubinstall-gtk-installation.c
+++ b/source/ubinstall-gtk-installation.c
@@ -487,6 +487,18 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
                 }
             }
             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);
+                for (int i=0;i<size;i++){
+                    int parsed_size;
+                    config_str parsed = yon_char_parse(fs_types[i],&parsed_size,";");
+                    if (atoi(parsed[0])){
+                        gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(fs_type_combo),parsed[1],parsed[1]);
+                    }
+                    yon_char_parsed_free(parsed,parsed_size);
+                }
+                    yon_char_parsed_free(fs_types,size);
                 char *parameter = config(part_fs_type_parameter);
                 if (!yon_char_is_empty(parameter)){
                     gtk_combo_box_set_active_id(GTK_COMBO_BOX(fs_type_combo),parameter);
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 2838141..9185204 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -69,6 +69,7 @@
 #define kernel_list_addon_path "resource:///com/ublinux/csv/kernel-list-addon.csv"
 #define services_list_path "resource:///com/ublinux/csv/services-list.csv"
 #define network_path "resource:///com/ublinux/csv/network-list.csv"
+#define fs_types_path "resource:///com/ublinux/csv/filesystems-format-list.csv"
 
 #define slide_0_path "/com/ublinux/images/slide-0.png"
 
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 539ca0f..99b1152 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -759,7 +759,6 @@ agreement</property>
                     <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
                     <property name="tab-pos">left</property>
-                    <property name="show-tabs">False</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
@@ -5240,17 +5239,6 @@ or continue working in the UBLinux Live environment.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
-                                                            <items>
-                                                            <item id="ext3" translatable="yes">ext3</item>
-                                                            <item id="ext4" translatable="yes">ext4</item>
-                                                            <item id="fat16" translatable="yes">fat16</item>
-                                                            <item id="fat32" translatable="yes">fat32</item>
-                                                            <item id="exfat" translatable="yes">exfat</item>
-                                                            <item id="riserfs" translatable="yes">riserfs</item>
-                                                            <item id="udf" translatable="yes">udf</item>
-                                                            <item id="xfs" translatable="yes">xfs</item>
-                                                            <item id="zfs" translatable="yes">zfs</item>
-                                                            </items>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -5917,17 +5905,6 @@ or continue working in the UBLinux Live environment.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
-                                                            <items>
-                                                            <item id="ext3" translatable="yes">ext3</item>
-                                                            <item id="ext4" translatable="yes">ext4</item>
-                                                            <item id="fat16" translatable="yes">fat16</item>
-                                                            <item id="fat32" translatable="yes">fat32</item>
-                                                            <item id="exfat" translatable="yes">exfat</item>
-                                                            <item id="riserfs" translatable="yes">riserfs</item>
-                                                            <item id="udf" translatable="yes">udf</item>
-                                                            <item id="xfs" translatable="yes">xfs</item>
-                                                            <item id="zfs" translatable="yes">zfs</item>
-                                                            </items>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -6553,17 +6530,6 @@ or continue working in the UBLinux Live environment.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
-                                                            <items>
-                                                            <item id="ext3" translatable="yes">ext3</item>
-                                                            <item id="ext4" translatable="yes">ext4</item>
-                                                            <item id="fat16" translatable="yes">fat16</item>
-                                                            <item id="fat32" translatable="yes">fat32</item>
-                                                            <item id="exfat" translatable="yes">exfat</item>
-                                                            <item id="riserfs" translatable="yes">riserfs</item>
-                                                            <item id="udf" translatable="yes">udf</item>
-                                                            <item id="xfs" translatable="yes">xfs</item>
-                                                            <item id="zfs" translatable="yes">zfs</item>
-                                                            </items>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -9437,17 +9403,6 @@ separately into the selected partition.</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
-                                                            <items>
-                                                            <item id="ext3" translatable="yes">ext3</item>
-                                                            <item id="ext4" translatable="yes">ext4</item>
-                                                            <item id="fat16" translatable="yes">fat16</item>
-                                                            <item id="fat32" translatable="yes">fat32</item>
-                                                            <item id="exfat" translatable="yes">exfat</item>
-                                                            <item id="riserfs" translatable="yes">riserfs</item>
-                                                            <item id="udf" translatable="yes">udf</item>
-                                                            <item id="xfs" translatable="yes">xfs</item>
-                                                            <item id="zfs" translatable="yes">zfs</item>
-                                                            </items>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -10167,17 +10122,6 @@ separately into the selected partition.</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="active">1</property>
-                                                            <items>
-                                                            <item id="ext3" translatable="yes">ext3</item>
-                                                            <item id="ext4" translatable="yes">ext4</item>
-                                                            <item id="fat16" translatable="yes">fat16</item>
-                                                            <item id="fat32" translatable="yes">fat32</item>
-                                                            <item id="exfat" translatable="yes">exfat</item>
-                                                            <item id="riserfs" translatable="yes">riserfs</item>
-                                                            <item id="udf" translatable="yes">udf</item>
-                                                            <item id="xfs" translatable="yes">xfs</item>
-                                                            <item id="zfs" translatable="yes">zfs</item>
-                                                            </items>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>