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

WIP Advanced installation

Browse Source
pull/102/head
Ivan Dmitrievich Yartsev 1 month ago
parent e482336d47
commit 6325315233
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B
5 changed files with 136 additions and 209 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,6 +13,18 @@ advanced_section *yon_advanced_section_new(){
return section; return section;
} }
void yon_advanced_section_remove_all(){
if (sections[0]){
free(sections[0]);
sections[0]=NULL;
}
if (sections[1]){
free(sections[1]);
sections[1]=NULL;
}
sections_size=0;
}
void yon_advanced_section_remove(char *part){ void yon_advanced_section_remove(char *part){
int pos = yon_advanced_section_get(part); int pos = yon_advanced_section_get(part);
switch(pos){ switch(pos){
@ -41,52 +53,60 @@ void yon_advanced_section_remove(char *part){
int yon_advanced_section_get(char *partition){ int yon_advanced_section_get(char *partition){
if (yon_char_is_empty(partition)) return -1; if (yon_char_is_empty(partition)) return -1;
if (sections_size>0&&!strcmp(sections[0]->part_label,partition)){ if (sections_size>0&&!strcmp(sections[0]->partition,partition)){
return 0; return 0;
} else if (sections_size>1&&!strcmp(sections[1]->part_label,partition)){ } else if (sections_size>1&&!strcmp(sections[1]->partition,partition)){
return 1; return 1;
} }
return -1; return -1;
} }
void yon_advanced_partition_set_from_section(advanced_partition *part, advanced_section *section){ void yon_advanced_partition_set_from_section(advanced_partition *part, advanced_section *section){
gtk_label_set_text(GTK_LABEL(part->SectionLabel),section->part_label); if (part&&section){
if (section->format){ gtk_label_set_text(GTK_LABEL(part->SectionLabel),section->partition);
gtk_switch_set_active(GTK_SWITCH(part->FormatSwitch),1); part->part = yon_char_new(section->partition);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(part->SizeSpin),section->size); if (section->format){
gtk_combo_box_set_active(GTK_COMBO_BOX(part->SizeCombo),yon_get_size_get_from_letter(section->size_letter)); gtk_switch_set_active(GTK_SWITCH(part->FormatSwitch),1);
gtk_entry_set_text(GTK_ENTRY(part->PartLabelEntry),section->part_label); gtk_spin_button_set_value(GTK_SPIN_BUTTON(part->SizeSpin),section->size);
gtk_entry_set_text(GTK_ENTRY(part->FileSystemLabelEntry),section->fs_label); gtk_combo_box_set_active(GTK_COMBO_BOX(part->SizeCombo),yon_get_size_get_from_letter(section->size_letter));
gtk_combo_box_set_active_id(GTK_COMBO_BOX(part->FileSystemTypeCombo),section->fs_type); gtk_entry_set_text(GTK_ENTRY(part->PartLabelEntry),section->part_label);
gtk_combo_box_set_active_id(GTK_COMBO_BOX(part->EncryptionCombo),section->encryption); gtk_entry_set_text(GTK_ENTRY(part->FileSystemLabelEntry),section->fs_label);
gtk_entry_set_text(GTK_ENTRY(part->EncryptionEntry),section->encryption_password); gtk_combo_box_set_active_id(GTK_COMBO_BOX(part->FileSystemTypeCombo),section->fs_type);
gtk_combo_box_set_active_id(GTK_COMBO_BOX(part->EncryptionCombo),section->encryption);
gtk_entry_set_text(GTK_ENTRY(part->EncryptionEntry),section->encryption_password);
}
} }
} }
void yon_advanced_update(main_window *widgets){ void yon_advanced_update(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox)); yon_advanced_partition_clear(widgets);
GList *iter;
for (iter = list; iter; iter=iter->next){
gtk_widget_destroy(GTK_WIDGET(iter->data));
}
for (int i=0;i<sections_size;i++){ for (int i=0;i<sections_size;i++){
advanced_partition *part = yon_advanced_partition_new(); advanced_partition *part = yon_advanced_partition_new();
g_signal_connect(G_OBJECT(part->RemoveButton),"clicked",G_CALLBACK(on_advanced_part_remove),widgets);
yon_advanced_partition_set_from_section(part,sections[i]); yon_advanced_partition_set_from_section(part,sections[i]);
gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0); gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0);
part->part_type = ADVANCED_PART_EXISTING;
}
if (sections_size==2){
gtk_widget_hide(widgets->AdvancedAddButton);
} else {
gtk_widget_show(widgets->AdvancedAddButton);
} }
} }
void on_advanced_partition_create(GtkWidget *, main_window *widgets){ void on_advanced_partition_create(GtkWidget *, main_window *widgets){
GtkTreeIter iter; GtkTreeIter iter, *last_found;
for_iter(GTK_TREE_MODEL(widgets->DevicesList),&iter){ for_iter(GTK_TREE_MODEL(widgets->DevicesList),&iter){
char *target; char *target;
int active; int active;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->DevicesList),&iter,0,&target,3,&active,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->DevicesList),&iter,0,&target,5,&active,-1);
gtk_list_store_set(widgets->DevicesList,&iter,3,!active,-1); if (active){
if (!active){ if (sections_size==2) break;
if (sections_size==2) return;
advanced_section *section = yon_advanced_section_new(); advanced_section *section = yon_advanced_section_new();
section->partition = target;
sections[sections_size]=section; sections[sections_size]=section;
sections_size++; sections_size++;
} }
@ -99,8 +119,8 @@ void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets){
if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->PartitionsList),&iter,path)){ if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->PartitionsList),&iter,path)){
char *target; char *target;
int status; int status;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->PartitionsList),&iter,0,&target,5,&status,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->PartitionsList),&iter,0,&target,7,&status,-1);
gtk_list_store_set(widgets->DevicesList,&iter,3,!status,-1); gtk_list_store_set(widgets->DevicesList,&iter,7,!status,-1);
if (!status){ if (!status){
if (sections_size==2) return; if (sections_size==2) return;
advanced_section *section = yon_advanced_section_new(); advanced_section *section = yon_advanced_section_new();
@ -133,22 +153,17 @@ void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_wi
if (chosen<2){ if (chosen<2){
gtk_list_store_set(widgets->PartitionsList,&iter,7,!status,-1); gtk_list_store_set(widgets->PartitionsList,&iter,7,!status,-1);
chosen++; chosen++;
advanced_partition *part = yon_advanced_partition_new();
part->part_type = ADVANCED_PART_EXISTING; advanced_section *section = yon_advanced_section_new();
part->order_iter = g_sequence_append(widgets->advanced_partition_order,part); section->partition = target_part;
part->part = target_part; sections[sections_size]=section;
gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0); sections_size++;
gtk_widget_show(part->MainBox);
yon_advanced_partition_setup(part,widgets);
on_advanced_parts_added(NULL,NULL,widgets);
} }
} else { } else {
gtk_list_store_set(widgets->PartitionsList,&iter,7,!status,-1); gtk_list_store_set(widgets->PartitionsList,&iter,7,!status,-1);
advanced_partition *part = g_object_get_data(G_OBJECT(widgets->AdvancedPartitionAddBox),target_part); yon_advanced_section_remove(target_part);
if (part){
on_advanced_part_remove(part->RemoveButton,widgets);
}
} }
yon_advanced_update(widgets);
} }
void yon_advanced_parts_update(main_window *widgets){ void yon_advanced_parts_update(main_window *widgets){
@ -215,42 +230,91 @@ void yon_advanced_parts_update(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){
gtk_list_store_clear(widgets->PartitionsList); gtk_list_store_clear(widgets->PartitionsList);
yon_advanced_partition_clear(widgets); yon_advanced_section_remove_all();
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
// int chosen = 0;
int chosen = 0; // chosen = yon_advanced_get_part_size(widgets);
chosen = yon_advanced_get_part_size(widgets);
if (gtk_tree_model_get_iter_from_string(model,&iter,path)){ if (gtk_tree_model_get_iter_from_string(model,&iter,path)){
int status; int status;
char *target; char *target;
gtk_tree_model_get(model,&iter,0,&target,5,&status,-1); gtk_tree_model_get(model,&iter,0,&target,5,&status,-1);
if (!status){ // checks if (!status){ // checks
if (chosen <2){ gtk_list_store_set(widgets->DevicesList,&iter,5,!status,-1);
gtk_list_store_set(widgets->DevicesList,&iter,5,!status,-1);
chosen++;
} else {
for_iter (model,&iter){
gtk_tree_model_get(model,&iter,5,&status,-1);
if (!status){
gtk_list_store_set(widgets->DevicesList,&iter,6,0,-1);
}
}
}
} else { // unchecks } else { // unchecks
gtk_list_store_set(widgets->DevicesList,&iter,5,!status,-1); gtk_list_store_set(widgets->DevicesList,&iter,5,!status,-1);
if (chosen == 2){ for_iter (model,&iter){
for_iter (model,&iter){ gtk_list_store_set(widgets->DevicesList,&iter,6,1,-1);
gtk_list_store_set(widgets->DevicesList,&iter,6,1,-1);
}
} }
chosen--;
} }
} }
if (chosen) gtk_widget_set_sensitive(widgets->AdvancedAddButton,1); // if (chosen) gtk_widget_set_sensitive(widgets->AdvancedAddButton,1);
else gtk_widget_set_sensitive(widgets->AdvancedAddButton,0); // else gtk_widget_set_sensitive(widgets->AdvancedAddButton,0);
yon_advanced_parts_update(widgets); yon_advanced_parts_update(widgets);
} yon_advanced_update(widgets);
}
void on_advanced_password_clicked(GtkWidget *, advanced_partition *part){
yon_password_open(GTK_ENTRY(part->EncryptionEntry));
}
void yon_advanced_partition_clear(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
GList *iter;
for (iter=list;iter;iter=iter->next){
advanced_partition *part = g_object_get_data(G_OBJECT(iter->data),"advanced_partition");
gtk_widget_destroy(GTK_WIDGET(iter->data));
free(part);
}
}
int yon_advanced_get_part_size(main_window *widgets){
int size = 0;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
size = g_list_length(list);
g_list_free(list);
return size;
}
advanced_partition *yon_advanced_partition_new(){
advanced_partition *part = new(advanced_partition);
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_advanced_part);
part->MainBox = yon_gtk_builder_get_widget(builder,"MainBox");
part->SectionLabel = yon_gtk_builder_get_widget(builder,"SectionLabel");
part->SystemSectionToggle = yon_gtk_builder_get_widget(builder,"SystemSectionToggle");
part->UserDataSectionToggle = yon_gtk_builder_get_widget(builder,"UserDataSectionToggle");
part->RemoveButton = yon_gtk_builder_get_widget(builder,"RemoveButton");
part->FormatSwitch = yon_gtk_builder_get_widget(builder,"FormatSwitch");
part->SizeSpin = yon_gtk_builder_get_widget(builder,"SizeSpin");
part->SizeCombo = yon_gtk_builder_get_widget(builder,"SizeCombo");
part->PartLabelEntry = yon_gtk_builder_get_widget(builder,"PartLabelEntry");
part->FileSystemTypeCombo = yon_gtk_builder_get_widget(builder,"FileSystemTypeCombo");
part->FileSystemLabelEntry = yon_gtk_builder_get_widget(builder,"FileSystemLabelEntry");
part->EncryptionCombo = yon_gtk_builder_get_widget(builder,"EncryptionCombo");
part->EncryptionEntry = yon_gtk_builder_get_widget(builder,"EncryptionEntry");
part->EncryptionButton = yon_gtk_builder_get_widget(builder,"EncryptionButton");
part->FormatRevealer = yon_gtk_builder_get_widget(builder,"FormatRevealer");
part->order_iter = NULL;
part->part = NULL;
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);
g_object_set_data(G_OBJECT(part->MainBox),"advanced_partition",part);
g_object_set_data(G_OBJECT(part->RemoveButton),"advanced_partition",part);
return part;
}
void on_advanced_part_remove(GtkWidget *self, main_window *widgets){
advanced_partition *part = g_object_get_data(G_OBJECT(self),"advanced_partition");
yon_advanced_section_remove(part->part);
yon_advanced_update(widgets);
}

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

@ -578,139 +578,4 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
} }
} }
} }
void on_advanced_password_clicked(GtkWidget *, advanced_partition *part){
yon_password_open(GTK_ENTRY(part->EncryptionEntry));
}
void yon_advanced_partition_clear(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
GList *iter;
for (iter=list;iter;iter=iter->next){
advanced_partition *part = g_object_get_data(G_OBJECT(iter->data),"advanced_partition");
gtk_widget_destroy(GTK_WIDGET(iter->data));
free(part);
}
on_advanced_parts_removed(NULL,NULL,widgets);
}
int yon_advanced_get_part_size(main_window *widgets){
int size = 0;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
size = g_list_length(list);
g_list_free(list);
return size;
}
void yon_advanced_set_part_sensitivity(main_window *widgets, gboolean state){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PartitionsList);
int status;
for_iter(model,&iter){
gtk_tree_model_get(model,&iter,8,&status,-1);
if (!status){
gtk_list_store_set(widgets->PartitionsList,&iter,8,state?state:0,-1);
} else {
gtk_list_store_set(widgets->PartitionsList,&iter,8,1,-1);
}
}
}
void yon_advanced_set_device_sensitivity(main_window *widgets, gboolean state){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
for_iter(model,&iter){
gtk_list_store_set(widgets->DevicesList,&iter,6,state,-1);
}
}
advanced_partition *yon_advanced_partition_new(){
advanced_partition *part = new(advanced_partition);
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_advanced_part);
part->MainBox = yon_gtk_builder_get_widget(builder,"MainBox");
part->SectionLabel = yon_gtk_builder_get_widget(builder,"SectionLabel");
part->SystemSectionToggle = yon_gtk_builder_get_widget(builder,"SystemSectionToggle");
part->UserDataSectionToggle = yon_gtk_builder_get_widget(builder,"UserDataSectionToggle");
part->RemoveButton = yon_gtk_builder_get_widget(builder,"RemoveButton");
part->FormatSwitch = yon_gtk_builder_get_widget(builder,"FormatSwitch");
part->SizeSpin = yon_gtk_builder_get_widget(builder,"SizeSpin");
part->SizeCombo = yon_gtk_builder_get_widget(builder,"SizeCombo");
part->PartLabelEntry = yon_gtk_builder_get_widget(builder,"PartLabelEntry");
part->FileSystemTypeCombo = yon_gtk_builder_get_widget(builder,"FileSystemTypeCombo");
part->FileSystemLabelEntry = yon_gtk_builder_get_widget(builder,"FileSystemLabelEntry");
part->EncryptionCombo = yon_gtk_builder_get_widget(builder,"EncryptionCombo");
part->EncryptionEntry = yon_gtk_builder_get_widget(builder,"EncryptionEntry");
part->EncryptionButton = yon_gtk_builder_get_widget(builder,"EncryptionButton");
part->FormatRevealer = yon_gtk_builder_get_widget(builder,"FormatRevealer");
part->order_iter = NULL;
part->part = NULL;
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);
g_object_set_data(G_OBJECT(part->MainBox),"advanced_partition",part);
g_object_set_data(G_OBJECT(part->RemoveButton),"advanced_partition",part);
return part;
}
void on_advanced_part_remove(GtkWidget *self, main_window *widgets){
advanced_partition *part = g_object_get_data(G_OBJECT(self),"advanced_partition");
if (part->part_type == ADVANCED_PART_EXISTING){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PartitionsList);
for_iter(model,&iter){
int status;
char *target;
gtk_tree_model_get(model,&iter,0,&target,7,&status,-1);
if (status&&!strcmp(target,part->part)){
gtk_list_store_set(GTK_LIST_STORE(model),&iter,7,0,-1);
yon_advanced_set_part_sensitivity(widgets,1);
}
}
}
g_object_set_data(G_OBJECT(widgets->AdvancedPartitionAddBox),part->part,NULL);
g_sequence_remove(part->order_iter);
gtk_widget_destroy(part->MainBox);
on_advanced_parts_removed(NULL,NULL,widgets);
free(part);
}
void on_advanced_parts_added(GtkWidget *,GtkWidget*,main_window *widgets){
if (yon_advanced_get_part_size(widgets)>=2){
yon_advanced_set_part_sensitivity(widgets,0);
gtk_widget_hide(widgets->AdvancedAddButton);
}
}
void on_advanced_parts_removed(GtkWidget *,GtkWidget*,main_window *widgets){
int size = yon_advanced_get_part_size(widgets);
if (size<2){
yon_advanced_set_part_sensitivity(widgets,1);
gtk_widget_show(widgets->AdvancedAddButton);
}
if (!size){
}
}
void yon_advanced_partition_setup(advanced_partition *part,main_window *widgets){
g_signal_connect(G_OBJECT(part->RemoveButton),"clicked",G_CALLBACK(on_advanced_part_remove),widgets);
g_object_set_data(G_OBJECT(widgets->AdvancedPartitionAddBox),part->part,part);
}
void on_install_advanced_add_new(GtkWidget *, main_window *widgets){
advanced_partition *part = yon_advanced_partition_new();
part->part_type = ADVANCED_PART_NEW;
part->order_iter = g_sequence_append(widgets->advanced_partition_order,part);
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);
}

12
source/ubinstall-gtk.c
Unescape View File

@ -455,7 +455,11 @@ void set_locales_list(main_window *widgets){
char *lang_name = yon_locale_get_parameter(locales[i],YON_LOCALE_LANG_NAME); char *lang_name = yon_locale_get_parameter(locales[i],YON_LOCALE_LANG_NAME);
char *territory = yon_locale_get_parameter(locales[i],YON_LOCALE_TERRITORY); char *territory = yon_locale_get_parameter(locales[i],YON_LOCALE_TERRITORY);
char *title = yon_locale_get_parameter(locales[i],YON_LOCALE_TITLE); char *title = yon_locale_get_parameter(locales[i],YON_LOCALE_TITLE);
if (yon_char_is_empty(lang_ab)||yon_char_is_empty(language)||yon_char_is_empty(lang_name)||yon_char_is_empty(territory)||yon_char_is_empty(title)) continue; if (yon_char_is_empty(lang_ab)||
yon_char_is_empty(language)||
yon_char_is_empty(lang_name)||
yon_char_is_empty(territory)||
yon_char_is_empty(title)) continue;
char *country = yon_char_unite(language,", ",territory,NULL); char *country = yon_char_unite(language,", ",territory,NULL);
if (!g_hash_table_contains(added,lang_ab)){ if (!g_hash_table_contains(added,lang_ab)){
g_hash_table_add(added,yon_char_new(lang_ab)); g_hash_table_add(added,yon_char_new(lang_ab));
@ -888,15 +892,15 @@ void yon_main_window_create(main_window *widgets){
// g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_install_advanced_add_new),widgets); // 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); g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),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->KeyboardLayoutChosenCell),"toggled",G_CALLBACK(on_keyboard_layout_chosen),widgets); g_signal_connect(G_OBJECT(widgets->KeyboardLayoutChosenCell),"toggled",G_CALLBACK(on_keyboard_layout_chosen),widgets);
// g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"add",G_CALLBACK(on_advanced_parts_added),widgets); // g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"add",G_CALLBACK(on_advanced_parts_added),widgets);
// g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"remove",G_CALLBACK(on_advanced_parts_removed),widgets); // g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"remove",G_CALLBACK(on_advanced_parts_removed),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->SkipInstallationButton),"clicked",G_CALLBACK(on_system_setup_pass),widgets); g_signal_connect(G_OBJECT(widgets->SkipInstallationButton),"clicked",G_CALLBACK(on_system_setup_pass),widgets);
// g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_advanced_new),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_advanced_partition_create),widgets);
// g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_advanced_added),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedPartChosenCell),"toggled",G_CALLBACK(on_install_advanced_partition_chosen),widgets);
gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL); gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL);
{ {

9
source/ubinstall-gtk.h
Unescape View File

@ -1110,19 +1110,13 @@ void yon_install_advanced_init(main_window *widgets);
void yon_os_components_init(main_window *widgets); void yon_os_components_init(main_window *widgets);
void yon_pacman_init(main_window *widgets); void yon_pacman_init(main_window *widgets);
void yon_software_init(main_window *widgets); void yon_software_init(main_window *widgets);
void on_install_advanced_add_new(GtkWidget *, 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_partition *part);
advanced_partition *yon_advanced_partition_new(); advanced_partition *yon_advanced_partition_new();
void yon_advanced_partition_setup(advanced_partition *part,main_window *widgets);
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_set_part_sensitivity(main_window *widgets, gboolean state);
void yon_advanced_set_device_sensitivity(main_window *widgets, gboolean state);
void on_advanced_parts_removed(GtkWidget *,GtkWidget*,main_window *widgets);
void on_advanced_parts_added(GtkWidget *,GtkWidget*,main_window *widgets);
void yon_advanced_partition_clear(main_window *widgets); void yon_advanced_partition_clear(main_window *widgets);
void yon_layout_build(char *key, GHashTable *value, main_window *widgets); void yon_layout_build(char *key, GHashTable *value, main_window *widgets);
void yon_os_row_setup(os_row *row, char *name, char *version,char *tags, char *description); void yon_os_row_setup(os_row *row, char *name, char *version,char *tags, char *description);
@ -1161,4 +1155,5 @@ void yon_advanced_partition_set_from_section(advanced_partition *part, advanced_
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();

1
ubinstall-gtk.glade
Unescape View File

@ -7174,7 +7174,6 @@ separately into the selected partition.</property>
<object class="GtkButton" id="AdvancedAddButton"> <object class="GtkButton" id="AdvancedAddButton">
<property name="label" translatable="yes">+</property> <property name="label" translatable="yes">+</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<style> <style>

Write Preview
Loading…
Cancel
Save