rodion.n
/
ubinstall-gtk
forked from YanTheKaller/ubinstall-gtk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed saving and loading

Browse Source
master
Ivan Dmitrievich Yartsev 4 months ago
parent a000cb60a9
commit 19d8ecf7d6
6 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File

19
source/ubinstall-gtk-components.c
Unescape View File

@ -20,13 +20,12 @@ int yon_kernel_save(main_window *widgets){
} }
} }
if (yon_char_is_empty(enabled_module)){ if (!yon_char_is_empty(enabled_module)){
yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_parameter_command,enabled_module); yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_parameter_command,enabled_module);
} else { } else {
yon_config_remove_by_key(KERNEL_BOOT_parameter); yon_config_remove_by_key(KERNEL_BOOT_parameter);
} }
return 1; return 1;
} }
@ -124,6 +123,10 @@ gboolean yon_os_component_insert(struct row_data *row_input){
main_window *widgets = row_input->widgets; main_window *widgets = row_input->widgets;
gtk_list_box_insert(GTK_LIST_BOX(widgets->OSSoftwareListBox),row->row,-1); gtk_list_box_insert(GTK_LIST_BOX(widgets->OSSoftwareListBox),row->row,-1);
yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,row_input->description); yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,row_input->description);
char *modules = config(modules_parameter);
if (yon_char_is_empty(modules)){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1);
}
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -201,6 +204,9 @@ int yon_software_save(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *iter; GList *iter;
char *config_val = config(modules_extra_parameter); char *config_val = config(modules_extra_parameter);
if (yon_char_is_empty(config_val)){
yon_config_register(modules_extra_parameter,modules_extra_parameter_command,"");
}
for(iter = list;iter;iter=iter->next){ for(iter = list;iter;iter=iter->next){
os_row *row = g_object_get_data(iter->data,"kernel_row"); os_row *row = g_object_get_data(iter->data,"kernel_row");
char *target = row->name; char *target = row->name;
@ -221,7 +227,14 @@ gboolean yon_software_insert(struct row_data *row_input){
main_window *widgets = row_input->widgets; main_window *widgets = row_input->widgets;
gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1); gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1);
yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,row_input->description); yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,row_input->description);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
char *modules = config(modules_extra_parameter);
if (yon_char_check_element(modules,row_input->name,",")){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1);
} else {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
}
// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }

24
source/ubinstall-gtk-keyboard.c
Unescape View File

@ -13,8 +13,15 @@ int yon_keyboard_save(main_window *widgets){
char *final = NULL; char *final = NULL;
for_iter(widgets->LayoutsList, &iter){ for_iter(widgets->LayoutsList, &iter){
char *target; char *target;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->LayoutsList),&iter,0,&target,-1); char *code;
char *temp = yon_char_append_element(final,target,","); gtk_tree_model_get(GTK_TREE_MODEL(widgets->LayoutsList),&iter,0,&target,1,&code,-1);
char *temp = NULL;
if (!yon_char_is_empty(code)){
char *tmp = yon_char_unite(target,"_",code,NULL);
temp = yon_char_append_element(final,tmp,",");
} else {
temp = yon_char_append_element(final,target,",");
}
if (!yon_char_is_empty(final)) free(final); if (!yon_char_is_empty(final)) free(final);
final = temp; final = temp;
} }
@ -149,6 +156,7 @@ void on_layouts_accept(GtkWidget *self, layouts_window *window){
main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets"); main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets");
gtk_list_store_clear(widgets->LayoutsList); gtk_list_store_clear(widgets->LayoutsList);
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeIter child_iter;
for_iter (window->list,&iter){ for_iter (window->list,&iter){
int active; int active;
char *target; char *target;
@ -156,6 +164,18 @@ void on_layouts_accept(GtkWidget *self, layouts_window *window){
if (active){ if (active){
yon_layout_load(target,widgets); yon_layout_load(target,widgets);
} }
if (gtk_tree_model_iter_children(GTK_TREE_MODEL(window->list),&child_iter,&iter)){
for (int valid2=1;valid2;valid2=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&child_iter)){
char *code;
gtk_tree_model_get(GTK_TREE_MODEL(window->list),&child_iter,0,&target,1,&code,3,&active,-1);
if (active){
char *full_code = yon_char_unite(target,"_",code,NULL);
yon_layout_load(full_code,widgets);
free(full_code);
}
}
}
} }
on_subwindow_close(self); on_subwindow_close(self);
} }

5
source/ubinstall-gtk-network.c
Unescape View File

@ -286,6 +286,11 @@ int yon_network_save(main_window *widgets){
} }
void yon_network_init(main_window *widgets){ void yon_network_init(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->NetworkConnectionsBox));
GList *iter;
for (iter=list;iter;iter=iter->next){
gtk_widget_destroy(list->data);
}
int size; int size;
config_str network_types = yon_resource_open_file(network_path,&size); config_str network_types = yon_resource_open_file(network_path,&size);
for (int i=1;i<size;i++){ for (int i=1;i<size;i++){

11
ubinstall-gtk-network-box.glade
Unescape View File

@ -156,17 +156,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkRevealer" id="IpRevealer"> <object class="GtkRevealer" id="IpRevealer">
<property name="visible">True</property> <property name="visible">True</property>

1
ubinstall-gtk-os-row.glade
Unescape View File

@ -12,7 +12,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="active">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">

18
ubinstall-gtk.glade
Unescape View File

@ -12150,6 +12150,11 @@ separately into the selected partition.</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="active">1</property> <property name="active">1</property>
<property name="has-entry">True</property> <property name="has-entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can-focus">False</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -12255,7 +12260,9 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkEntry" id="OSFormatEncryptionEntry"> <object class="GtkEntry" id="OSFormatEncryptionEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="visibility">False</property>
<property name="invisible-char">*</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -12961,6 +12968,11 @@ separately into the selected partition.</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="active">1</property> <property name="active">1</property>
<property name="has-entry">True</property> <property name="has-entry">True</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can-focus">False</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -13065,7 +13077,9 @@ separately into the selected partition.</property>
<child> <child>
<object class="GtkEntry" id="UserdataFormatEncryptionEntry"> <object class="GtkEntry" id="UserdataFormatEncryptionEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="visibility">False</property>
<property name="invisible-char">*</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

Write Preview
Loading…
Cancel
Save