master #158

Merged
asmeron merged 2 commits from YanTheKaller/ubl-settings-video:master into master 6 days ago

@ -272,7 +272,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
} }
void on_config_local_load(GtkWidget *self,main_window *){ void on_config_local_load(GtkWidget *self,main_window *){
if (self){} if (self){};
yon_load_proceed(YON_CONFIG_LOCAL); yon_load_proceed(YON_CONFIG_LOCAL);
main_config.load_mode=1; main_config.load_mode=1;
yon_interface_update(); yon_interface_update();
@ -383,12 +383,12 @@ void yon_proprietary_local_get(main_window *widgets){
} }
} }
if (dr_desc==size-1) { if (dr_desc==size-1) {
yon_proprietary_connect(widgets); g_idle_add((GSourceFunc)yon_proprietary_connect,widgets);
} }
} }
if (!size){ if (!size){
yon_proprietary_connect(widgets); g_idle_add((GSourceFunc)yon_proprietary_connect,widgets);
} }
char *status_text = yon_char_unite(yon_char_get_localised_from_lib(SUCCESS_LABEL),". ", !getuid()? main_config.load_mode==1?yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(GLOBAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(ROOT_WARNING_LABEL),NULL); char *status_text = yon_char_unite(yon_char_get_localised_from_lib(SUCCESS_LABEL),". ", !getuid()? main_config.load_mode==1?yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(GLOBAL_LOAD_SUCCESS_LABEL):yon_char_get_localised_from_lib(ROOT_WARNING_LABEL),NULL);
yon_ubl_status_box_render_thread(status_text,!getuid()?BACKGROUND_IMAGE_SUCCESS_TYPE:BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render_thread(status_text,!getuid()?BACKGROUND_IMAGE_SUCCESS_TYPE:BACKGROUND_IMAGE_FAIL_TYPE);
@ -398,6 +398,7 @@ void yon_proprietary_local_get(main_window *widgets){
} }
void yon_proprietary_get_thread(GtkWidget *,main_window *widgets){ void yon_proprietary_get_thread(GtkWidget *,main_window *widgets){
printf("thread started\n");
yon_ubl_status_box_render(PROPRIETARY_LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_render(PROPRIETARY_LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
yon_proprietary_local_get(widgets); yon_proprietary_local_get(widgets);
} }
@ -582,18 +583,17 @@ void yon_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target){
} }
gboolean on_db_update_done(GtkWidget *,gint ,main_window *widgets){ gboolean on_db_update_done(GtkWidget *,gint ,main_window *widgets){
yon_packages_update();
yon_proprietary_get_thread(NULL,(main_window*)widgets); yon_proprietary_get_thread(NULL,(main_window*)widgets);
g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->InstallTerminal),G_CALLBACK(on_db_update_done),widgets); g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->InstallTerminal),G_CALLBACK(on_db_update_done),widgets);
return 0; return 0;
} }
void on_database_update(void *,main_window *widgets){ void on_database_update(void *,main_window *widgets){
// terminal_window_struct *window = yon_terminal_window_launch(GTK_WINDOW(((main_window*)widgets)->Window),pacman_update_command,yon_char_get_localised_from_lib(SUCCESS_LABEL),OPERATION_FAIL_LABEL);
yon_terminal_integrated_start_shell(widgets->InstallTerminal,yon_debug_output("%s\n",pacman_update_command),NULL,NULL); 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); g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_db_update_done),widgets);
gtk_button_clicked(GTK_BUTTON(widgets->MoreButton)); gtk_button_clicked(GTK_BUTTON(widgets->MoreButton));
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->MenusTab),1); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->MenusTab),1);
// g_signal_connect(G_OBJECT(window->window),"destroy",G_CALLBACK(yon_proprietary_get_thread),widgets);
} }
void on_gapfix_changed(GtkWidget*, main_window *widgets){ void on_gapfix_changed(GtkWidget*, main_window *widgets){
@ -893,9 +893,6 @@ template_main_window *yon_main_window_complete(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::position",G_CALLBACK(on_paned_position_changed),widgets); g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::position",G_CALLBACK(on_paned_position_changed),widgets);
g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::max-position",G_CALLBACK(on_paned_position_changed),widgets); g_signal_connect(G_OBJECT(widgets->TerminalPaned),"notify::max-position",G_CALLBACK(on_paned_position_changed),widgets);
// g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-ready",G_CALLBACK(on_driver_child_ready),NULL); // g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-ready",G_CALLBACK(on_driver_child_ready),NULL);
char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
yon_window_config_load(path);
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->MainOverlay),widgets->MainSpinner);
g_object_set_data(G_OBJECT(widgets->InstallTerminal),"widgets",widgets); g_object_set_data(G_OBJECT(widgets->InstallTerminal),"widgets",widgets);
{ {

Loading…
Cancel
Save