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

WIP advanced installation rework

Browse Source
pull/250/head
Ivan Dmitrievich Yartsev 2 months ago
parent 394d610b4b
commit 10b822f768
7 changed files with 1225 additions and 1011 deletions
Show Stats Download Patch File Download Diff File

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

File diff suppressed because it is too large Load Diff

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

@ -185,10 +185,10 @@ int yon_install_same_partition_save(main_window *widgets){
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;
@ -435,7 +435,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:

2
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);

6
source/ubinstall-gtk.c
Unescape View File

@ -773,11 +773,11 @@ 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->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);
g_signal_connect(G_OBJECT(widgets->PackagesTree),"row-activated",G_CALLBACK(yon_on_packages_activated),widgets); g_signal_connect(G_OBJECT(widgets->PackagesTree),"row-activated",G_CALLBACK(yon_on_packages_activated),widgets);

67
source/ubinstall-gtk.h
Unescape View File

@ -828,7 +828,7 @@ typedef struct
enum ADVANCED_PART_TYPE part_type; enum ADVANCED_PART_TYPE part_type;
char *part; char *part;
char *device; char *device;
} advanced_partition; } advanced_part_widgets;
typedef struct typedef struct
{ {
@ -1097,7 +1097,7 @@ 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;
@ -1107,8 +1107,8 @@ typedef struct
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
{ {
@ -1361,8 +1361,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 +1392,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);
@ -1533,4 +1533,15 @@ 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_device_choose(main_window *widgets, const char *device);
void yon_advanced_part_choose(main_window *widgets, const char *part); 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(advanced_part_data *data, 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);

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