Merge pull request 'master' (#108) from YanTheKaller/ubl-settings-kernel:master into master

Reviewed-on: #108
master v2.28
Dmitry Razumov 3 weeks ago
commit 51aa75667a

@ -402,8 +402,8 @@ void *yon_interface_update(main_window *widgets){
yon_tab_set_installed(tab); yon_tab_set_installed(tab);
{ {
GList *list = gtk_container_get_children(GTK_CONTAINER(tab->run_tags_box)); GList *list = gtk_container_get_children(GTK_CONTAINER(tab->run_tags_box));
for (guint i=0;i<g_list_length(list);i++){ for (guint k=0;k<g_list_length(list);k++){
gtk_widget_destroy(g_list_nth_data(list,i)); gtk_widget_destroy(g_list_nth_data(list,k));
} }
g_list_free(list);} g_list_free(list);}
gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0); gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0);
@ -531,6 +531,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets
on_update_clicked(NULL,widgets); on_update_clicked(NULL,widgets);
main_config.action=ACTION_TERMINAL_EXECUTE_SUCCESS; main_config.action=ACTION_TERMINAL_EXECUTE_SUCCESS;
} else { } else {
on_update_clicked(NULL,widgets);
main_config.action=ACTION_TERMINAL_EXECUTE_FAIL; main_config.action=ACTION_TERMINAL_EXECUTE_FAIL;
yon_ubl_status_box_render(yon_char_get_localised_from_lib(FAIL_LABEL),BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(yon_char_get_localised_from_lib(FAIL_LABEL),BACKGROUND_IMAGE_FAIL_TYPE);
return 0; return 0;
@ -1618,6 +1619,7 @@ void yon_main_window_complete(main_window *widgets){
gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(widgets->InstallationProgress),0.1); gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(widgets->InstallationProgress),0.1);
gtk_paned_add2(GTK_PANED(widgets->TerminalPaned),widgets->TerminalRevealer); gtk_paned_add2(GTK_PANED(widgets->TerminalPaned),widgets->TerminalRevealer);
if (getuid()){ if (getuid()){
on_update_clicked(NULL,widgets);
gtk_widget_set_sensitive(widgets->BuildingButton,0); gtk_widget_set_sensitive(widgets->BuildingButton,0);
} else { } else {
GdkRGBA rgba; GdkRGBA rgba;
@ -1633,7 +1635,6 @@ void yon_main_window_complete(main_window *widgets){
gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); gtk_button_clicked(GTK_BUTTON(widgets->MoreButton));
yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command);
} }
on_update_clicked(NULL,widgets);
yon_gtk_widget_set_scroll_window_for_scroll(gtk_widget_get_parent(widgets->InstallTerminal),GTK_SCROLLBAR(widgets->TerminalScroll)); yon_gtk_widget_set_scroll_window_for_scroll(gtk_widget_get_parent(widgets->InstallTerminal),GTK_SCROLLBAR(widgets->TerminalScroll));
} }
yon_load_proceed(YON_CONFIG_LOCAL); yon_load_proceed(YON_CONFIG_LOCAL);
@ -1649,10 +1650,10 @@ int main(int argc, char *argv[]){
int size=0; int size=0;
yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL); yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL);
gtk_init(&argc,&argv); gtk_init(&argc,&argv);
template_main_window *widgets = yon_ubl_window_setup();
yon_main_window_complete((main_window*)widgets);
main_config.launch_arguments=yon_char_parsed_copy(argv,argc); main_config.launch_arguments=yon_char_parsed_copy(argv,argc);
main_config.launch_size=argc; main_config.launch_size=argc;
template_main_window *widgets = yon_ubl_window_setup();
yon_main_window_complete((main_window*)widgets);
if (getuid()!=0){ if (getuid()!=0){
textdomain(template_ui_LocaleName); textdomain(template_ui_LocaleName);
yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);

Loading…
Cancel
Save