diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index e081b67..bc4a0ab 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -194,6 +194,7 @@ void on_pack_install_activate(GtkCellRendererToggle* ,gchar* path,main_window *w if (!yon_char_is_empty(package)){ char *command = install_proprietary_command(package); yon_terminal_start(widgets,command); + yon_ubl_status_box_render(INSTALLING_PROCESS_LABEL,BACKGROUND_IMAGE_INFO_TYPE); } } free(data); @@ -204,6 +205,7 @@ void on_pack_install_activate(GtkCellRendererToggle* ,gchar* path,main_window *w if (!yon_char_is_empty(package)){ char *command = delete_proprietary_command(package); yon_terminal_start(widgets,command); + yon_ubl_status_box_render(DELETING_PROCESS_LABEL,BACKGROUND_IMAGE_INFO_TYPE); } } free(data); @@ -1011,8 +1013,10 @@ void yon_monitor_view_update(){ } gboolean yon_proprietary_clear(main_window *widgets){ + gtk_widget_set_sensitive(widgets->LoadDriversButton,0); gtk_list_store_clear(main_config.list); gtk_list_store_clear(main_config.list2); + gtk_spinner_start(GTK_SPINNER(widgets->DriversLoadingSpinner)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->KernelsCombo)); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->KernelsCombo),ALL_INSTALLED_KERNELS_LABEL); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->KernelsCombo),0); @@ -1043,11 +1047,11 @@ gboolean yon_proprietary_disconnect(main_window *widgets){ gboolean yon_proprietary_connect(main_window *widgets){ gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->DriversTree),GTK_TREE_MODEL(main_config.list)); + gtk_spinner_stop(GTK_SPINNER(widgets->DriversLoadingSpinner)); return G_SOURCE_REMOVE; } void *yon_proprietary_local_get(main_window *widgets){ - gtk_widget_set_sensitive(widgets->LoadDriversButton,0); g_idle_add((GSourceFunc)yon_proprietary_clear,widgets); int kernels_size; config_str kernels_installed=yon_config_load(yon_debug_output("%s\n",yon_get_kernels_installed),&kernels_size); @@ -1422,6 +1426,8 @@ template_main_window *yon_main_window_complete(main_window *widgets){ widgets->InformationCompanyLogoImage2 = GTK_WIDGET(gtk_builder_get_object(builder, "InformationCompanyLogoImage2")); widgets->InformationLabel = GTK_WIDGET(gtk_builder_get_object(builder, "InformationLabel")); widgets->InformationLabel2 = GTK_WIDGET(gtk_builder_get_object(builder, "InformationLabel2")); + widgets->DriversLoadingOverlay = GTK_WIDGET(gtk_builder_get_object(builder, "DriversLoadingOverlay")); + widgets->DriversLoadingSpinner = GTK_WIDGET(gtk_builder_get_object(builder, "DriversLoadingSpinner")); widgets->PackageRenderer = GTK_CELL_RENDERER(gtk_builder_get_object(builder, "PackageRenderer")); widgets->ModuleRenderer = GTK_CELL_RENDERER(gtk_builder_get_object(builder, "ModuleRenderer")); @@ -1429,6 +1435,8 @@ template_main_window *yon_main_window_complete(main_window *widgets){ main_config.list = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore6")); main_config.list2 = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore1")); + gtk_overlay_add_overlay(GTK_OVERLAY(widgets->DriversLoadingOverlay),widgets->DriversLoadingSpinner); + g_signal_connect(G_OBJECT(widgets->LoadDriversButton), "clicked", G_CALLBACK(yon_proprietary_get_thread), widgets); if (!getuid()){ diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index f4825e0..f815c83 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -198,6 +198,8 @@ typedef struct GtkWidget *TerminalMoreButton; GtkWidget *TerminalScroll; GtkWidget *TerminalMoreRevieler; + GtkWidget *DriversLoadingOverlay; + GtkWidget *DriversLoadingSpinner; GtkWidget *MenusTab; GtkWidget *terminal; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index f972bee..54762a5 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -105,12 +105,12 @@ #define MONITOR_PORT_ERROR_LABEL _("Error: Port must be chosen to save") #define MONITOR_PORT_SUCCESS_LABEL _("Monitor configuration succeedeed") -#define GLOBAL_LOAD_SUCCESS _("Global configuration loading succseeded.") -#define LOCAL_LOAD_SUCCESS _("Local configuration loading succseeded.") +// #define GLOBAL_LOAD_SUCCESS _("Global configuration loading succseeded.") +// #define LOCAL_LOAD_SUCCESS _("Local configuration loading succseeded.") -#define GLOBAL_LOCAL_SAVE_SUCCESS _("Local and global configuration saving succseeded.") -#define GLOBAL_SAVE_SUCCESS _("Global configuration saving succseeded.") -#define LOCAL_SAVE_SUCCESS _("Local configuration saving succseeded.") +// #define GLOBAL_LOCAL_SAVE_SUCCESS _("Local and global configuration saving succseeded.") +// #define GLOBAL_SAVE_SUCCESS _("Global configuration saving succseeded.") +// #define LOCAL_SAVE_SUCCESS _("Local configuration saving succseeded.") #define YES_LABEL _("Yes") #define NO_LABEL _("No") diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index 32ac9d5..aa5e4da 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -1,8 +1,12 @@ - + + + True + False + True False @@ -890,144 +894,147 @@ - + True False - vertical - - - True - True - liststore1 - - - - - - fixed - 160 - Installed - - - - - - - - False - True - 0 - - - + True - True - external + False + vertical - + True True - liststore6 - 1 - both - True - 4 - - - + liststore1 fixed - 80 - Module - - - - 9 - 9 - 0 - - + 160 + Installed - - 80 - Package - descending - 0 - - - - 10 - 10 - 1 - - - + + + + False + True + 0 + + + + + True + True + external - - Kernel + + True + True + liststore6 + 1 + both + True + 4 - - - 2 - + + fixed + 80 + Module + + + + 9 + 9 + 0 + + + - - - - - Driver - - - 3 - + + 80 + Package + descending + 0 + + + + 10 + 10 + 1 + + + - - - - - Description - - word - 150 + + Kernel + + + + 2 + + - - 4 - - - - - - autosize - Supported Devices - - word - 220 + + Driver + + + + 3 + + + + + + + Description + + + word + 150 + + + 4 + + + + + + + autosize + Supported Devices + + + word + 220 + + + 5 + + - - 5 - + + + True + True + 1 + - - True - True - 1 + -1