Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity

Advanced installaion page changed

Browse Source
pull/239/head
Ivan Dmitrievich Yartsev 2 months ago
parent b3769a878d
commit 6843b6b579
4 changed files with 65 additions and 26 deletions
Show Stats Download Patch File Download Diff File

55
source/ubinstall-gtk-advanced.c
Unescape View File

@ -517,9 +517,49 @@ int yon_advanced_save(main_window *widgets){
char *encryption[2] = {NULL};
char *format[2] = {NULL};
if (!sections_size){
yon_ubl_status_box_spawn(GTK_COMBO_BOX(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
}
advanced_section *cur_section = sections[0]->sys_section?sections[0]:sections[1];
if (cur_section->part_source == PART_SOURCE_VIRTUAL){
char *device = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->AdvancedVirtualDeviceCombo));
int size;
config_str vfs_file = yon_resource_open_file(vfs_list_path,&size);
config_str cur_device = NULL;
for (int i=0;i<size;i++){
int parsed_size;
config_str parsed = yon_char_parse(vfs_file[i],&parsed_size,";");
if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&!strcmp(parsed[2],device)){
cur_device = parsed;
} else {
yon_char_parsed_free(parsed,parsed_size);
}
}
if (!yon_char_is_empty(device)){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
int active_devices=0;
for_iter(model,&iter){
int status;
gtk_tree_model_get(model,&iter,5,&status,-1);
if (status) active_devices++;
}
if (atoi(cur_device[3])>active_devices){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),COUNT_INVALID_LABEL(cur_device[3]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4);
return 0;
}
if (atoi(cur_device[4])%active_devices!=0){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),PARITY_INVALID_LABEL(cur_device[4]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4);
return 0;
}
}
}
if (!yon_char_is_empty(cur_section->partition)){
if (!yon_char_is_empty(cur_section->partition)){
parts[0]=cur_section->partition;
@ -814,12 +854,10 @@ void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets){
char *device = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->AdvancedVirtualDeviceCombo));
int size;
config_str vfs_file = yon_resource_open_file(vfs_list_path,&size);
config_str cur_device = NULL;
for (int i=0;i<size;i++){
int parsed_size;
config_str parsed = yon_char_parse(vfs_file[i],&parsed_size,";");
if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&!strcmp(parsed[2],device)){
cur_device = parsed;
gtk_label_set_text(GTK_LABEL(widgets->AdvancedVirtualDeviceLabel),parsed[1]);
} else {
yon_char_parsed_free(parsed,parsed_size);
@ -834,19 +872,6 @@ void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets){
gtk_tree_model_get(model,&iter,5,&status,-1);
if (status) active_devices++;
}
if (atoi(cur_device[3])>active_devices){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),COUNT_INVALID_LABEL(cur_device[3]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4);
return;
}
if (atoi(cur_device[4])%active_devices!=0){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),PARITY_INVALID_LABEL(cur_device[4]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4);
return;
}
advanced_section *section = yon_advanced_section_new();
section->part_source = PART_SOURCE_VIRTUAL;

4
source/ubl-strings.h
Unescape View File

@ -206,8 +206,8 @@ NULL)
#define SAVE_AND_EXIT_LABEL _("Save and exit")
#define NO_LABEL _("No")
#define PARITY_INVALID_LABEL(target) yon_char_unite("Cu",target,NULL)
#define COUNT_INVALID_LABEL(target) yon_char_unite("Cues",target,NULL)
#define PARITY_INVALID_LABEL(target) yon_char_unite("Invalid devices parity. Needed: ",target,NULL)
#define COUNT_INVALID_LABEL(target) yon_char_unite("Invalid devices chosen. Needed: ",target,NULL)
#define ABOUT_TITLE_LABEL _("About system installation")
#define VALUE_REPEAT_LABEL _("Repeating values")

30
ubinstall-gtk-advanced-box.glade
Unescape View File

@ -402,6 +402,11 @@
<items>
<item translatable="yes">Default</item>
</items>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can-focus">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -460,25 +465,32 @@
<class name="bggrey"/>
</style>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="box2"/>
<widget name="PartLabelEntry"/>
<widget name="FileSystemLabelEntry"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<object class="GtkSizeGroup" id="row1">
<widgets>
<widget name="label1"/>
<widget name="label4"/>
<widget name="label5"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<object class="GtkSizeGroup" id="row2">
<widgets>
<widget name="FileSystemTypeCombo"/>
<widget name="EncryptionCombo"/>
<widget name="box1"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="row3">
<widgets>
<widget name="label3"/>
<widget name="label6"/>
<widget name="label2"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="row4">
<widgets>
<widget name="box2"/>
<widget name="PartLabelEntry"/>
<widget name="FileSystemLabelEntry"/>
</widgets>
</object>
</interface>

2
ubinstall-gtk.glade
Unescape View File

@ -9762,6 +9762,8 @@ separately into the selected partition.</property>
<object class="GtkLabel" id="AdvancedVirtualDeviceLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
</object>
<packing>
<property name="expand">False</property>

Write Preview
Loading…
Cancel
Save