WIP advanced install

source/ubinstall-gtk-advanced.c

@@ -1,5 +1,8 @@
 #include "ubinstall-gtk.h"
 
+#define toggled_icon_name "com.ublinux.libublsettingsui-gtk3.toggled-symbolic"
+#define untoggled_icon_name "com.ublinux.libublsettingsui-gtk3.untoggled-symbolic"
+
 advanced_section *yon_advanced_section_new();
 void yon_advanced_section_remove();
 
@@ -84,6 +87,18 @@ void yon_advanced_update(main_window *widgets){
     for (int i=0;i<sections_size;i++){
         advanced_partition *part = yon_advanced_partition_new();
         g_signal_connect(G_OBJECT(part->RemoveButton),"clicked",G_CALLBACK(on_advanced_part_remove),widgets);
+        g_signal_connect(G_OBJECT(part->SystemSectionToggle),"clicked",G_CALLBACK(on_advanced_section_toggled),widgets);
+        g_signal_connect(G_OBJECT(part->UserDataSectionToggle),"clicked",G_CALLBACK(on_advanced_section_toggled),widgets);
+        if (i==0){
+            gtk_widget_set_sensitive(part->SystemSectionToggle,0);
+            gtk_widget_set_sensitive(part->UserDataSectionToggle,0);
+            GtkWidget *SystemImage = gtk_button_get_image(GTK_BUTTON(part->SystemSectionToggle));
+            GtkWidget *UserImage = gtk_button_get_image(GTK_BUTTON(part->UserDataSectionToggle));
+            gtk_image_set_from_icon_name(GTK_IMAGE(SystemImage),toggled_icon_name,GTK_ICON_SIZE_BUTTON);
+            gtk_image_set_from_icon_name(GTK_IMAGE(UserImage),toggled_icon_name,GTK_ICON_SIZE_BUTTON);
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(part->SystemSectionToggle),1);
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(part->UserDataSectionToggle),1);
+        }
         yon_advanced_partition_set_from_section(part,sections[i]);
         gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0);
 
@@ -98,19 +113,39 @@ void yon_advanced_update(main_window *widgets){
 }
 
 void on_advanced_partition_create(GtkWidget *, main_window *widgets){
-    GtkTreeIter iter, *last_found;
+    GtkTreeIter iter, *last_unvalid = NULL;
+    int found = 0;
     for_iter(GTK_TREE_MODEL(widgets->DevicesList),&iter){
         char *target;
         int active;
         gtk_tree_model_get(GTK_TREE_MODEL(widgets->DevicesList),&iter,0,&target,5,&active,-1);
         if (active){
+            if (!yon_advanced_section_get(target)){
+                last_unvalid = gtk_tree_iter_copy(&iter);
+            } else {
+                found=1;
                 if (sections_size==2) break;
                 advanced_section *section = yon_advanced_section_new();
+                section->part_source = PART_SOURCE_DEVICE;
                 section->partition = target;
                 sections[sections_size]=section;
                 sections_size++;
+                break;
             }
         }
+    }
+    if (!found&&last_unvalid){
+        char *target;
+        int active;
+        gtk_tree_model_get(GTK_TREE_MODEL(widgets->DevicesList),last_unvalid,0,&target,5,&active,-1);
+
+                if (sections_size==2) return;
+                advanced_section *section = yon_advanced_section_new();
+                section->part_source = PART_SOURCE_DEVICE;
+                section->partition = target;
+                sections[sections_size]=section;
+                sections_size++;
+    }
     yon_advanced_update(widgets);
 }
 
@@ -124,6 +159,7 @@ void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets){
         if (!status){
             if (sections_size==2) return;
             advanced_section *section = yon_advanced_section_new();
+            section->part_source = PART_SOURCE_PART;
             sections[sections_size]=section;
             sections_size++;
         } else {
@@ -135,6 +171,7 @@ void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets){
 }
 
 void yon_install_advanced_init(main_window *){
+    
 }
 
 void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_window *widgets){
@@ -153,8 +190,8 @@ void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_wi
         if (chosen<2){
             gtk_list_store_set(widgets->PartitionsList,&iter,7,!status,-1);
             chosen++;
-            
             advanced_section *section = yon_advanced_section_new();
+            section->part_source = PART_SOURCE_PART;
             section->partition = target_part;
             sections[sections_size]=section;
             sections_size++;
@@ -279,6 +316,28 @@ int yon_advanced_get_part_size(main_window *widgets){
     return size;
 }
 
+void on_advanced_section_toggled(GtkWidget *self, main_window *widgets){
+    advanced_partition *part = g_object_get_data(G_OBJECT(self),"advanced_partition");
+    gtk_widget_set_sensitive(self,0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self),1);
+    GtkWidget *image = gtk_button_get_image(GTK_BUTTON(self));
+    gtk_image_set_from_icon_name(GTK_IMAGE(image),toggled_icon_name,GTK_ICON_SIZE_BUTTON);
+    GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
+    GList *iter;
+    for (iter=list;iter;iter=iter->next){
+        advanced_partition *compare_part = g_object_get_data(G_OBJECT(iter->data),"advanced_partition");
+        if (part != compare_part) {
+            GtkWidget *cur_toggle = self == part->SystemSectionToggle?compare_part->SystemSectionToggle:compare_part->UserDataSectionToggle;
+            g_signal_handlers_block_by_func(G_OBJECT(cur_toggle),G_CALLBACK(on_advanced_section_toggled),widgets);
+            gtk_widget_set_sensitive(cur_toggle,1);
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cur_toggle),0);
+            g_signal_handlers_unblock_by_func(G_OBJECT(cur_toggle),G_CALLBACK(on_advanced_section_toggled),widgets);
+            GtkWidget *compare_image = gtk_button_get_image(GTK_BUTTON(cur_toggle));
+            gtk_image_set_from_icon_name(GTK_IMAGE(compare_image),untoggled_icon_name,GTK_ICON_SIZE_BUTTON);
+        }
+    }
+}
+
 advanced_partition *yon_advanced_partition_new(){
     advanced_partition *part = new(advanced_partition);
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_advanced_part);
@@ -302,11 +361,13 @@ advanced_partition *yon_advanced_partition_new(){
 
     yon_gtk_revealer_set_from_switch(GTK_REVEALER(part->FormatRevealer),GTK_SWITCH(part->FormatSwitch));
     g_signal_connect(G_OBJECT(part->EncryptionButton),"clicked",G_CALLBACK(on_advanced_password_clicked),part);
-    // g_signal_connect(G_OBJECT(part->SystemSectionToggle),"clicked",G_CALLBACK(on_advanced_system_toggled),part);
+
-    // g_signal_connect(G_OBJECT(part->UserDataSectionToggle),"clicked",G_CALLBACK(on_advanced_user_toggled),part);
+    yon_fs_type_setup(GTK_COMBO_BOX_TEXT(part->FileSystemTypeCombo));
 
     g_object_set_data(G_OBJECT(part->MainBox),"advanced_partition",part);
     g_object_set_data(G_OBJECT(part->RemoveButton),"advanced_partition",part);
+    g_object_set_data(G_OBJECT(part->SystemSectionToggle),"advanced_partition",part);
+    g_object_set_data(G_OBJECT(part->UserDataSectionToggle),"advanced_partition",part);
 
     return part;
 }

source/ubinstall-gtk-installation.c

@@ -305,6 +305,9 @@ void on_partition_changed(GtkWidget *self, main_window *widgets){
     if (self==widgets->NextInstallationSysSectionTree||self == widgets->NextInstallationSizeTypeSpin){
         yon_set_max_size_from_partition(GTK_TREE_VIEW(widgets->NextInstallationSysSectionTree),GTK_SPIN_BUTTON(widgets->NextInstallationSizeSpin),GTK_COMBO_BOX(widgets->NextInstallationSizeTypeSpin));
     }
+    if (self==widgets->AdvancedPartitionTree){
+        
+    }
 
 }
 

source/ubinstall-gtk.c

@@ -3,6 +3,37 @@
 config main_config; 
  
 // //functions 
+// void yon_encryption_type_setup(GtkComboBoxText *target){
+//     int size;
+//     config_str enc_types = yon_resource_open_file(encryptions_path,&size);
+//     for (int i=0;i<size;i++){
+//         yon_char_remove_last_symbol(enc_types[i],'\n');
+//         int parsed_size;
+//         config_str parsed = yon_char_parse(enc_types[i],&parsed_size,";");
+//         if (parsed_size){
+
+//             gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(target),parsed[0],parsed[0]);
+//             yon_char_parsed_free(parsed,parsed_size);
+//         }
+//     }
+// }
+
+void yon_fs_type_setup(GtkComboBoxText *target){
+    int size;
+    config_str enc_types = yon_resource_open_file(fs_types_path,&size);
+    for (int i=0;i<size;i++){
+        yon_char_remove_last_symbol(enc_types[i],'\n');
+        int parsed_size;
+        config_str parsed = yon_char_parse(enc_types[i],&parsed_size,";");
+        if (parsed_size){
+            if (parsed[0][0]=='1'){
+                gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(target),parsed[1],parsed[1]);
+            }
+            yon_char_parsed_free(parsed,parsed_size);
+        }
+    }
+}
+
 void on_vnc_toggled(GtkWidget *self, main_window *){
     if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self))){
         yon_launch(enable_vnc_command);

source/ubinstall-gtk.h

@@ -930,6 +930,11 @@ typedef struct {
 	
 } source_element;
 
+enum PART_SOURCE {
+	PART_SOURCE_DEVICE,
+	PART_SOURCE_PART
+};
+
 typedef struct {
     char *partition;
     char *device_source;
@@ -941,6 +946,7 @@ typedef struct {
     char *fs_label;
     char *encryption;
     char *encryption_password;
+	enum PART_SOURCE part_source;
 } advanced_section;
 
 
@@ -1157,3 +1163,5 @@ void on_advanced_partition_create(GtkWidget *, main_window *widgets);
 void yon_advanced_parts_update(main_window *widgets);
 void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets);
 void yon_advanced_section_remove_all();
+void on_advanced_section_toggled(GtkWidget *self, main_window *widgets);
+void yon_fs_type_setup(GtkComboBoxText *target);

ubinstall-gtk-advanced-box.glade

@@ -3,6 +3,11 @@
 <interface domain="ubinstall-gtk">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubinstall-gtk.css -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -11,12 +16,12 @@
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.untoggled-symbolic</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.untoggled-symbolic</property>
   </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
@@ -90,6 +95,9 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
                 <property name="image">image2</property>
+                <style>
+                  <class name="unsensitiveblock"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -105,6 +113,9 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
                 <property name="image">image3</property>
+                <style>
+                  <class name="unsensitiveblock"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -198,6 +209,7 @@
                       <object class="GtkSpinButton" id="SizeSpin">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
+                        <property name="adjustment">adjustment1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -209,6 +221,7 @@
                       <object class="GtkComboBoxText" id="SizeCombo">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="active">0</property>
                         <items>
                           <item id="M" translatable="yes">Mb</item>
                           <item id="G" translatable="yes">Gb</item>
@@ -261,6 +274,7 @@
                       <object class="GtkComboBoxText" id="FileSystemTypeCombo">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="active">0</property>
                         <items>
                           <item translatable="yes">Default</item>
                         </items>
@@ -324,6 +338,7 @@
                       <object class="GtkComboBoxText" id="EncryptionCombo">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="active">0</property>
                         <items>
                           <item translatable="yes">Off</item>
                         </items>

ubinstall-gtk.css

@@ -324,3 +324,8 @@ button {
 	min-width: 26px;
 	min-height: 24px;
 }
+
+.unsensitiveblock:disabled {
+	opacity:1;
+	background:@theme_selected_bg_color;
+}

ubinstall-gtk.glade

@@ -6884,22 +6884,22 @@ separately into the selected partition.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkScrolledWindow">
+                                          <object class="GtkFrame">
                                             <property name="visible">True</property>
-                                            <property name="can-focus">True</property>
+                                            <property name="can-focus">False</property>
+                                            <property name="label-xalign">0</property>
                                             <property name="shadow-type">in</property>
-                                            <property name="min-content-height">105</property>
+                                            <child>
+                                              <object class="GtkAlignment">
+                                                <property name="visible">True</property>
+                                                <property name="can-focus">False</property>
                                                 <child>
                                                   <object class="GtkTreeView" id="AdvancedDeviceTree">
+                                                    <property name="height-request">125</property>
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">DevicesList</property>
                                                     <property name="search-column">0</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection">
-                                                    <property name="mode">none</property>
-                                                  </object>
-                                                </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
                                                         <child>
@@ -6969,6 +6969,11 @@ separately into the selected partition.</property>
                                                   </object>
                                                 </child>
                                               </object>
+                                            </child>
+                                            <child type="label_item">
+                                              <placeholder/>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
@@ -7050,22 +7055,22 @@ separately into the selected partition.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkScrolledWindow">
+                                          <object class="GtkFrame">
                                             <property name="visible">True</property>
-                                            <property name="can-focus">True</property>
+                                            <property name="can-focus">False</property>
+                                            <property name="label-xalign">0</property>
                                             <property name="shadow-type">in</property>
-                                            <property name="min-content-height">140</property>
+                                            <child>
+                                              <object class="GtkAlignment">
+                                                <property name="visible">True</property>
+                                                <property name="can-focus">False</property>
                                                 <child>
                                                   <object class="GtkTreeView" id="AdvancedPartitionTree">
+                                                    <property name="height-request">125</property>
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">PartitionsList</property>
                                                     <property name="search-column">0</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection">
-                                                    <property name="mode">none</property>
-                                                  </object>
-                                                </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
                                                         <child>
@@ -7135,6 +7140,11 @@ separately into the selected partition.</property>
                                                   </object>
                                                 </child>
                                               </object>
+                                            </child>
+                                            <child type="label_item">
+                                              <placeholder/>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
@@ -9836,9 +9846,6 @@ separately into the selected partition.</property>
                                                 <property name="can-focus">True</property>
                                                 <property name="model">DevicesList</property>
                                                 <property name="search-column">0</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection"/>
-                                                </child>
                                                 <child>
                                                   <object class="GtkTreeViewColumn">
                                                     <property name="title" translatable="yes">Device</property>
@@ -9940,9 +9947,6 @@ separately into the selected partition.</property>
                                                 <property name="can-focus">True</property>
                                                 <property name="model">PartitionsList</property>
                                                 <property name="search-column">0</property>
-                                                <child internal-child="selection">
-                                                  <object class="GtkTreeSelection"/>
-                                                </child>
                                                 <child>
                                                   <object class="GtkTreeViewColumn">
                                                     <property name="title" translatable="yes">Section</property>