diff --git a/gresource.xml b/gresource.xml index 78ff5f5..63fef9d 100644 --- a/gresource.xml +++ b/gresource.xml @@ -9,4 +9,7 @@ ubl-settings-video.css + + video-drivers.csv + \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 7569c83..0ee3544 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -42,6 +42,7 @@ set(DEPENDFILES ../ubl-settings-video-configuration.glade ../gresource.xml ../ubl-settings-video.css + ../video-drivers.csv ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 02dfb51..242df4b 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -1035,6 +1035,12 @@ gboolean yon_proprietary_clear(main_window *widgets){ return G_SOURCE_REMOVE; } +gboolean yon_proprietary_set(main_window *widgets){ + gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->DriversTree),GTK_TREE_MODEL(main_config.list)); + gtk_widget_set_sensitive(widgets->LoadDriversButton,1); + return G_SOURCE_REMOVE; +} + gboolean yon_proprietary_append(struct proprietary_struct *target){ GtkTreeIter iter; @@ -1083,7 +1089,7 @@ void *yon_proprietary_local_get(main_window *widgets){ int size; config_str rtn=NULL; - rtn = yon_file_open(get_proprietary_drivers_info_path,&size); + rtn = yon_resource_open_file(get_proprietary_drivers_info_path,&size); for (int i=1;iDriversTree),GTK_TREE_MODEL(main_config.list)); - gtk_widget_set_sensitive(widgets->LoadDriversButton,1); + g_idle_add((GSourceFunc)yon_proprietary_set,widgets); g_thread_exit (NULL); } diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index ecf0041..729f56b 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -43,7 +43,7 @@ #define get_resolutions_command "xrandr |grep -noP \"\\d+x+\\d+\"" #define get_resolution_ports_command "xrandr |grep -nwP \"connected\" |grep -oE \"[-0-9a-zA-Z:]{1,} connected\" |grep -oE \"[-0-9a-zA-Z:]{1,} \"" -#define get_proprietary_drivers_info_path "/usr/share/ubl-settings-video/csv/video-drivers.csv" +#define get_proprietary_drivers_info_path "resource:///com/ublinux/csv/video-drivers.csv" #define get_resolutions_supportable_command "/usr/share/ubl-settings-video/csv/resolutions.csv" @@ -400,5 +400,6 @@ gboolean yon_proprietary_connect(main_window *widgets); void on_app_chooser_open(GtkWidget *self, main_window *widgets); gpointer yon_driver_info_launch(void *command); void on_command_cancel(GtkWidget *,main_window *widgets); +gboolean yon_proprietary_set(main_window *widgets); #endif \ No newline at end of file