included video-drivers.csv into binary

pull/110/head
parent bd2dff94b3
commit 387c58e48f
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B

@ -9,4 +9,7 @@
<gresource prefix="/com/ublinux/css"> <gresource prefix="/com/ublinux/css">
<file>ubl-settings-video.css</file> <file>ubl-settings-video.css</file>
</gresource> </gresource>
<gresource prefix="/com/ublinux/csv">
<file>video-drivers.csv</file>
</gresource>
</gresources> </gresources>

@ -42,6 +42,7 @@ set(DEPENDFILES
../ubl-settings-video-configuration.glade ../ubl-settings-video-configuration.glade
../gresource.xml ../gresource.xml
../ubl-settings-video.css ../ubl-settings-video.css
../video-drivers.csv
) )
file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

@ -1035,6 +1035,12 @@ gboolean yon_proprietary_clear(main_window *widgets){
return G_SOURCE_REMOVE; 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){ gboolean yon_proprietary_append(struct proprietary_struct *target){
GtkTreeIter iter; GtkTreeIter iter;
@ -1083,7 +1089,7 @@ void *yon_proprietary_local_get(main_window *widgets){
int size; int size;
config_str rtn=NULL; 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;i<size;i++){ for (int i=1;i<size;i++){
if (rtn[i][strlen(rtn[i])-1]=='\n') rtn[i][strlen(rtn[i])-1] = '\0'; if (rtn[i][strlen(rtn[i])-1]=='\n') rtn[i][strlen(rtn[i])-1] = '\0';
} }
@ -1116,8 +1122,7 @@ void *yon_proprietary_local_get(main_window *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);
free(status_text); free(status_text);
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->DriversTree),GTK_TREE_MODEL(main_config.list)); g_idle_add((GSourceFunc)yon_proprietary_set,widgets);
gtk_widget_set_sensitive(widgets->LoadDriversButton,1);
g_thread_exit (NULL); g_thread_exit (NULL);
} }

@ -43,7 +43,7 @@
#define get_resolutions_command "xrandr |grep -noP \"\\d+x+\\d+\"" #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_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" #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); void on_app_chooser_open(GtkWidget *self, main_window *widgets);
gpointer yon_driver_info_launch(void *command); gpointer yon_driver_info_launch(void *command);
void on_command_cancel(GtkWidget *,main_window *widgets); void on_command_cancel(GtkWidget *,main_window *widgets);
gboolean yon_proprietary_set(main_window *widgets);
#endif #endif
Loading…
Cancel
Save