diff --git a/gresource.xml b/gresource.xml index 63fef9d..4522480 100644 --- a/gresource.xml +++ b/gresource.xml @@ -11,5 +11,6 @@ video-drivers.csv + resolutions.csv \ No newline at end of file diff --git a/resolutions.csv b/resolutions.csv index ec81494..d1c5411 100644 --- a/resolutions.csv +++ b/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 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 0ee3544..18c4c79 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -43,6 +43,7 @@ set(DEPENDFILES ../gresource.xml ../ubl-settings-video.css ../video-drivers.csv + ../resolutions.csv ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 242df4b..c1f5331 100644 --- a/source/ubl-settings-video.c +++ b/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;iResolutionCombo),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(get_resolutions_supportable_command,&size); for (int i=1;i