Merge pull request 'included video-drivers.csv into binary' (#110) from YanTheKaller/ubl-settings-video:master into master

Reviewed-on: #110

gresource.xml

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

resolutions.csv

@@ -1,4 +1,4 @@
-RESOLUTION;ASPECT_RATIO;DESC
+RESOLUTION;ASPECT_RATIO;DESCRIPTION
 640x480 ;4:3;VGA
 800x480 ;5:3;WVGA
 800x600 ;4:3;SVGA
@@ -23,7 +23,7 @@ RESOLUTION;ASPECT_RATIO;DESC
 1920x1080;16:9;FHD
 1920x1200;16:10;WUXGA
 2048x1080;19:10;2K DCI
-2048x1152;16:9;,QWXGA
+2048x1152;16:9;QWXGA
 2560x1080;21:9;UWHD
 2560x1440;16:9;QHD
 2560х1600;16:10;WQXGA

source/CMakeLists.txt

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

source/ubl-settings-video.c

@@ -306,7 +306,7 @@ void on_port_chosen_changed(GtkWidget *, monitor_edit_window *window){
         dict=yon_dictionary_get(&main_config.supported_resolutions,port_name);
         if (dict){
             int size;
-            config_str resolutions = yon_file_open(get_resolutions_supportable_command,&size);
+            config_str resolutions = yon_resource_open_file(get_resolutions_supportable_command,&size);
             resolutions = yon_char_parsed_rip(resolutions,&size,0);
             for (int i=0;i<size;i++){
                 yon_char_remove_last_symbol(resolutions[i],'\n');
@@ -366,7 +366,7 @@ void on_resolutions_unsupported_show(GtkToggleButton *self, monitor_edit_window
     gtk_combo_box_set_active(GTK_COMBO_BOX(window->ResolutionCombo),0);
     if (gtk_toggle_button_get_active(self)){
         int size;
-        config_str resolutions = yon_file_open(get_resolutions_supportable_command,&size);
+        config_str resolutions = yon_resource_open_file(get_resolutions_supportable_command,&size);
         for (int i=1;i<size;i++){
             yon_char_remove_last_symbol(resolutions[i],'\n');
             int parsed_size;
@@ -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;i<size;i++){
         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);
     yon_ubl_status_box_render_thread(status_text,!getuid()?BACKGROUND_IMAGE_SUCCESS_TYPE:BACKGROUND_IMAGE_FAIL_TYPE);
     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);
 }
 

source/ubl-settings-video.h

@@ -43,9 +43,9 @@
 #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"
+#define get_resolutions_supportable_command "resource:///com/ublinux/csv/resolutions.csv"
 
 #define get_frequences_command "xrandr |grep -v -n \"[a-z][a-z]\" |sed 's/ * / /g' |cut -d' ' -f1,3-"
 
@@ -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