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

master #385

Merged
asmeron merged 15 commits from YanTheKaller/ubinstall-gtk:master into master 2 weeks ago
Conversation 0 Commits 15 Files Changed 13
13 changed files with 303 additions and 163 deletions
Show Stats Download Patch File Download Diff File

54
icons/emblems/com.ublinux.ubinstall-gtk.configuration.svg
Unescape View File

@ -0,0 +1,54 @@
<svg width="746" height="746" viewBox="0 0 746 746" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M636 164.11L517.026 41V158.11C517.026 161.424 519.712 164.11 523.026 164.11H636Z" fill="#C7C7C7"/>
<path d="M115 41C111.686 41 109 43.6863 109 47V699C109 702.314 111.686 705 115 705H630C633.314 705 636 702.314 636 699V164.11H523.026C519.712 164.11 517.026 161.424 517.026 158.11V41H115Z" fill="#F9F9F9"/>
<g filter="url(#filter0_d_74_73)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M315.015 118.178C319.65 119.7 324.125 121.584 328.406 123.795C330.122 124.682 332.163 124.701 333.856 123.768L362.65 107.899C364.641 106.802 367.095 107.01 368.825 108.492C374.244 113.133 379.276 118.223 383.863 123.707C385.327 125.457 385.533 127.94 384.448 129.954L368.764 159.087C367.842 160.799 367.861 162.864 368.737 164.601C370.923 168.933 372.785 173.46 374.289 178.15C374.884 180.004 376.314 181.477 378.162 182.028L409.611 191.406C411.786 192.055 413.377 193.959 413.563 196.246C413.853 199.792 414 203.379 414 207C414 210.621 413.853 214.208 413.563 217.754C413.377 220.041 411.786 221.945 409.611 222.594L378.162 231.972C376.314 232.523 374.884 233.996 374.289 235.85C372.785 240.54 370.923 245.067 368.737 249.399C367.861 251.136 367.842 253.201 368.764 254.913L384.448 284.046C385.533 286.06 385.327 288.543 383.863 290.293C379.276 295.777 374.244 300.867 368.825 305.508C367.095 306.99 364.641 307.198 362.65 306.101L333.856 290.232C332.163 289.299 330.122 289.318 328.406 290.205C324.125 292.416 319.65 294.3 315.015 295.822C313.182 296.424 311.727 297.87 311.182 299.74L301.912 331.559C301.271 333.76 299.389 335.369 297.129 335.558C293.624 335.851 290.079 336 286.5 336C282.921 336 279.376 335.851 275.871 335.558C273.611 335.369 271.729 333.76 271.088 331.559L261.818 299.74C261.273 297.87 259.818 296.424 257.985 295.822C253.35 294.3 248.875 292.416 244.594 290.205C242.878 289.318 240.837 289.299 239.144 290.232L210.35 306.101C208.359 307.198 205.905 306.99 204.175 305.508C198.756 300.867 193.724 295.777 189.137 290.293C187.673 288.543 187.467 286.06 188.552 284.046L204.236 254.913C205.158 253.201 205.139 251.136 204.263 249.399C202.077 245.067 200.215 240.54 198.711 235.85C198.116 233.996 196.686 232.523 194.838 231.972L163.389 222.594C161.214 221.945 159.623 220.041 159.437 217.754C159.147 214.208 159 210.621 159 207C159 203.379 159.147 199.792 159.437 196.246C159.623 193.959 161.214 192.055 163.389 191.406L194.838 182.028C196.686 181.477 198.116 180.004 198.711 178.15C200.215 173.46 202.077 168.933 204.263 164.601C205.139 162.864 205.158 160.799 204.236 159.087L188.552 129.954C187.467 127.94 187.673 125.457 189.137 123.707C193.724 118.223 198.756 113.133 204.175 108.492C205.905 107.01 208.359 106.802 210.35 107.899L239.144 123.768C240.837 124.701 242.878 124.682 244.594 123.795C248.875 121.584 253.35 119.7 257.985 118.178C259.818 117.576 261.273 116.13 261.818 114.26L271.088 82.441C271.729 80.2399 273.611 78.6306 275.871 78.4419C279.376 78.1492 282.921 78 286.5 78C290.079 78 293.624 78.1492 297.129 78.4419C299.389 78.6306 301.271 80.2399 301.912 82.441L311.182 114.26C311.727 116.13 313.182 117.576 315.015 118.178ZM286.5 269.006C320.347 269.006 347.785 241.245 347.785 207C347.785 172.755 320.347 144.994 286.5 144.994C252.653 144.994 225.215 172.755 225.215 207C225.215 241.245 252.653 269.006 286.5 269.006Z" fill="#73819E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M347.785 207C347.785 241.245 320.347 269.006 286.5 269.006C252.653 269.006 225.215 241.245 225.215 207C225.215 172.755 252.653 144.994 286.5 144.994C320.347 144.994 347.785 172.755 347.785 207ZM287.204 240.497C305.1 240.497 319.608 225.819 319.608 207.713C319.608 189.606 305.1 174.928 287.204 174.928C269.309 174.928 254.801 189.606 254.801 207.713C254.801 225.819 269.309 240.497 287.204 240.497Z" fill="#BAC0CD"/>
</g>
<path d="M605.982 305C609.858 305 613 311.94 613 320.5C613 329.06 609.858 336 605.982 336H450.018C446.142 336 443 329.06 443 320.5C443 311.94 446.142 305 450.018 305H605.982Z" fill="#C7C7C7"/>
<path d="M605.982 237C609.858 237 613 243.94 613 252.5C613 261.06 609.858 268 605.982 268H450.018C446.142 268 443 261.06 443 252.5C443 243.94 446.142 237 450.018 237H605.982Z" fill="#C7C7C7"/>
<path d="M608.408 398C615.362 398 621 404.94 621 413.5C621 422.06 615.362 429 608.408 429H328.592C321.638 429 316 422.06 316 413.5C316 404.94 321.638 398 328.592 398H608.408Z" fill="#C7C7C7"/>
<path d="M594.257 576C604.608 576 613 582.94 613 591.5C613 600.06 604.608 607 594.257 607H177.743C167.392 607 159 600.06 159 591.5C159 582.94 167.392 576 177.743 576H594.257Z" fill="#C7C7C7"/>
<g filter="url(#filter1_d_74_73)">
<rect x="159" y="385" width="132" height="57" rx="28.5" fill="#2470D3"/>
</g>
<rect x="239" y="390" width="47" height="47" rx="23.5" fill="white"/>
<g filter="url(#filter2_d_74_73)">
<rect x="159" y="482" width="454" height="54" rx="18" fill="white"/>
<rect x="161" y="484" width="450" height="50" rx="16" stroke="#C7C7C7" stroke-width="4"/>
</g>
<path d="M595 484C603.837 484 611 491.163 611 500V518C611 526.837 603.837 534 595 534H554V484H595Z" fill="white" stroke="#C7C7C7" stroke-width="4"/>
<path d="M597.177 498C598.792 498 599.741 499.814 598.82 501.14L586.326 519.14C585.952 519.679 585.338 520 584.683 520H580.365C579.711 520 579.098 519.68 578.724 519.143L566.189 501.143C565.265 499.817 566.214 498 567.83 498H570.007C570.666 498 571.282 498.324 571.656 498.867L581.084 512.584C581.877 513.737 583.579 513.741 584.376 512.59L593.895 498.861C594.268 498.322 594.882 498 595.538 498H597.177Z" fill="#C7C7C7"/>
<defs>
<filter id="filter0_d_74_73" x="155" y="78" width="263" height="266" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_74_73"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_74_73" result="shape"/>
</filter>
<filter id="filter1_d_74_73" x="155" y="385" width="140" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_74_73"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_74_73" result="shape"/>
</filter>
<filter id="filter2_d_74_73" x="155" y="482" width="462" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_74_73"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_74_73" result="shape"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

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

@ -349,8 +349,8 @@ void yon_os_components_init(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
GList *iter; GList *iter;
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");
free(row); // free(row);
gtk_widget_destroy(GTK_WIDGET(iter->data)); gtk_widget_destroy(GTK_WIDGET(iter->data));
} }
if (!gtk_widget_get_parent(widgets->OSSpinner)) if (!gtk_widget_get_parent(widgets->OSSpinner))
@ -484,6 +484,7 @@ gboolean yon_software_insert(struct row_data *row_input){
config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";"); config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";");
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]); yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
while(gtk_events_pending()) gtk_main_iteration();
} }
modules_param = yon_char_parsed_to_string(final,final_size,","); modules_param = yon_char_parsed_to_string(final,final_size,",");
} else if (!yon_char_is_empty(modules_prm)){ } else if (!yon_char_is_empty(modules_prm)){
@ -496,6 +497,7 @@ gboolean yon_software_insert(struct row_data *row_input){
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]); yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
while(gtk_events_pending()) gtk_main_iteration();
} }
modules_param = yon_char_parsed_to_string(final,final_size,","); modules_param = yon_char_parsed_to_string(final,final_size,",");
} }
@ -508,7 +510,6 @@ gboolean yon_software_insert(struct row_data *row_input){
} }
void yon_software_init(main_window *widgets){ void yon_software_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){ if (!main_config.configure_mode){
yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL); yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL);
} }
@ -518,6 +519,7 @@ void yon_software_init(main_window *widgets){
os_row *row = g_object_get_data(iter->data,"kernel_row"); os_row *row = g_object_get_data(iter->data,"kernel_row");
free(row); free(row);
gtk_widget_destroy(GTK_WIDGET(iter->data)); gtk_widget_destroy(GTK_WIDGET(iter->data));
while(gtk_events_pending()) gtk_main_iteration();
} }
int base_size; int base_size;
config_str base = yon_packages_find(YON_PACKAGES_ALL,"ubm-",(gsize*)&base_size); config_str base = yon_packages_find(YON_PACKAGES_ALL,"ubm-",(gsize*)&base_size);
@ -548,6 +550,7 @@ void yon_software_init(main_window *widgets){
row->size = size_str; row->size = size_str;
row->widgets=widgets; row->widgets=widgets;
g_idle_add((GSourceFunc)yon_software_insert,row); g_idle_add((GSourceFunc)yon_software_insert,row);
while(gtk_events_pending()) gtk_main_iteration();
} }
g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner); g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner);
yon_char_parsed_free(base,base_size); yon_char_parsed_free(base,base_size);
@ -585,7 +588,6 @@ int yon_pacman_software_save(main_window *widgets){
} }
void yon_pacman_init(main_window *widgets){ void yon_pacman_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){ if (!main_config.configure_mode){
yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL); yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL);
} }
@ -606,6 +608,7 @@ void yon_pacman_init(main_window *widgets){
gtk_list_store_append(widgets->PacmanSoftwareChosenList,&iter); gtk_list_store_append(widgets->PacmanSoftwareChosenList,&iter);
gtk_list_store_set(widgets->PacmanSoftwareChosenList,&iter,0,1,1,parsed[i],2,version,3,_(description),4,size_str,6,1,-1); gtk_list_store_set(widgets->PacmanSoftwareChosenList,&iter,0,1,1,parsed[i],2,version,3,_(description),4,size_str,6,1,-1);
free(size_str); free(size_str);
while(gtk_events_pending()) gtk_main_iteration();
} }
yon_char_parsed_free(parsed,size); yon_char_parsed_free(parsed,size);
@ -633,6 +636,7 @@ void yon_pacman_init(main_window *widgets){
} }
modules_packages = yon_char_parsed_to_string(final,final_size,","); modules_packages = yon_char_parsed_to_string(final,final_size,",");
} }
while(gtk_events_pending()) gtk_main_iteration();
parsed = yon_char_parse(modules_packages,&size,","); parsed = yon_char_parse(modules_packages,&size,",");
for (int i=1;i<size;i++){ for (int i=1;i<size;i++){
@ -646,6 +650,7 @@ void yon_pacman_init(main_window *widgets){
gtk_list_store_append(widgets->PacmanSoftwareChosenList,&iter); gtk_list_store_append(widgets->PacmanSoftwareChosenList,&iter);
gtk_list_store_set(widgets->PacmanSoftwareChosenList,&iter,0,1,1,parsed[i],2,version,3,_(description),4,size_str,6,0,-1); gtk_list_store_set(widgets->PacmanSoftwareChosenList,&iter,0,1,1,parsed[i],2,version,3,_(description),4,size_str,6,0,-1);
free(size_str); free(size_str);
while(gtk_events_pending()) gtk_main_iteration();
} }
yon_pacman_software_update_overall_size(widgets); yon_pacman_software_update_overall_size(widgets);
yon_char_parsed_free(parsed,size); yon_char_parsed_free(parsed,size);

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

@ -236,6 +236,17 @@ void on_configuration_hub_open(GtkFlowBox *,GtkFlowBoxChild *child, main_window
config_hub_icon *cur_icon = g_object_get_data(G_OBJECT(child),"config_hub_icon"); config_hub_icon *cur_icon = g_object_get_data(G_OBJECT(child),"config_hub_icon");
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),cur_icon->page); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),cur_icon->page);
switch(cur_icon->page){
case YON_PAGE_OS_COMPONENTS:
case YON_PAGE_KERNEL:
case YON_PAGE_KERNEL_ADDON:
case YON_PAGE_PACMAN_SOFTWARE:
case YON_PAGE_SOFTWARE:
case YON_PAGE_PACKAGES:
on_status_button_update(NULL,widgets);
break;
default: break;
};
yon_page_init(widgets,cur_icon->page); yon_page_init(widgets,cur_icon->page);
yon_page_update(widgets); yon_page_update(widgets);
} }

3
source/ubinstall-gtk-install-start.c
Unescape View File

@ -3,6 +3,7 @@
int yon_installation_start(main_window *widgets){ int yon_installation_start(main_window *widgets){
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
return !pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); return !pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
return 1;
} }
void yon_quick_install(GtkWidget *self, main_window *widgets){ void yon_quick_install(GtkWidget *self, main_window *widgets){
@ -10,7 +11,7 @@ void yon_quick_install(GtkWidget *self, main_window *widgets){
main_config.save_configured=1; main_config.save_configured=1;
gtk_widget_hide(self); gtk_widget_hide(self);
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
// pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
if (!yon_char_is_empty(main_config.config_load_path)){ if (!yon_char_is_empty(main_config.config_load_path)){
char *command = quick_install_command(main_config.config_load_path); char *command = quick_install_command(main_config.config_load_path);

15
source/ubinstall-gtk-kernel.c
Unescape View File

@ -113,6 +113,7 @@ void yon_kernel_row_setup_tags(kernel_row *row, char *tags){
tag_type = "tag_green"; tag_type = "tag_green";
}; };
yon_tag_add(GTK_BOX(row->TagsBox),tag_name,tag_type,NULL); yon_tag_add(GTK_BOX(row->TagsBox),tag_name,tag_type,NULL);
while(gtk_events_pending()) gtk_main_iteration();
} }
} }
@ -127,6 +128,7 @@ void yon_kernel_row_setup(kernel_row *row, char *name, char *modules,char *packa
config_str description_wrapped = yon_char_wrap_to_lines(description_full,3,&size); config_str description_wrapped = yon_char_wrap_to_lines(description_full,3,&size);
description_full = yon_char_parsed_to_string(description_wrapped,size,"\n"); description_full = yon_char_parsed_to_string(description_wrapped,size,"\n");
yon_char_parsed_free(description_wrapped,size); yon_char_parsed_free(description_wrapped,size);
while(gtk_events_pending()) gtk_main_iteration();
} }
int modules_size=0; int modules_size=0;
config_str modules_parsed = yon_char_parse(modules,&modules_size," "); config_str modules_parsed = yon_char_parse(modules,&modules_size," ");
@ -135,6 +137,7 @@ void yon_kernel_row_setup(kernel_row *row, char *name, char *modules,char *packa
char *temp = yon_char_unite("<a href=\"",modules_parsed[i],"\">",modules_parsed[i],"</a>",NULL); char *temp = yon_char_unite("<a href=\"",modules_parsed[i],"\">",modules_parsed[i],"</a>",NULL);
free(modules_parsed[i]); free(modules_parsed[i]);
modules_parsed[i] = temp; modules_parsed[i] = temp;
while(gtk_events_pending()) gtk_main_iteration();
} }
char *modules_final = yon_char_parsed_to_string(modules_parsed,modules_size,"\n"); char *modules_final = yon_char_parsed_to_string(modules_parsed,modules_size,"\n");
gtk_label_set_markup(GTK_LABEL(row->NameLabel),label_markup); gtk_label_set_markup(GTK_LABEL(row->NameLabel),label_markup);
@ -168,6 +171,7 @@ void yon_kernel_resize(main_window *widgets){
gtk_widget_get_preferred_width(row->ModulesLabel,&cur_modules_size,NULL); gtk_widget_get_preferred_width(row->ModulesLabel,&cur_modules_size,NULL);
if (name_size<cur_name_size) name_size=cur_name_size; if (name_size<cur_name_size) name_size=cur_name_size;
if (modules_size<cur_modules_size) modules_size=cur_modules_size; if (modules_size<cur_modules_size) modules_size=cur_modules_size;
while(gtk_events_pending()) gtk_main_iteration();
} }
gtk_widget_set_size_request(GTK_WIDGET(widgets->KernelNameLabel),name_size,-1); gtk_widget_set_size_request(GTK_WIDGET(widgets->KernelNameLabel),name_size,-1);
gtk_widget_set_size_request(GTK_WIDGET(widgets->KernelModulesLabel),modules_size,-1); gtk_widget_set_size_request(GTK_WIDGET(widgets->KernelModulesLabel),modules_size,-1);
@ -177,6 +181,7 @@ void yon_kernel_resize(main_window *widgets){
gtk_widget_set_size_request(GTK_WIDGET(row->EnableRadio),enable_size,-1); gtk_widget_set_size_request(GTK_WIDGET(row->EnableRadio),enable_size,-1);
gtk_widget_set_size_request(row->NameLabel,name_size,-1); gtk_widget_set_size_request(row->NameLabel,name_size,-1);
gtk_widget_set_size_request(row->ModulesLabel,modules_size,-1); gtk_widget_set_size_request(row->ModulesLabel,modules_size,-1);
while(gtk_events_pending()) gtk_main_iteration();
} }
g_list_free(list); g_list_free(list);
} }
@ -208,10 +213,10 @@ void yon_kernel_addon_resize(main_window *widgets){
} }
void yon_kernel_init(main_window *widgets){ void yon_kernel_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){ if (!main_config.configure_mode){
yon_config_update_by_args(main_config.config_load_path, packages_parameter,KERNEL_BOOT_parameter,NULL); yon_config_update_by_args(main_config.config_load_path, packages_parameter,KERNEL_BOOT_parameter,NULL);
} }
while(gtk_events_pending()) gtk_main_iteration();
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox));
GList *iter; GList *iter;
for (iter = list; iter; iter = iter->next){ for (iter = list; iter; iter = iter->next){
@ -222,6 +227,7 @@ void yon_kernel_init(main_window *widgets){
free(row); free(row);
gtk_widget_destroy(GTK_WIDGET(iter->data)); gtk_widget_destroy(GTK_WIDGET(iter->data));
} }
while(gtk_events_pending()) gtk_main_iteration();
} }
g_list_free(list); g_list_free(list);
@ -234,6 +240,7 @@ void yon_kernel_init(main_window *widgets){
modules_parsed = yon_char_parse(modules,&modules_size,","); modules_parsed = yon_char_parse(modules,&modules_size,",");
} }
while(gtk_events_pending()) gtk_main_iteration();
int size; int size;
config_str kernels = yon_resource_open_file(kernel_list_path,&size); config_str kernels = yon_resource_open_file(kernel_list_path,&size);
gtk_size_group_add_widget(widgets->KernelSizeGroup,widgets->KernelTagsLabel); gtk_size_group_add_widget(widgets->KernelSizeGroup,widgets->KernelTagsLabel);
@ -256,6 +263,7 @@ void yon_kernel_init(main_window *widgets){
yon_kernel_row_setup(row,name,modules,package,tags,description); yon_kernel_row_setup(row,name,modules,package,tags,description);
while(gtk_events_pending()) gtk_main_iteration();
if (yon_char_parsed_check_exist(modules_parsed,modules_size,parsed[1])>-1){ if (yon_char_parsed_check_exist(modules_parsed,modules_size,parsed[1])>-1){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1);
} else { } else {
@ -269,6 +277,7 @@ void yon_kernel_init(main_window *widgets){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1);
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
while(gtk_events_pending()) gtk_main_iteration();
} }
yon_kernel_resize(widgets); yon_kernel_resize(widgets);
@ -419,11 +428,11 @@ void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules
} }
void yon_kernel_addon_init(main_window *widgets){ void yon_kernel_addon_init(main_window *widgets){
on_status_update(NULL,widgets);
yon_config_remove_by_args(packages_parameter,NULL); yon_config_remove_by_args(packages_parameter,NULL);
char *command = yon_config_parameter_prepare_command(packages_parameter_command,main_config.config_load_path,NULL,NULL); char *command = yon_config_parameter_prepare_command(packages_parameter_command,main_config.config_load_path,NULL,NULL);
yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL); yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL);
free(command); free(command);
while(gtk_events_pending()) gtk_main_iteration();
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
GList *iter; GList *iter;
for (iter = list; iter; iter = iter->next){ for (iter = list; iter; iter = iter->next){
@ -434,6 +443,7 @@ void yon_kernel_addon_init(main_window *widgets){
free(row); free(row);
gtk_widget_destroy(GTK_WIDGET(iter->data)); gtk_widget_destroy(GTK_WIDGET(iter->data));
} }
while(gtk_events_pending()) gtk_main_iteration();
} }
g_list_free(list); g_list_free(list);
@ -478,6 +488,7 @@ void yon_kernel_addon_init(main_window *widgets){
gtk_widget_set_sensitive(row->InstallCheck,0); gtk_widget_set_sensitive(row->InstallCheck,0);
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
while(gtk_events_pending()) gtk_main_iteration();
} }
yon_kernel_addon_resize(widgets); yon_kernel_addon_resize(widgets);

16
source/ubinstall-gtk-log.c
Unescape View File

@ -96,7 +96,11 @@ void on_process_log_view(GtkWidget *,main_window *widgets){
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer"); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(short_log_path); window->command = yon_char_new(short_log_path);
GFile *file = g_file_new_for_path(window->command); GFile *file = g_file_new_for_path(window->command);
window->monitor = g_file_monitor_file(file,G_FILE_MONITOR_NONE,NULL,NULL); GError *err = NULL;
window->monitor = g_file_monitor_file(file,G_FILE_MONITOR_NONE,NULL,&err);
if (err){
printf("%s\n",err->message);
}
g_signal_connect(G_OBJECT(window->monitor),"changed",G_CALLBACK(yon_read_log),window); g_signal_connect(G_OBJECT(window->monitor),"changed",G_CALLBACK(yon_read_log),window);
g_object_unref(file); g_object_unref(file);
yon_read_log(NULL,NULL,NULL,G_FILE_MONITOR_EVENT_CHANGED,window); yon_read_log(NULL,NULL,NULL,G_FILE_MONITOR_EVENT_CHANGED,window);
@ -149,7 +153,6 @@ void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonito
double fraction = atof(parsed[3]) / 100; double fraction = atof(parsed[3]) / 100;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress), fraction); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress), fraction);
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), yon_char_parsed_to_string(parsed, size, " ")); gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), yon_char_parsed_to_string(parsed, size, " "));
// yon_char_parsed_free(parsed,size);
} }
if (!yon_char_is_empty(current_copy)) free(current_copy); if (!yon_char_is_empty(current_copy)) free(current_copy);
} }
@ -162,9 +165,14 @@ void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonito
gboolean yon_progress_bar_start(main_window *widgets){ gboolean yon_progress_bar_start(main_window *widgets){
GFile *file_desc = g_file_new_for_path(progress_path); GFile *file_desc = g_file_new_for_path(progress_path);
widgets->install_info_monitor = g_file_monitor_file(file_desc,G_FILE_MONITOR_NONE,NULL,NULL); GError *err = NULL;
widgets->install_info_monitor = g_file_monitor_file(file_desc,G_FILE_MONITOR_NONE,NULL,&err);
if (err){
printf("%s\n",err->message);
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),err->message,5,BACKGROUND_IMAGE_FAIL_TYPE);
return G_SOURCE_REMOVE;
}
g_signal_connect(G_OBJECT(widgets->install_info_monitor),"changed",G_CALLBACK(yon_installation_progress_update),widgets); g_signal_connect(G_OBJECT(widgets->install_info_monitor),"changed",G_CALLBACK(yon_installation_progress_update),widgets);
// g_thread_new("progress",(GThreadFunc)yon_progress_thread_test,widgets);
g_object_unref(file_desc); g_object_unref(file_desc);
if (access(progress_path,F_OK)){ if (access(progress_path,F_OK)){
FILE *file = fopen(progress_path,"w"); FILE *file = fopen(progress_path,"w");

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

@ -117,6 +117,7 @@ void yon_packages_tab_init(main_window *widgets){
yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL); yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL);
free(command); free(command);
} }
while(gtk_events_pending()) gtk_main_iteration();
gtk_tree_store_clear(widgets->PackagesList); gtk_tree_store_clear(widgets->PackagesList);
char *modules = config(modules_parameter); char *modules = config(modules_parameter);
if (modules&&!strcmp(modules,"auto")){ if (modules&&!strcmp(modules,"auto")){
@ -142,6 +143,7 @@ void yon_packages_tab_init(main_window *widgets){
} }
modules = yon_char_parsed_to_string(final,final_size,","); modules = yon_char_parsed_to_string(final,final_size,",");
} }
while(gtk_events_pending()) gtk_main_iteration();
int size; int size;
char *config_packages = config(packages_parameter); char *config_packages = config(packages_parameter);
@ -163,6 +165,7 @@ void yon_packages_tab_init(main_window *widgets){
} }
yon_char_parsed_add_or_create_if_exists(final,&final_size,modules_parsed[j]); yon_char_parsed_add_or_create_if_exists(final,&final_size,modules_parsed[j]);
} }
while(gtk_events_pending()) gtk_main_iteration();
yon_char_parsed_free(modules_parsed,modules_parsed_size); yon_char_parsed_free(modules_parsed,modules_parsed_size);
char *modules_string = yon_char_parsed_to_string(final,final_size,"\t"); char *modules_string = yon_char_parsed_to_string(final,final_size,"\t");
if (empty && !yon_char_check_elements(modules,modules_string,",")) continue; if (empty && !yon_char_check_elements(modules,modules_string,",")) continue;
@ -218,6 +221,7 @@ void yon_packages_tab_init(main_window *widgets){
free(full_string); free(full_string);
} }
} }
while(gtk_events_pending()) gtk_main_iteration();
} }
yon_packages_remove_empty_groups(widgets); yon_packages_remove_empty_groups(widgets);
if (!yon_char_is_empty(modules)) free(modules); if (!yon_char_is_empty(modules)) free(modules);

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

@ -8,16 +8,26 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_WELCOME: return YON_PAGE_LICENCE; break; case YON_PAGE_WELCOME: return YON_PAGE_LICENCE; break;
case YON_PAGE_LICENCE: return YON_PAGE_SECTIONS; break; case YON_PAGE_LICENCE: return YON_PAGE_SECTIONS; break;
case YON_PAGE_SECTIONS: return yon_sections_get_next_page(widgets); break; case YON_PAGE_SECTIONS: return yon_sections_get_next_page(widgets); break;
case YON_PAGE_OS_COMPONENTS: return main_config.configure_mode?YON_PAGE_CONFIG_HUB: strcmp(config(AUTOINSTALL_TYPE_INSTALL),"system_only") ? YON_PAGE_INSTALLATION_BEGIN : YON_PAGE_RECOVERY_BEGIN; break; case YON_PAGE_OS_COMPONENTS: {
char *install_mode = config(AUTOINSTALL_TYPE_INSTALL);
if (main_config.configure_mode&&strcmp(install_mode,"system_only")&&strcmp(install_mode,"grub_install")&&strcmp(install_mode,"grub_update")){
return YON_PAGE_CONFIG_HUB;
} else if (strcmp(install_mode,"system_only")){
return YON_PAGE_INSTALLATION_BEGIN;
} else {
return YON_PAGE_RECOVERY_BEGIN;
}
}
case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_CONFIG_HUB; break;
case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break;
case YON_PAGE_CONFIG_HUB: { case YON_PAGE_CONFIG_HUB: {
char *install_mode = config(AUTOINSTALL_TYPE_INSTALL);
if (main_config.configure_mode){ if (main_config.configure_mode){
return YON_PAGE_CONFIGURE_END; return YON_PAGE_CONFIGURE_END;
} else if (strcmp(config(AUTOINSTALL_TYPE_INSTALL),"data_only")){ } else if (strcmp(install_mode,"data_only")){
return YON_PAGE_INSTALLATION; return YON_PAGE_INSTALLATION;
} else { } else {
return YON_PAGE_RECOVERY_PROCESS; return YON_PAGE_RECOVERY_BEGIN;
} }
} break; } break;
case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break; case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break;
@ -37,11 +47,11 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_INSTALL_SAME_PARTITION: return YON_PAGE_OS_COMPONENTS; break; case YON_PAGE_INSTALL_SAME_PARTITION: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_INSTALL_ADVANCED: return YON_PAGE_OS_COMPONENTS; break; case YON_PAGE_INSTALL_ADVANCED: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_INSTALL_RECOVERY: return yon_recovery_get_next(widgets); break; case YON_PAGE_INSTALL_RECOVERY: return yon_recovery_get_next(widgets); break;
case YON_PAGE_RECOVERY_GRUB_INSTALL: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break; case YON_PAGE_RECOVERY_GRUB_INSTALL: return YON_PAGE_CONFIG_HUB; break;
case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break; case YON_PAGE_RECOVERY_GRUB_UPDATE: return YON_PAGE_CONFIG_HUB; break;
case YON_PAGE_RECOVERY_OS_ONLY: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_OS_COMPONENTS; break; case YON_PAGE_RECOVERY_OS_ONLY: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break; case YON_PAGE_RECOVERY_USRDATA_ONLY: return YON_PAGE_CONFIG_HUB; break;
case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return strcmp(config(AUTOINSTALL_TYPE_INSTALL),"data_only") ? YON_PAGE_RECOVERY_PROCESS: YON_PAGE_CONFIG_HUB; break; case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break;
case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break; case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break;
case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break; case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break;
case YON_PAGE_CONFIGURE_SAVE: case YON_PAGE_CONFIGURE_SAVE:
@ -419,6 +429,28 @@ void yon_switch_page_render(main_window *widgets){
g_list_free(list); g_list_free(list);
} }
void yon_container_start_loading(GtkWidget *target){
GtkWidget *parent = gtk_widget_get_parent(target);
g_object_ref(target);
gtk_container_remove(GTK_CONTAINER(parent),target);
GtkWidget *overlay = gtk_overlay_new();
g_object_set_data(G_OBJECT(parent),"loader_overlay",overlay);
g_object_set_data(G_OBJECT(target),"parent",parent);
gtk_overlay_add_overlay(GTK_OVERLAY(overlay),target);
gtk_widget_show(overlay);
}
void yon_container_stop_loading(GtkWidget *target){
g_object_ref(target);
GtkWidget *parent = g_object_get_data(G_OBJECT(target),"loader_overlay");
GtkWidget *overlay = g_object_get_data(G_OBJECT(parent),"loader_overlay");
gtk_container_remove(GTK_CONTAINER(overlay),target);
gtk_container_add(GTK_CONTAINER(parent),target);
gtk_widget_destroy(overlay);
gtk_widget_show(overlay);
g_object_set_data(G_OBJECT(parent),"loader_overlay",NULL);
g_object_set_data(G_OBJECT(target),"parent",NULL);
}
void yon_configuration_mode_check(main_window *widgets){ void yon_configuration_mode_check(main_window *widgets){
enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
@ -470,18 +502,23 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
yon_configuration_hub_init(widgets); yon_configuration_hub_init(widgets);
break; break;
case YON_PAGE_OS_COMPONENTS: case YON_PAGE_OS_COMPONENTS:
// on_status_update(NULL,widgets);
yon_os_components_init(widgets); yon_os_components_init(widgets);
break; break;
case YON_PAGE_KERNEL: case YON_PAGE_KERNEL:
// on_status_update(NULL,widgets);
yon_kernel_init(widgets); yon_kernel_init(widgets);
break; break;
case YON_PAGE_KERNEL_ADDON: case YON_PAGE_KERNEL_ADDON:
// on_status_update(NULL,widgets);
yon_kernel_addon_init(widgets); yon_kernel_addon_init(widgets);
break; break;
case YON_PAGE_SOFTWARE: case YON_PAGE_SOFTWARE:
// on_status_update(NULL,widgets);
yon_software_init(widgets); yon_software_init(widgets);
break; break;
case YON_PAGE_PACMAN_SOFTWARE: case YON_PAGE_PACMAN_SOFTWARE:
// on_status_update(NULL,widgets);
yon_pacman_init(widgets); yon_pacman_init(widgets);
break; break;
case YON_PAGE_REGION: case YON_PAGE_REGION:
@ -509,6 +546,7 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
yon_network_init(widgets); yon_network_init(widgets);
break; break;
case YON_PAGE_PACKAGES: case YON_PAGE_PACKAGES:
// on_status_update(NULL,widgets);
yon_packages_tab_init(widgets); yon_packages_tab_init(widgets);
break; break;
case YON_PAGE_INSTALL_ADVANCED: case YON_PAGE_INSTALL_ADVANCED:
@ -564,6 +602,16 @@ void on_page_next_clicked(GtkWidget *, main_window *widgets){
page = yon_page_get_next(widgets,page); page = yon_page_get_next(widgets,page);
if ((int)page!=-1){ if ((int)page!=-1){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),page); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),page);
switch(page){
case YON_PAGE_KERNEL:
case YON_PAGE_KERNEL_ADDON:
case YON_PAGE_PACMAN_SOFTWARE:
case YON_PAGE_SOFTWARE:
case YON_PAGE_PACKAGES:
on_status_button_update(NULL,widgets);
break;
default: break;
};
yon_page_init(widgets,page); yon_page_init(widgets,page);
} }
yon_page_update(widgets); yon_page_update(widgets);
@ -578,7 +626,7 @@ void on_page_prev_clicked(GtkWidget *, main_window *widgets){
yon_page_update(widgets); yon_page_update(widgets);
} }
#include <signal.h> // #include <signal.h>
void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
enum YON_PAGES cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); enum YON_PAGES cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));

109
source/ubinstall-gtk-saving.c
Unescape View File

@ -156,6 +156,29 @@ enum INSTALL_TYPE yon_ubl_get_install_mode(){
return INSTALL_ERROR; return INSTALL_ERROR;
} }
void on_config_install_success(GtkWidget *, int state, main_window *widgets){
if (state){
gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
g_mutex_lock(&main_config.install_mutex);
main_config.install_complete=1;
g_mutex_unlock(&main_config.install_mutex);
return;
}
g_mutex_lock(&main_config.install_mutex);
if (!main_config.install_complete){
main_config.install_complete = 1;
}
g_mutex_unlock(&main_config.install_mutex);
if ((!main_config.save_done)&&main_config.save_configured){
on_setup_system_configuration(widgets);
} else if (main_config.save_done&&main_config.save_configured){
g_idle_add((GSourceFunc)on_install_success,widgets);
} else {
main_config.save_done=1;
}
}
void *on_config_save(void *data){ void *on_config_save(void *data){
main_window *widgets = (main_window*)data; main_window *widgets = (main_window*)data;
@ -178,7 +201,6 @@ void *on_config_save(void *data){
g_mutex_unlock(&main_config.install_mutex); g_mutex_unlock(&main_config.install_mutex);
if ((!main_config.save_done)&&main_config.save_configured){ if ((!main_config.save_done)&&main_config.save_configured){
on_setup_system_configuration(widgets); on_setup_system_configuration(widgets);
// on_page_next_clicked(NULL,widgets);
} }
} else { } else {
yon_launch("ubconfig --source system get /"); yon_launch("ubconfig --source system get /");
@ -190,97 +212,16 @@ void *on_setup_system_configuration(void * data){
yon_debug_output("%s\n","Entered thread"); yon_debug_output("%s\n","Entered thread");
main_window *widgets = (main_window*)data; main_window *widgets = (main_window*)data;
if (widgets){}; if (widgets){};
int size;
config_str all_parameters = yon_config_get_selection_by_key(&size,
root_password_parameter,
autologin_parameter,
xkbmodel_parameter,
xkblayout_parameter,
xkbvariant_parameter,
xkboptions_parameter,
hostname_parameter,
zone_parameter,
lang_parameter,
locale_parameter,
SERVICES_ENABLE_parameter,
GRUB_DEFAULT_parameter,
GRUB_TIMEOUT_parameter,
AUTOLOGINUSER_parameter,
GRUB_SUPERUSERS_parameter,
DOMAIN_parameter,
DOMAIN_admanger_parameter,
NTPSERVERS_parameter,
packages_parameter,
KERNEL_BOOT_parameter,
packages_parameter,
NULL);
int user_size=0;
config_str users = yon_config_get_all_by_key(USERADD_parameter_search,&user_size);
if (user_size){
int final_size;
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
// yon_char_parsed_free(users,user_size);
if (size) yon_char_parsed_free(all_parameters,size);
all_parameters = final;
size = final_size;
}
users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&user_size);
if (users){
int final_size;
config_str final = yon_char_parsed_merge(all_parameters,size,users,user_size,&final_size);
// yon_char_parsed_free(users,user_size);
if (size) yon_char_parsed_free(all_parameters,size);
all_parameters = final;
size = final_size;
}
int network_size;
config_str networks = yon_config_get_all_by_key(NETWORK_parameter_search,&network_size);
if (network_size){
int final_size;
config_str final = yon_char_parsed_merge(all_parameters,size,networks,network_size,&final_size);
// yon_char_parsed_free(networks,network_size);
if (size) yon_char_parsed_free(all_parameters,size);
all_parameters = final;
size = final_size;
}
if (all_parameters){
for (int i=0;i<size;i++){
char *parameter = yon_char_divide_search(all_parameters[i],"=",-1);
if (!strstr(parameter,"'")){
char *key = yon_config_parameter_get_key(parameter);
free(parameter);
char *tmp = yon_char_unite("'",key,"'",NULL);
free(key);
parameter = AUTOINSTALL(tmp);
free(tmp);
}
if (!strstr(all_parameters[i],"'")){
char *temp = yon_char_unite("'",all_parameters[i],"'",NULL);
free(all_parameters[i]);
all_parameters[i]=temp;
}
char *temp = yon_char_unite(parameter,"=",all_parameters[i],NULL);
free(all_parameters[i]);
all_parameters[i]=temp;
}
if (!main_config.dry_run){ if (!main_config.dry_run){
char *parameter_string = yon_char_parsed_to_string(all_parameters,size," ");
char *command = set_user_config_command; char *command = set_user_config_command;
// if (main_config.debug_mode){
// yon_launch(ubinstall_dry_run_command);
// }
if (system(yon_debug_output("%s\n",command))){}; if (system(yon_debug_output("%s\n",command))){};
yon_char_parsed_free(all_parameters,size);
free(command); free(command);
if (parameter_string) free(parameter_string);
} else { } else {
yon_launch("ubconfig --source system get /"); yon_launch("ubconfig --source system get /");
yon_launch(ubinstall_dry_run_command);
} }
} // }
g_idle_add((GSourceFunc)on_install_success,widgets); g_idle_add((GSourceFunc)on_install_success,widgets);
return NULL; return NULL;
} }

99
source/ubinstall-gtk.c
Unescape View File

@ -315,28 +315,29 @@ void yon_licence_load(main_window *widgets){
} }
} }
// void on_database_update(void *,main_window *widgets){ void yon_update_page(main_window *widgets){
// // vte_revealer_struct *revealer = yon_vte_revealer_new(); enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
// yon_terminal_window_launch(GTK_WINDOW(widgets->MainWindow),"pacman -Sy",SUCCESS_LABEL,FAIL_LABEL);
// yon_terminal_integrated_start_shell(widgets->InstallTerminal,yon_debug_output("%s\n",pacman_update_command),NULL,NULL);
// g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_db_update_done),widgets);
// gtk_button_clicked(GTK_BUTTON(widgets->MoreButton));
// gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->MenusTab),1);
// }
void on_status_update(GtkWidget *,main_window *widgets){
// on_database_update(NULL,widgets);
yon_window *window = yon_window_new();
GtkWidget *terminal = vte_terminal_new();
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),DB_UPDATE_LABEL,icon_path,NULL);
gtk_widget_show(terminal);
gtk_box_pack_start(GTK_BOX(window->MainBox),terminal,1,1,0);
yon_terminal_integrated_start_shell(terminal,"pacman -Sy",NULL,NULL);
gtk_widget_show(window->Window);
// yon_terminal_window_launch(GTK_WINDOW(widgets->MainWindow),"pacman -Sy",SUCCESS_LABEL,FAIL_LABEL);
yon_packages_update(); yon_packages_update();
while(gtk_events_pending()) gtk_main_iteration();
yon_page_init(widgets,page);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->db_lock_monitor),G_CALLBACK(yon_db_unlock_update),widgets);
on_status_update(NULL,widgets);
}
if (system(yon_check_database_command)){ void *yon_db_update(main_window *widgets){
yon_launch("pacsync --updated");
g_idle_add_once((GSourceOnceFunc)yon_update_page,widgets);
pthread_exit(NULL);
}
void on_status_button_update(GtkWidget *, main_window *widgets){
g_signal_handlers_block_by_func(G_OBJECT(widgets->db_lock_monitor),G_CALLBACK(yon_db_unlock_update),widgets);
pthread_t tid=0;
pthread_create(&tid,NULL,(void*(*)(void*))yon_db_update,widgets);
}
void yon_status_thread_update_inactive(main_window *widgets){
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
@ -347,7 +348,9 @@ void on_status_update(GtkWidget *,main_window *widgets){
gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),UNACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),UNACCESSED_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsStatusLabel),UNACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsStatusLabel),UNACCESSED_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->PackagesStatusLabel),UNACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->PackagesStatusLabel),UNACCESSED_LABEL);
} else { }
void yon_status_thread_update_active(main_window *widgets){
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
@ -358,10 +361,19 @@ void on_status_update(GtkWidget *,main_window *widgets){
gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),ACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),ACCESSED_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsStatusLabel),ACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsStatusLabel),ACCESSED_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->PackagesStatusLabel),ACCESSED_LABEL); gtk_label_set_text(GTK_LABEL(widgets->PackagesStatusLabel),ACCESSED_LABEL);
}
void *yon_status_thread_update(main_window *widgets){
if (system(yon_check_database_command)){
g_idle_add_once((GSourceOnceFunc)yon_status_thread_update_inactive,widgets);
} else {
g_idle_add_once((GSourceOnceFunc)yon_status_thread_update_active,widgets);
} }
enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); pthread_exit(NULL);
page = yon_page_get_next(widgets,page); }
yon_page_init(widgets,page);
void on_status_update(GtkWidget *,main_window *widgets){
pthread_t tid=0;
pthread_create(&tid,NULL,(void*(*)(void*))yon_status_thread_update,widgets);
} }
@ -376,6 +388,24 @@ void yon_scroll_block_for_builder(GtkBuilder *builder){
g_slist_free(list); g_slist_free(list);
} }
void yon_db_lock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets){
if (!access(pacman_lock_path,F_OK)){
gtk_widget_set_sensitive(widgets->KernelPacmanStatusButton,0);
gtk_widget_set_sensitive(widgets->PacmanSoftwareStatusButton,0);
gtk_widget_set_sensitive(widgets->KernelAddonPacmanStatusButton,0);
gtk_widget_set_sensitive(widgets->AdditionalComponentsStatusButton,0);
}
}
void yon_db_unlock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets){
if (access(pacman_lock_path,F_OK)){
gtk_widget_set_sensitive(widgets->KernelPacmanStatusButton,1);
gtk_widget_set_sensitive(widgets->PacmanSoftwareStatusButton,1);
gtk_widget_set_sensitive(widgets->KernelAddonPacmanStatusButton,1);
gtk_widget_set_sensitive(widgets->AdditionalComponentsStatusButton,1);
}
}
void yon_main_window_create(main_window *widgets){ void yon_main_window_create(main_window *widgets){
__attribute__((unused)) char *locale = setlocale(LC_ALL, "en_US.UTF-8"); __attribute__((unused)) char *locale = setlocale(LC_ALL, "en_US.UTF-8");
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
@ -702,11 +732,22 @@ void yon_main_window_create(main_window *widgets){
widgets->NextInstallationSliderImage = yon_gtk_builder_get_widget(builder,"NextInstallationSliderImage"); widgets->NextInstallationSliderImage = yon_gtk_builder_get_widget(builder,"NextInstallationSliderImage");
widgets->PrevInstallationSliderImage = yon_gtk_builder_get_widget(builder,"PrevInstallationSliderImage"); widgets->PrevInstallationSliderImage = yon_gtk_builder_get_widget(builder,"PrevInstallationSliderImage");
widgets->network_connections = NULL; widgets->network_connections = NULL;
widgets->pacmanchosen = g_hash_table_new_full(g_str_hash,g_str_equal,free,NULL); widgets->pacmanchosen = g_hash_table_new_full(g_str_hash,g_str_equal,free,NULL);
main_config.status_box = widgets->StatusBox; main_config.status_box = widgets->StatusBox;
GError *err = NULL;
GFile *file_desc = g_file_new_for_path(pacman_lock_dir_path);
widgets->db_lock_monitor = g_file_monitor_directory(file_desc,G_FILE_MONITOR_NONE,NULL,&err);
if (err){
printf("%s\n",err->message);
} }
g_signal_connect(G_OBJECT(widgets->db_lock_monitor),"changed",G_CALLBACK(yon_db_lock_update),widgets);
g_signal_connect(G_OBJECT(widgets->db_lock_monitor),"changed",G_CALLBACK(yon_db_unlock_update),widgets);
}
g_signal_connect(G_OBJECT(widgets->MainWindow),"delete-event",G_CALLBACK(on_yon_exit),widgets); g_signal_connect(G_OBJECT(widgets->MainWindow),"delete-event",G_CALLBACK(on_yon_exit),widgets);
GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2"); GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2");
@ -723,11 +764,11 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets); g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets); g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets);
g_signal_connect(G_OBJECT(widgets->PackagesStatusButton),"clicked",G_CALLBACK(on_status_update),widgets); g_signal_connect(G_OBJECT(widgets->PackagesStatusButton),"clicked",G_CALLBACK(on_status_button_update),widgets);
g_signal_connect(G_OBJECT(widgets->AdditionalComponentsStatusButton),"clicked",G_CALLBACK(on_status_update),widgets); g_signal_connect(G_OBJECT(widgets->AdditionalComponentsStatusButton),"clicked",G_CALLBACK(on_status_button_update),widgets);
g_signal_connect(G_OBJECT(widgets->KernelPacmanStatusButton),"clicked",G_CALLBACK(on_status_update),widgets); g_signal_connect(G_OBJECT(widgets->KernelPacmanStatusButton),"clicked",G_CALLBACK(on_status_button_update),widgets);
g_signal_connect(G_OBJECT(widgets->KernelAddonPacmanStatusButton),"clicked",G_CALLBACK(on_status_update),widgets); g_signal_connect(G_OBJECT(widgets->KernelAddonPacmanStatusButton),"clicked",G_CALLBACK(on_status_button_update),widgets);
g_signal_connect(G_OBJECT(widgets->PacmanSoftwareStatusButton),"clicked",G_CALLBACK(on_status_update),widgets); g_signal_connect(G_OBJECT(widgets->PacmanSoftwareStatusButton),"clicked",G_CALLBACK(on_status_button_update),widgets);
g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets); g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets);
g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets); g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets);

29
source/ubinstall-gtk.h
Unescape View File

@ -13,6 +13,7 @@
#include <libublsettings.h> #include <libublsettings.h>
#include <libublsettings-gtk3.h> #include <libublsettings-gtk3.h>
#include <libublsettingsui-gtk3.h> #include <libublsettingsui-gtk3.h>
// #define VTE_INCLUDE
#ifdef WEBKIT_INCLUDE #ifdef WEBKIT_INCLUDE
#include <webkit2/webkit2.h> #include <webkit2/webkit2.h>
#endif #endif
@ -95,6 +96,9 @@
#define arrow_left_icon_path "com.ublinux.ubinstall-gtk.arrow-left-symbolic" #define arrow_left_icon_path "com.ublinux.ubinstall-gtk.arrow-left-symbolic"
#define arrow_right_icon_path "com.ublinux.ubinstall-gtk.arrow-right-symbolic" #define arrow_right_icon_path "com.ublinux.ubinstall-gtk.arrow-right-symbolic"
#define pacman_lock_path "/var/lib/pacman/db.lck"
#define pacman_lock_dir_path "/var/lib/pacman/"
#define slide_repeat_path "/com/ublinux/images/slide-1.png", \ #define slide_repeat_path "/com/ublinux/images/slide-1.png", \
"/com/ublinux/images/slide-2.png", \ "/com/ublinux/images/slide-2.png", \
"/com/ublinux/images/slide-3.png", \ "/com/ublinux/images/slide-3.png", \
@ -153,7 +157,7 @@ layout && /description:/ {\
#define yon_check_database_command "pacman -Syy >/dev/null" #define yon_check_database_command "pacman -Syy >/dev/null"
#define internet_tomezone_check_command "curl -s ipinfo.io/timezone" #define internet_tomezone_check_command "curl -s ipinfo.io/timezone"
#define ubinstall_dry_run_command "ubinstall --dry-run" #define ubinstall_dry_run_command "/usr/bin/bash -c \"ubinstall --dry-run"
#define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release" #define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release"
#define get_keyboard_layout_change_command "grep \"grp:\" /usr/share/X11/xkb/rules/base.lst | awk '{$1=$1; sub(/^!.*$/, \"\"); if ($1 ~ /^grp:/) {opt=$1; $1=\"\"; print opt \"|\" substr($0,2)}}'" #define get_keyboard_layout_change_command "grep \"grp:\" /usr/share/X11/xkb/rules/base.lst | awk '{$1=$1; sub(/^!.*$/, \"\"); if ($1 ~ /^grp:/) {opt=$1; $1=\"\"; print opt \"|\" substr($0,2)}}'"
@ -292,7 +296,7 @@ layout && /description:/ {\
#define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" #define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG"
#define save_config_command yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --noautoconfig --noinstall_extra", NULL) #define save_config_command yon_char_unite("/usr/bin/bash -c \"nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --noautoconfig --noinstall_extra\"", NULL)
#define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"' --noautoconfig --noinstall_extra", NULL) #define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"' --noautoconfig --noinstall_extra", NULL)
#define set_user_config_command yon_char_unite("nice ubinstall autoconfig",main_config.debug_mode?" --debug":""," install_extra", NULL) #define set_user_config_command yon_char_unite("nice ubinstall autoconfig",main_config.debug_mode?" --debug":""," install_extra", NULL)
@ -304,8 +308,6 @@ layout && /description:/ {\
#define PASSWORD_DEFAULT "ublinux" #define PASSWORD_DEFAULT "ublinux"
#define start_fast_install_command "ubinstall --autoinstall"
#define progress_path "/var/log/ubinstall_progress.log" #define progress_path "/var/log/ubinstall_progress.log"
#define password_limits_path "/etc/security/pwquiality.conf" #define password_limits_path "/etc/security/pwquiality.conf"
@ -314,9 +316,9 @@ layout && /description:/ {\
#define full_log_path "/var/log/ubinstall.log" #define full_log_path "/var/log/ubinstall.log"
#define get_devices_command "ubinstall show --lsdevices" #define get_devices_command "/usr/bin/bash -c \"ubinstall show --lsdevices\""
#define get_parts_for_device_command "ubinstall show --lsparts" #define get_parts_for_device_command "/usr/bin/bash -c \"ubinstall show --lsparts\""
#define get_modules_command "ubinstall show --lsmodules" #define get_modules_command "/usr/bin/bash -c \"ubinstall show --lsmodules\""
#define ubconfig_file_create_pkexec(target) yon_char_unite("pkexec ubconfig --target \"",target,"\" create",NULL) #define ubconfig_file_create_pkexec(target) yon_char_unite("pkexec ubconfig --target \"",target,"\" create",NULL)
#define config_get_command(target) yon_char_unite("ubconfig -ea --conarg --source ", target, " get [autoinstall] AUTOINSTALL[*] ADDADM -- get [locale] LANG", NULL) #define config_get_command(target) yon_char_unite("ubconfig -ea --conarg --source ", target, " get [autoinstall] AUTOINSTALL[*] ADDADM -- get [locale] LANG", NULL)
@ -852,6 +854,8 @@ typedef struct
GtkWidget *root_button; GtkWidget *root_button;
GtkWidget *debug_button; GtkWidget *debug_button;
GFileMonitor *db_lock_monitor;
} main_window; } main_window;
enum ADVANCED_PART_TYPE enum ADVANCED_PART_TYPE
@ -1628,3 +1632,14 @@ void on_software_info(GtkWidget*, main_window *widgets);
void yon_packages_remove_empty_groups(main_window *widgets); void yon_packages_remove_empty_groups(main_window *widgets);
void yon_config_mode_start(main_window *widgets); void yon_config_mode_start(main_window *widgets);
void on_bootloader_selected(GtkTreeView *,main_window *widgets); void on_bootloader_selected(GtkTreeView *,main_window *widgets);
void yon_update_page(main_window *widgets);
void *yon_db_update(main_window *widgets);
void on_status_button_update(GtkWidget *, main_window *widgets);
void yon_container_start_loading(GtkWidget *target);
void yon_container_stop_loading(GtkWidget *target);
void yon_status_thread_update_inactive(main_window *widgets);
void yon_status_thread_update_active(main_window *widgets);
void *yon_status_thread_update(main_window *widgets);
void yon_db_lock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets);
void yon_db_unlock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets);
void on_config_install_success(GtkWidget *self, int state, main_window *widgets);

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

@ -134,6 +134,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property> <property name="yalign">0</property>
</object> </object>

8
ubinstall-gtk.glade
Unescape View File

@ -5914,22 +5914,22 @@ Select a different installation sources.</property>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Service</property> <property name="title" translatable="yes">Unit</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">2</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Unit</property> <property name="title" translatable="yes">Service</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">2</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>

Write Preview
Loading…
Cancel
Save