diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po
index 6291401..9af6a32 100644
--- a/locale/ubinstall-gtk_ru.po
+++ b/locale/ubinstall-gtk_ru.po
@@ -522,7 +522,7 @@ msgstr "Режим конфигурации"
#: source/ubl-strings.h:140
msgid "Attention! Configuration mode was enabled!"
-msgstr "Внимание! Включен режим конфигурации"
+msgstr "Внимание! Включен режим конфигурации!"
#: source/ubl-strings.h:141
msgid "Configuration will be saved in configuration file"
diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c
index 817e6d9..cf14e1f 100644
--- a/source/ubinstall-gtk-installation.c
+++ b/source/ubinstall-gtk-installation.c
@@ -446,11 +446,9 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
default:return;
}
-
char *device = config(AUTOINSTALL_DEVICE);
char *part = config(part_parameter);
-
if (!yon_char_is_empty(device)){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
@@ -685,7 +683,7 @@ void on_install_advanced_add_new(GtkWidget *, main_window *widgets){
gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0);
gtk_widget_show(part->MainBox);
yon_advanced_partition_setup(part,widgets);
- on_advanced_parts_added(NULL,NULL,widgets);
+ on_advanced_parts_added(NULL,NULL,widgets);
}
void on_install_advanced_device_chosen(GtkCellRenderer *, gchar *path, main_window *widgets){
diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c
index b8c0f62..c59c8b6 100644
--- a/source/ubinstall-gtk-saving.c
+++ b/source/ubinstall-gtk-saving.c
@@ -717,7 +717,7 @@ int yon_config_save(main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
}
- char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_save_path,"",yon_char_parsed_to_string(parameters,size," ")));
+ char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_save_path,"[autoinstall]",yon_char_parsed_to_string(parameters,size," ")));
if (system(command)){
return 0;
}
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index fd5a71c..7e47a95 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -479,7 +479,10 @@ main_window *yon_main_window_complete(){
widgets->AdvancedSwapAutoSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapAutoSwitch");
widgets->AdvancedSwapRamSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapRamSwitch");
widgets->AdvancedSwapFixedSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSwitch");
+ widgets->AdvancedSwapFixedSizeSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSizeSwitch");
widgets->AdvancedSwapFixedSpin = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSpin");
+ widgets->AdvancedSwapRevealer = yon_gtk_builder_get_widget(builder,"AdvancedSwapRevealer");
+ widgets->AdvancedLoadTypeRevealer = yon_gtk_builder_get_widget(builder,"AdvancedLoadTypeRevealer");
widgets->advanced_partition_order = g_sequence_new(NULL);
widgets->GrubInstallDevicesTree = yon_gtk_builder_get_widget(builder,"GrubInstallDevicesTree");
@@ -727,6 +730,11 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->HotnameEntry),"changed",G_CALLBACK(on_hostname_entry_changed),widgets);
g_signal_connect(G_OBJECT(widgets->NetworkConnectionsAddButton),"clicked",G_CALLBACK(on_connection_add),widgets);
g_signal_connect(G_OBJECT(widgets->NetworkNTPCombo),"changed",G_CALLBACK(on_ntp_sync),widgets);
+ yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->AdvancedLoadTypeRevealer),GTK_SWITCH(widgets->AdvancedLoadTypeSwitch));
+ yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->AdvancedSwapRevealer),GTK_SWITCH(widgets->AdvancedSwapSwitch));
+
+ g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSpin);
+ g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSizeSwitch);
g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_install_advanced_add_new),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),widgets);
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 4bdfbff..8cf58b8 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -663,6 +663,8 @@ typedef struct {
GtkWidget *AdvancedSwapFixedSpin;
GtkWidget *AdvancedSwapFixedSwitch;
GtkWidget *AdvancedSwapFixedSizeSwitch;
+ GtkWidget *AdvancedSwapRevealer;
+ GtkWidget *AdvancedLoadTypeRevealer;
dictionary *advanced_sections;
GSequence *advanced_partition_order;
diff --git a/source/ubl-settings-advanced.c b/source/ubl-settings-advanced.c
new file mode 100644
index 0000000..19d8f0b
--- /dev/null
+++ b/source/ubl-settings-advanced.c
@@ -0,0 +1,42 @@
+#include "ubinstall-gtk.h"
+
+typedef struct {
+ char *section;
+ int sys_section;
+ int user_section;
+ int format;
+ int size;
+ char size_letter;
+ char *part_label;
+ char *fs_type;
+ char *fs_label;
+ char *encryption;
+ char *encryption_password;
+
+} advanced_section;
+
+int sections_size=0;
+advanced_section *sections[2] = {NULL};
+
+advanced_section *yon_advanced_section_new(){
+ if (sections_size>=2) return NULL;
+
+ advanced_section *section = malloc(sizeof(advanced_section));
+ memset(section,0,sizeof(advanced_section));
+ sections[sections_size] = section;
+ return section;
+}
+
+
+
+// add section from tree view
+void yon_advanced_add(main_window *widgets){
+ if (sections_size<2){
+
+ }
+}
+
+//new section from button
+void yon_advanced_new(main_window *widgets){
+
+}
\ No newline at end of file
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 99b1152..106745d 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -759,6 +759,7 @@ agreement
5
5
left
+ False
- False
+ True
True
0
@@ -7177,8 +7178,6 @@ separately into the selected partition.