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

WIP davanced installation loading #250

Merged
asmeron merged 3 commits from YanTheKaller/ubinstall-gtk:master into master 2 months ago
Conversation 0 Commits 3 Files Changed 12
12 changed files with 511 additions and 896 deletions
Show Stats Download Patch File Download Diff File

1117
source/ubinstall-gtk-advanced.c
View File

File diff suppressed because it is too large Load Diff

7
source/ubinstall-gtk-config-hub.c
Unescape View File

@ -26,7 +26,7 @@ int yon_installation_check_packages_size(main_window *widgets){
} }
if (!strcmp(install_mode,"fast")){ if (!strcmp(install_mode,"fast")){
char *device = config(AUTOINSTALL_DEVICE); char *device = config(device_parameter);
GtkTreeIter iter; GtkTreeIter iter;
for_iter(widgets->DevicesList,&iter){ for_iter(widgets->DevicesList,&iter){
char *target; char *target;
@ -240,11 +240,10 @@ void yon_configuration_hub_add(GtkFlowBox *target, char *name, char *icon, enum
config_hub_icon *cur_icon = malloc(sizeof(config_hub_icon)); config_hub_icon *cur_icon = malloc(sizeof(config_hub_icon));
memset(cur_icon,0,sizeof(config_hub_icon)); memset(cur_icon,0,sizeof(config_hub_icon));
GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(),icon,54,1,GTK_ICON_LOOKUP_FORCE_SIZE);
cur_icon->MainBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); cur_icon->MainBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5);
cur_icon->Label = gtk_label_new(name); cur_icon->Label = gtk_label_new(name);
cur_icon->Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); cur_icon->Image = gtk_image_new_from_icon_name(icon,GTK_ICON_SIZE_BUTTON);
gtk_image_set_pixel_size(GTK_IMAGE(cur_icon->Image),54);
cur_icon->page = page; cur_icon->page = page;
GtkWidget *flow = gtk_flow_box_child_new(); GtkWidget *flow = gtk_flow_box_child_new();
gtk_style_context_add_class(gtk_widget_get_style_context(flow),"bggrey"); gtk_style_context_add_class(gtk_widget_get_style_context(flow),"bggrey");

8
source/ubinstall-gtk-decorations.c
Unescape View File

@ -50,11 +50,11 @@ void yon_install_slider_update(main_window *widgets){
GtkWidget *Image = NULL; GtkWidget *Image = NULL;
int chosen = iter==main_config.chosen_slide||(main_config.chosen_slide->next&&iter==main_config.chosen_slide->next)||(!main_config.chosen_slide->next&&iter==g_list_first(main_config.chosen_slide)); int chosen = iter==main_config.chosen_slide||(main_config.chosen_slide->next&&iter==main_config.chosen_slide->next)||(!main_config.chosen_slide->next&&iter==g_list_first(main_config.chosen_slide));
if (chosen){ if (chosen){
GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(),toggled_icon_path,8,1,GTK_ICON_LOOKUP_FORCE_SIZE); Image = gtk_image_new_from_icon_name(toggled_icon_path,GTK_ICON_SIZE_BUTTON);
Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); gtk_image_set_pixel_size(GTK_IMAGE(Image),8);
} else { } else {
GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(),untoggled_icon_path,8,1,GTK_ICON_LOOKUP_FORCE_SIZE); Image = gtk_image_new_from_icon_name(untoggled_icon_path,GTK_ICON_SIZE_BUTTON);
Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); gtk_image_set_pixel_size(GTK_IMAGE(Image),8);
} }
gtk_box_pack_start(GTK_BOX(widgets->SliderProgressBox),Image,0,0,0); gtk_box_pack_start(GTK_BOX(widgets->SliderProgressBox),Image,0,0,0);
gtk_widget_show(Image); gtk_widget_show(Image);

4
source/ubinstall-gtk-grub.c
Unescape View File

@ -17,7 +17,7 @@ int yon_grub_install_save(main_window *widgets){
} }
char *partition; char *partition;
gtk_tree_model_get(model,&iter,0,&partition,-1); gtk_tree_model_get(model,&iter,0,&partition,-1);
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,cur_device); yon_config_register(device_parameter,device_parameter_command,cur_device);
yon_config_register(part_parameter,part_parameter_command,partition); yon_config_register(part_parameter,part_parameter_command,partition);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_install"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_install");
return 1; return 1;
@ -40,7 +40,7 @@ int yon_grub_update_save(main_window *widgets){
} }
char *partition; char *partition;
gtk_tree_model_get(model,&iter,0,&partition,-1); gtk_tree_model_get(model,&iter,0,&partition,-1);
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,cur_device); yon_config_register(device_parameter,device_parameter_command,cur_device);
yon_config_register(part_parameter,part_parameter_command,partition); yon_config_register(part_parameter,part_parameter_command,partition);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_update"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_update");
return 1; return 1;

130
source/ubinstall-gtk-installation.c
Unescape View File

@ -13,7 +13,7 @@ int yon_install_common_save(main_window *widgets){
yon_config_remove_by_key(part_parameter); yon_config_remove_by_key(part_parameter);
gtk_tree_model_get(model,&iter,0,&device,-1); gtk_tree_model_get(model,&iter,0,&device,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); yon_config_register(device_parameter,device_parameter_command,device);
char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->CommonInstallationSectionNameEntry)); char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->CommonInstallationSectionNameEntry));
if (!yon_char_is_empty(device_name)){ if (!yon_char_is_empty(device_name)){
@ -31,7 +31,7 @@ int yon_install_common_save(main_window *widgets){
if (!main_config.configure_mode){ if (!main_config.configure_mode){
int size; int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE,part_label_parameter,part_fs_type_parameter,NULL); config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_TYPE_INSTALL,device_parameter,part_label_parameter,part_fs_type_parameter,NULL);
if (parameters){ if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
@ -63,7 +63,7 @@ int yon_install_separate_save(main_window *widgets){
glong size,free_space; glong size,free_space;
gtk_tree_model_get(model,&iter,0,&part,5,&size,6,&free_space,-1); gtk_tree_model_get(model,&iter,0,&part,5,&size,6,&free_space,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); yon_config_register(device_parameter,device_parameter_command,device);
yon_config_register(part_parameter,part_parameter_command,part); yon_config_register(part_parameter,part_parameter_command,part);
if (gtk_switch_get_active(GTK_SWITCH(widgets->NextInstallationFormatSwitch))){ if (gtk_switch_get_active(GTK_SWITCH(widgets->NextInstallationFormatSwitch))){
yon_config_register(part_format_parameter,part_format_parameter_command,"yes"); yon_config_register(part_format_parameter,part_format_parameter_command,"yes");
@ -113,7 +113,7 @@ int yon_install_separate_save(main_window *widgets){
if (!main_config.configure_mode){ if (!main_config.configure_mode){
int size; int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_label_parameter,part_fs_type_parameter,AUTOINSTALL_DEVICE,part_parameter,NULL); config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_label_parameter,part_fs_type_parameter,device_parameter,part_parameter,NULL);
if (parameters){ if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
@ -144,7 +144,7 @@ int yon_install_same_partition_save(main_window *widgets){
char *part; char *part;
gtk_tree_model_get(model,&iter,0,&part,-1); gtk_tree_model_get(model,&iter,0,&part,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"part"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"part");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); yon_config_register(device_parameter,device_parameter_command,device);
yon_config_register(part_parameter,part_parameter_command,part); yon_config_register(part_parameter,part_parameter_command,part);
if (gtk_switch_get_active(GTK_SWITCH(widgets->SameInstallationFormatSwitch))){ if (gtk_switch_get_active(GTK_SWITCH(widgets->SameInstallationFormatSwitch))){
@ -171,7 +171,7 @@ int yon_install_same_partition_save(main_window *widgets){
} }
if (!main_config.configure_mode){ if (!main_config.configure_mode){
int size; int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_size_parameter,part_label_parameter,part_fs_type_parameter,AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE,part_parameter,NULL); config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_size_parameter,part_label_parameter,part_fs_type_parameter,AUTOINSTALL_TYPE_INSTALL,device_parameter,part_parameter,NULL);
if (parameters){ if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
@ -183,61 +183,61 @@ int yon_install_same_partition_save(main_window *widgets){
return 1; return 1;
} }
int yon_advanced_sections_save(dictionary *dict){ // int yon_advanced_sections_save(dictionary *dict){
if (!dict) return 0; // if (!dict) return 0;
advanced_partition *first_section = yon_dictionary_get_data(dict->first,advanced_partition*); // advanced_part_widgets *first_section = yon_dictionary_get_data(dict->first,advanced_part_widgets*);
advanced_partition *last_section = NULL; // advanced_part_widgets *last_section = NULL;
if (dict->first->next){ // if (dict->first->next){
last_section = yon_dictionary_get_data(dict->first->next,advanced_partition*); // last_section = yon_dictionary_get_data(dict->first->next,advanced_part_widgets*);
} // }
char *part_first = first_section->part; // char *part_first = first_section->part;
char *part_last = last_section?last_section->part:NULL; // char *part_last = last_section?last_section->part:NULL;
char *part = yon_char_unite(part_first,last_section?",":NULL,part_last,NULL); // char *part = yon_char_unite(part_first,last_section?",":NULL,part_last,NULL);
yon_config_register(part_parameter,part_parameter_command,part); // yon_config_register(part_parameter,part_parameter_command,part);
int format_first_active = gtk_switch_get_active(GTK_SWITCH(first_section->FormatCombo)); // int format_first_active = gtk_switch_get_active(GTK_SWITCH(first_section->FormatCombo));
int format_last_active = gtk_switch_get_active(GTK_SWITCH(last_section->FormatCombo)); // int format_last_active = gtk_switch_get_active(GTK_SWITCH(last_section->FormatCombo));
char * format_first = format_first_active==1?"yes":format_first_active==2?"no":NULL; // char * format_first = format_first_active==1?"yes":format_first_active==2?"no":NULL;
char * format_last = format_last_active==1?"yes":format_last_active==2?"no":NULL; // char * format_last = format_last_active==1?"yes":format_last_active==2?"no":NULL;
char *format = yon_char_unite(format_first,part_last?",":NULL,format_last,NULL); // char *format = yon_char_unite(format_first,part_last?",":NULL,format_last,NULL);
yon_config_register(part_format_parameter,part_format_parameter_command,format); // yon_config_register(part_format_parameter,part_format_parameter_command,format);
if (!yon_char_is_empty(format)){ // if (!yon_char_is_empty(format)){
char *size_first = g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(first_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->SizeCombo)))); // char *size_first = g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(first_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->SizeCombo))));
char *size_last = last_section&&!strcmp(format_last,"yes")?g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(last_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->SizeCombo)))):NULL; // char *size_last = last_section&&!strcmp(format_last,"yes")?g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(last_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->SizeCombo)))):NULL;
char *size = yon_char_unite(size_first,size_last?",":NULL,size_last,NULL); // char *size = yon_char_unite(size_first,size_last?",":NULL,size_last,NULL);
yon_config_register(part_size_parameter,part_size_parameter_command,size); // yon_config_register(part_size_parameter,part_size_parameter_command,size);
char *part_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->PartLabelEntry)); // char *part_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->PartLabelEntry));
char *part_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->PartLabelEntry)):NULL; // char *part_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->PartLabelEntry)):NULL;
char *part_label = yon_char_unite(part_label_first,part_label_last?",":NULL,part_label_last,NULL); // char *part_label = yon_char_unite(part_label_first,part_label_last?",":NULL,part_label_last,NULL);
yon_config_register(part_label_parameter,part_label_parameter_command,part_label); // yon_config_register(part_label_parameter,part_label_parameter_command,part_label);
char *fs_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->FileSystemLabelEntry)); // char *fs_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->FileSystemLabelEntry));
char *fs_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->FileSystemLabelEntry)):NULL; // char *fs_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->FileSystemLabelEntry)):NULL;
char *fs_label = yon_char_unite(fs_label_first,fs_label_last?",":NULL,fs_label_last,NULL); // char *fs_label = yon_char_unite(fs_label_first,fs_label_last?",":NULL,fs_label_last,NULL);
yon_config_register(part_fs_label_parameter,part_fs_label_parameter_command,fs_label); // yon_config_register(part_fs_label_parameter,part_fs_label_parameter_command,fs_label);
char *fs_type_first = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(first_section->FileSystemTypeCombo)); // char *fs_type_first = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(first_section->FileSystemTypeCombo));
char *fs_type_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(last_section->FileSystemTypeCombo)):NULL; // char *fs_type_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(last_section->FileSystemTypeCombo)):NULL;
char *fs_type = yon_char_unite(fs_type_first,fs_type_last?",":NULL,fs_type_last,NULL); // char *fs_type = yon_char_unite(fs_type_first,fs_type_last?",":NULL,fs_type_last,NULL);
yon_config_register(part_fs_type_parameter,part_fs_type_parameter_command,fs_type); // yon_config_register(part_fs_type_parameter,part_fs_type_parameter_command,fs_type);
char *part_crypt_first = gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL; // char *part_crypt_first = gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL;
char *part_crypt_last = last_section&&!strcmp(format_last,"yes")&&gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL; // char *part_crypt_last = last_section&&!strcmp(format_last,"yes")&&gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL;
char *part_crypt = NULL; // char *part_crypt = NULL;
if (part_crypt_first||part_crypt_last){ // if (part_crypt_first||part_crypt_last){
part_crypt = yon_char_unite(part_crypt_first,part_crypt_last?",":NULL,part_crypt_last,NULL); // part_crypt = yon_char_unite(part_crypt_first,part_crypt_last?",":NULL,part_crypt_last,NULL);
} // }
if (part_crypt){ // if (part_crypt){
yon_config_register(part_crypt_parameter,part_crypt_parameter_command,part_crypt); // yon_config_register(part_crypt_parameter,part_crypt_parameter_command,part_crypt);
} else { // } else {
yon_config_remove_by_key(part_crypt_parameter); // yon_config_remove_by_key(part_crypt_parameter);
} // }
} // }
return 1; // return 1;
} // }
void yon_size_changed(GtkSpinButton *self, main_window *widgets){ void yon_size_changed(GtkSpinButton *self, main_window *widgets){
int cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); int cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
@ -276,6 +276,9 @@ void yon_size_changed(GtkSpinButton *self, main_window *widgets){
void *yon_partitions_list_load(main_window *){ void *yon_partitions_list_load(main_window *){
main_config.partitions = yon_config_load(yon_debug_output("%s\n",get_parts_for_device_command),&main_config.part_size); main_config.partitions = yon_config_load(yon_debug_output("%s\n",get_parts_for_device_command),&main_config.part_size);
for (int i=0;i<main_config.part_size;i++){
yon_char_remove_last_symbol(main_config.partitions[i],'\n');
}
g_thread_exit(NULL); g_thread_exit(NULL);
} }
@ -354,6 +357,7 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){
void yon_devices_setup(main_window *widgets){ void yon_devices_setup(main_window *widgets){
GtkTreeIter iter; GtkTreeIter iter;
gtk_list_store_clear(widgets->DevicesList); gtk_list_store_clear(widgets->DevicesList);
gtk_list_store_clear(widgets->PartitionsList);
// int size; // int size;
// config_str parameters = NULL; // config_str parameters = NULL;
// parameters = yon_config_load(yon_debug_output("%s\n",get_devices_command),&size); // parameters = yon_config_load(yon_debug_output("%s\n",get_devices_command),&size);
@ -434,7 +438,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
break; break;
case YON_PAGE_INSTALL_ADVANCED: case YON_PAGE_INSTALL_ADVANCED:
yon_install_advanced_init(widgets); // yon_install_advanced_init(widgets);
return; return;
break; break;
case YON_PAGE_RECOVERY_GRUB_INSTALL: case YON_PAGE_RECOVERY_GRUB_INSTALL:
@ -475,7 +479,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
default:return; default:return;
} }
char *device = config(AUTOINSTALL_DEVICE); char *device = config(device_parameter);
char *part = config(part_parameter); char *part = config(part_parameter);
if (!yon_char_is_empty(device)){ if (!yon_char_is_empty(device)){

6
source/ubinstall-gtk-page-switch.c
Unescape View File

@ -281,7 +281,7 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){
return yon_install_same_partition_save(widgets); return yon_install_same_partition_save(widgets);
break; break;
case YON_PAGE_INSTALL_ADVANCED: case YON_PAGE_INSTALL_ADVANCED:
return yon_advanced_save(widgets); // return yon_advanced_save(widgets);
break; break;
case YON_PAGE_RECOVERY_GRUB_INSTALL: case YON_PAGE_RECOVERY_GRUB_INSTALL:
return yon_grub_install_save(widgets); return yon_grub_install_save(widgets);
@ -468,8 +468,8 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
yon_packages_tab_init(widgets); yon_packages_tab_init(widgets);
break; break;
case YON_PAGE_INSTALL_ADVANCED: case YON_PAGE_INSTALL_ADVANCED:
yon_install_advanced_init(widgets); yon_advanced_init(widgets);
__attribute__((fallthrough)); break;
case YON_PAGE_INSTALL_COMMON: case YON_PAGE_INSTALL_COMMON:
case YON_PAGE_INSTALL_SEPARATE: case YON_PAGE_INSTALL_SEPARATE:
case YON_PAGE_INSTALL_SAME_PARTITION: case YON_PAGE_INSTALL_SAME_PARTITION:

4
source/ubinstall-gtk-region.c
Unescape View File

@ -79,8 +79,8 @@ void yon_map_status_show(main_window *widgets, char *icon_name, char *title, cha
gtk_label_set_text(GTK_LABEL(widgets->TimeZoneMapOverlayInfoLabel),title_info); gtk_label_set_text(GTK_LABEL(widgets->TimeZoneMapOverlayInfoLabel),title_info);
if (!yon_char_is_empty(icon_name)){ if (!yon_char_is_empty(icon_name)){
gtk_widget_show(widgets->TimeZoneMapOverlayImage); gtk_widget_show(widgets->TimeZoneMapOverlayImage);
GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(), icon_path, 48,1,GTK_ICON_LOOKUP_FORCE_SIZE); widgets->TimeZoneMapOverlayImage = gtk_image_new_from_icon_name(icon_path,GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->TimeZoneMapOverlayImage),gtk_icon_info_load_icon(info,NULL)); gtk_image_set_pixel_size(GTK_IMAGE(widgets->TimeZoneMapOverlayImage),48);
} else { } else {
gtk_widget_hide(widgets->TimeZoneMapOverlayImage); gtk_widget_hide(widgets->TimeZoneMapOverlayImage);
} }

4
source/ubinstall-gtk-separate.c
Unescape View File

@ -16,7 +16,7 @@ int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char *
char *cur_device, *cur_section; char *cur_device, *cur_section;
gtk_tree_model_get(model,&iter,0,&cur_device,-1); gtk_tree_model_get(model,&iter,0,&cur_device,-1);
gtk_tree_model_get(model2,&itar,0,&cur_section,-1); gtk_tree_model_get(model2,&itar,0,&cur_section,-1);
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,cur_device); yon_config_register(device_parameter,device_parameter_command,cur_device);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,mode); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,mode);
yon_config_register(part_parameter,part_parameter_command,cur_section); yon_config_register(part_parameter,part_parameter_command,cur_section);
@ -24,7 +24,7 @@ int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char *
if(cur_device) free(cur_device); if(cur_device) free(cur_device);
if (!main_config.configure_mode){ if (!main_config.configure_mode){
int size; int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_DEVICE,AUTOINSTALL_TYPE_INSTALL,part_parameter,NULL); config_str parameters = yon_config_get_save_parameters_by_key(&size,device_parameter,AUTOINSTALL_TYPE_INSTALL,part_parameter,NULL);
if (parameters){ if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);

4
source/ubinstall-gtk.c
Unescape View File

@ -773,10 +773,12 @@ void yon_main_window_create(main_window *widgets){
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->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->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSizeSwitch);
g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"add",G_CALLBACK(on_advanced_part_content_changed),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"remove",G_CALLBACK(on_advanced_part_content_changed),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),widgets);
g_signal_connect(G_OBJECT(widgets->StartScenarioButton),"clicked",G_CALLBACK(yon_quick_install),widgets); g_signal_connect(G_OBJECT(widgets->StartScenarioButton),"clicked",G_CALLBACK(yon_quick_install),widgets);
g_signal_connect(G_OBJECT(widgets->SourceButton),"clicked",G_CALLBACK(on_source_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SourceButton),"clicked",G_CALLBACK(on_source_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_advanced_partition_create),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_advanced_part_create),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_install_advanced_partition_chosen),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_install_advanced_partition_chosen),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedVirtualDeviceCombo),"changed",G_CALLBACK(on_advanced_virtual_device_changed),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedVirtualDeviceCombo),"changed",G_CALLBACK(on_advanced_virtual_device_changed),widgets);
g_signal_connect(G_OBJECT(widgets->PackagesTree),"cursor-changed",G_CALLBACK(yon_on_packages_selected),widgets); g_signal_connect(G_OBJECT(widgets->PackagesTree),"cursor-changed",G_CALLBACK(yon_on_packages_selected),widgets);

102
source/ubinstall-gtk.h
Unescape View File

@ -162,8 +162,8 @@ layout && /description:/ {\
#define AUTOINSTALL_TYPE_INSTALL "AUTOINSTALL[install_type]" #define AUTOINSTALL_TYPE_INSTALL "AUTOINSTALL[install_type]"
#define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]" #define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]"
#define AUTOINSTALL_DEVICE "AUTOINSTALL[device]" #define device_parameter "AUTOINSTALL[device]"
#define AUTOINSTALL_DEVICE_command "ubconfig --source global get [autoinstall] AUTOINSTALL[device]" #define device_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[device]"
#define part_parameter "AUTOINSTALL[part]" #define part_parameter "AUTOINSTALL[part]"
#define part_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part]" #define part_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part]"
@ -311,14 +311,14 @@ layout && /description:/ {\
#define install_common_parameters \ #define install_common_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_label_parameter, \ part_label_parameter, \
part_fs_type_parameter part_fs_type_parameter
#define install_part_parameters \ #define install_part_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_fs_label_parameter, \ part_fs_label_parameter, \
part_parameter, \ part_parameter, \
@ -327,7 +327,7 @@ layout && /description:/ {\
#define install_next_parameters \ #define install_next_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_fs_label_parameter, \ part_fs_label_parameter, \
part_parameter, \ part_parameter, \
@ -336,7 +336,7 @@ layout && /description:/ {\
#define install_advanced_parameters \ #define install_advanced_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_label_parameter, \ part_label_parameter, \
part_parameter, \ part_parameter, \
@ -345,12 +345,12 @@ layout && /description:/ {\
#define install_grub_install_update_parameters \ #define install_grub_install_update_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_parameter part_parameter
#define install_system_only_parameters \ #define install_system_only_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_label_parameter, \ part_label_parameter, \
part_parameter, \ part_parameter, \
@ -360,7 +360,7 @@ layout && /description:/ {\
#define install_userdata_only_parameters \ #define install_userdata_only_parameters \
AUTOINSTALL_TYPE_INSTALL, \ AUTOINSTALL_TYPE_INSTALL, \
AUTOINSTALL_DEVICE, \ device_parameter, \
part_format_parameter, \ part_format_parameter, \
part_label_parameter, \ part_label_parameter, \
part_parameter, \ part_parameter, \
@ -823,12 +823,7 @@ typedef struct
GtkWidget *EncryptionEntry; GtkWidget *EncryptionEntry;
GtkWidget *EncryptionButton; GtkWidget *EncryptionButton;
GtkWidget *SectionPartitionLabel; GtkWidget *SectionPartitionLabel;
GSequenceIter *order_iter; } advanced_part_widgets;
enum ADVANCED_PART_TYPE part_type;
char *part;
char *device;
} advanced_partition;
typedef struct typedef struct
{ {
@ -1097,18 +1092,18 @@ typedef struct
char *device; char *device;
int sys_section; int sys_section;
int user_section; int user_section;
int format; char *format;
gulong full_part_size; gulong full_part_size;
unsigned long size; unsigned long size;
char size_letter; // char size_letter;
char *part_label; char *part_label;
char *fs_type; char *fs_type;
char *fs_label; char *fs_label;
char *encryption; char *encryption;
char *encryption_password; char *encryption_password;
enum PART_SOURCE part_source; enum PART_SOURCE part_source;
advanced_partition *partition_widgets; advanced_part_widgets *partition_widgets;
} advanced_section; } advanced_part_data;
struct row_data struct row_data
{ {
@ -1295,7 +1290,7 @@ int yon_install_advanced_save(main_window *widgets);
int yon_network_save(main_window *widgets); int yon_network_save(main_window *widgets);
void on_connection_add(GtkWidget *, main_window *widgets); void on_connection_add(GtkWidget *, main_window *widgets);
void on_ntp_sync(GtkWidget *, main_window *widgets); void on_ntp_sync(GtkWidget *, main_window *widgets);
int yon_advanced_sections_save(dictionary *dict); // int yon_advanced_sections_save(dictionary *dict);
void yon_configuration_mode_check(main_window *widgets); void yon_configuration_mode_check(main_window *widgets);
void on_configuration_mode_switch(GtkWidget *self, main_window *widgets); void on_configuration_mode_switch(GtkWidget *self, main_window *widgets);
void *_yon_installation_start(main_window *widgets); void *_yon_installation_start(main_window *widgets);
@ -1361,8 +1356,8 @@ void yon_software_init(main_window *widgets);
void on_install_advanced_device_chosen(GtkCellRenderer *, gchar *path, main_window *widgets); void on_install_advanced_device_chosen(GtkCellRenderer *, gchar *path, main_window *widgets);
void on_install_advanced_partition_chosen(GtkCellRenderer *, gchar *path, main_window *widgets); void on_install_advanced_partition_chosen(GtkCellRenderer *, gchar *path, main_window *widgets);
void yon_devices_setup(main_window *widgets); void yon_devices_setup(main_window *widgets);
void on_advanced_password_clicked(GtkWidget *, advanced_partition *part); void on_advanced_password_clicked(GtkWidget *, advanced_part_widgets *part);
advanced_partition *yon_advanced_partition_new(); advanced_part_widgets *yon_advanced_partition_new();
void on_advanced_part_remove(GtkWidget *self, main_window *widgets); void on_advanced_part_remove(GtkWidget *self, main_window *widgets);
int yon_advanced_get_part_size(main_window *widgets); int yon_advanced_get_part_size(main_window *widgets);
void yon_advanced_partition_clear(main_window *widgets); void yon_advanced_partition_clear(main_window *widgets);
@ -1392,28 +1387,28 @@ gboolean on_country_filter(GtkTreeModel *self, GtkTreeIter *iter, main_window *w
gboolean yon_os_component_insert(struct row_data *row_input); gboolean yon_os_component_insert(struct row_data *row_input);
void *yon_os_components_setup(main_window *widgets); void *yon_os_components_setup(main_window *widgets);
gboolean yon_spinner_switch_off(GtkSpinner *target); gboolean yon_spinner_switch_off(GtkSpinner *target);
void on_advanced_added(GtkWidget *, char *, main_window *); // void on_advanced_added(GtkWidget *, char *, main_window *);
void on_advanced_new(GtkWidget *, main_window *); // void on_advanced_new(GtkWidget *, main_window *);
int yon_advanced_section_get(char *partition); // int yon_advanced_section_get(char *partition);
void yon_advanced_partition_set_from_section(advanced_partition *part, advanced_section *section); // void yon_advanced_partition_set_from_section(advanced_part_widgets *part, advanced_part_widgets *section);
void yon_advanced_update(main_window *widgets); // void yon_advanced_update(main_window *widgets);
void on_advanced_partition_create(GtkWidget *, main_window *widgets); // void on_advanced_partition_create(GtkWidget *, main_window *widgets);
void yon_advanced_parts_update(main_window *widgets); // void yon_advanced_parts_update(main_window *widgets);
void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets); // void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets);
void yon_advanced_section_remove_all(); // void yon_advanced_section_remove_all();
void on_advanced_section_toggled(GtkWidget *self, main_window *widgets); // void on_advanced_section_toggled(GtkWidget *self, main_window *widgets);
void yon_fs_type_setup(GtkComboBoxText *target); void yon_fs_type_setup(GtkComboBoxText *target);
void yon_advanced_set_max_size_from_partition(advanced_partition *part, main_window *widgets); // void yon_advanced_set_max_size_from_partition(advanced_part_widgets *part, main_window *widgets);
void on_advanced_size_changed(GtkWidget *self, main_window *widgets); // void on_advanced_size_changed(GtkWidget *self, main_window *widgets);
int yon_advanced_save(main_window *widgets); // int yon_advanced_save(main_window *widgets);
void yon_advanced_part_parameter_changed(GtkWidget *self, advanced_partition *part); // void yon_advanced_part_parameter_changed(GtkWidget *self, advanced_part_widgets *part);
void yon_advanced_section_update(main_window *widgets); // void yon_advanced_section_update(main_window *widgets);
void yon_advanced_section_update_section(advanced_partition *part, GtkWidget *cur_toggle, main_window *widgets); // void yon_advanced_section_update_section(advanced_part_widgets *part, GtkWidget *cur_toggle, main_window *widgets);
int yon_advanced_section_get_by_part(advanced_partition *part); // int yon_advanced_section_get_by_part(advanced_part_widgets *part);
void yon_advanced_section_remove_by_name(char *part); // void yon_advanced_section_remove_by_name(char *part);
void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets); // void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets);
int yon_advanced_section_append(advanced_section *section); // int yon_advanced_section_append(advanced_part_widgets *section);
void on_format_changed(GtkWidget *self, advanced_partition *part); void on_format_changed(GtkWidget *self, advanced_part_widgets *part);
int yon_layouts_get(); int yon_layouts_get();
void on_link(GtkWidget *self, char *uri, gpointer); void on_link(GtkWidget *self, char *uri, gpointer);
void on_source_changed(GtkComboBox *self); void on_source_changed(GtkComboBox *self);
@ -1532,3 +1527,24 @@ gboolean yon_log_scroll(log_window *window);
gboolean on_log_window_exit(GtkWidget *,GdkEvent*, log_window *window); gboolean on_log_window_exit(GtkWidget *,GdkEvent*, log_window *window);
void yon_modules_missed_func(main_window *widgets); void yon_modules_missed_func(main_window *widgets);
void yon_scroll_block_for_builder(GtkBuilder *builder); void yon_scroll_block_for_builder(GtkBuilder *builder);
void yon_advanced_device_choose(main_window *widgets, const char *device);
void yon_advanced_part_choose(main_window *widgets, const char *part);
advanced_part_data *yon_advanced_part_data_new();
char *yon_advanced_part_data_get_parameter(const char *config_param, int pos);
advanced_part_data *yon_advanced_get_config_data(int pos);
void yon_advanced_part_create_for_device(GtkTreeIter *iter, main_window *widgets);
void yon_advanced_part_add_parts_for_device(const char *device_name, main_window *widgets);
void yon_advanced_part_remove_parts_for_device(const char *device_name, main_window *widgets);
void yon_advanced_init(main_window *widgets);
advanced_part_widgets *yon_advanced_part_create(advanced_part_data *part_data);
void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets);
void on_advanced_part_create(GtkWidget *self, main_window *widgets);
int yon_advanced_part_select_for_data(advanced_part_data *data, main_window *widgets);
int yon_advanced_part_check_count(main_window *widgets);
advanced_part_widgets *yon_advanced_part_get_for_name(const char *part_name,main_window *widgets);
void yon_advanced_part_create_for_part(GtkTreeIter *iter, main_window *widgets);
int yon_advanced_part_get_pos(advanced_part_widgets *part, main_window *widgets);
int yon_advanced_part_get_size(advanced_part_widgets *part, main_window *widgets);
void yon_advanced_part_update_from_data(advanced_part_widgets *part, advanced_part_data *data);
void yon_advanced_part_data_unref(advanced_part_data *data);
void on_advanced_part_content_changed(GtkWidget *, GtkWidget *, main_window *widgets);

6
ubinstall-gtk-keyboard-layouts.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-keyboard"> <interface domain="ubl-settings-keyboard">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<object class="GtkImage" id="image1"> <object class="GtkImage" id="image1">
@ -17,6 +17,7 @@
<property name="height-request">550</property> <property name="height-request">550</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="modal">True</property>
<property name="icon-name">com.ublinux.ubl-settings-keyboard</property> <property name="icon-name">com.ublinux.ubl-settings-keyboard</property>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
@ -29,6 +30,9 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="headers-visible">False</property> <property name="headers-visible">False</property>
<property name="search-column">1</property> <property name="search-column">1</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">column</property> <property name="title" translatable="yes">column</property>

3
ubinstall-gtk.glade
Unescape View File

@ -10134,6 +10134,9 @@ separately into the selected partition.</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

Write Preview
Loading…
Cancel
Save