Applications
/
ubl-settings-kernel
10
0
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fixed update window size and position saving

Browse Source
pull/58/head
Ivan Dmitrievich Yartsev 10 months ago
parent 167aa1fe55
commit bf62fc28d1
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File

65
source/ubl-settings-kernel.c
Unescape View File

@ -806,11 +806,11 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){
} }
} else { } else {
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"dialog");
action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL);
} else { } else {
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"additions_dialog");
action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL);
} }
@ -819,28 +819,24 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){
gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))||self==tab->update_module_button){
gtk_widget_hide(window->DependencesFrame); gtk_widget_hide(window->DependencesFrame);
gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START);
} else { } else {
if (self!=tab->update_module_button){ int size;
int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size);
config_str additions = yon_resource_open_file(kernels_addon_path,&size); GtkTreeIter iter;
GtkTreeIter iter; for (int i=0;i<tab->module_requirements_size;i++){
for (int i=0;i<tab->module_requirements_size;i++){ gtk_list_store_append(window->liststore1,&iter);
gtk_list_store_append(window->liststore1,&iter); for (int j=1;j<size;j++){
for (int j=1;j<size;j++){ int cur_size;
int cur_size; config_str parsed = yon_char_parse(additions[j],&cur_size,";");
config_str parsed = yon_char_parse(additions[j],&cur_size,";"); if (!strcmp(parsed[1],tab->module_requirements[i]))
if (!strcmp(parsed[1],tab->module_requirements[i])) gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1);
gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); yon_char_parsed_free(parsed,cur_size);
yon_char_parsed_free(parsed,cur_size);
}
} }
yon_char_parsed_free(additions,size);
} else {
gtk_widget_hide(window->DependencesFrame);
} }
yon_char_parsed_free(additions,size);
} }
} }
@ -883,24 +879,25 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){
} else { } else {
gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL);
gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package));
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog");
if (self!=tab->update_package_button){ if (self!=tab->update_package_button){
int size; yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog");
config_str additions = yon_resource_open_file(kernels_addon_path,&size); int size;
GtkTreeIter iter; config_str additions = yon_resource_open_file(kernels_addon_path,&size);
for (int i=0;i<tab->package_requirements_size;i++){ GtkTreeIter iter;
gtk_list_store_append(window->liststore1,&iter); for (int i=0;i<tab->package_requirements_size;i++){
for (int j=1;j<size;j++){ gtk_list_store_append(window->liststore1,&iter);
int cur_size; for (int j=1;j<size;j++){
config_str parsed = yon_char_parse(additions[j],&cur_size,";"); int cur_size;
if (!strcmp(parsed[1],tab->package_requirements[i])) config_str parsed = yon_char_parse(additions[j],&cur_size,";");
gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); if (!strcmp(parsed[1],tab->package_requirements[i]))
yon_char_parsed_free(parsed,cur_size); gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1);
yon_char_parsed_free(parsed,cur_size);
}
gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1);
} }
gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); yon_char_parsed_free(additions,size);
}
yon_char_parsed_free(additions,size);
} else { } else {
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog");
gtk_widget_hide(window->DependencesFrame); gtk_widget_hide(window->DependencesFrame);
} }

Write Preview
Loading…
Cancel
Save