From 6974d8db912939eaba5409bb4d6a221c0849a9b5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 6 Sep 2023 16:34:39 +0600 Subject: [PATCH] Finished utils updating; Project updating --- gresource.xml | 2 + source/CMakeLists.txt | 2 + source/ubl-settings-video.c | 14 +- source/ubl-settings-video.h | 3 + source/ubl-utils.c | 4 +- ubl-settings-video-configuration.glade | 500 ++++++++++++++++++ ubl-settings-video-monitor.glade | 192 +++++++ ubl-settings-video.glade | 676 ------------------------- 8 files changed, 704 insertions(+), 689 deletions(-) create mode 100644 ubl-settings-video-configuration.glade create mode 100644 ubl-settings-video-monitor.glade diff --git a/gresource.xml b/gresource.xml index e089af7..ad86631 100644 --- a/gresource.xml +++ b/gresource.xml @@ -2,6 +2,8 @@ ubl-settings-video.glade + ubl-settings-video-monitor.glade + ubl-settings-video-configuration.glade ubl-settings-video.css diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 2340635..eaf0053 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -36,6 +36,8 @@ add_custom_target(GLADE ubl-settings-video.glade) set(DEPENDFILES ../ubl-settings-video.glade + ../ubl-settings-video-monitor.glade + ../ubl-settings-video-configuration.glade ../gresource.xml ../ubl-settings-video-banner.png ../ubl-settings-video.css diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 9d59533..5708d88 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -672,7 +672,7 @@ void on_link(GtkWidget *self, char* link, gpointer user_data){ if (!link) link=UBLINUX_WIKI_LINK; if (videoconfig.alwaysredirect==0){ - GtkBuilder *builder=gtk_builder_new_from_resource(glade_path); + GtkBuilder *builder=gtk_builder_new_from_resource(glade_path_configuration); GtkWidget *sureWindow=yon_gtk_builder_get_widget(builder,"HelpSureWindow"); GtkWidget *readButton=yon_gtk_builder_get_widget(builder,"ReadHelpButton"); GtkWidget *cancelButton=yon_gtk_builder_get_widget(builder,"CancelHelpButton"); @@ -1408,7 +1408,7 @@ char *yon_char_parsed_get_resolution(config_str parsed_string, int size){ } void yon_monitor_view_new(monitor_config monitor){ - GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); + GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_monitor); monitor_window *window = new(monitor_window); window->templateMonitorscreenOverlay=yon_gtk_builder_get_widget(builder,"templateMonitorscreenOverlay"); window->templateMonitorImage=yon_gtk_builder_get_widget(builder,"templateMonitorImage"); @@ -1833,20 +1833,12 @@ int main(int argc, char *argv[]) } if (getuid()!=0){ - // char *args=""; - // for (int i=0;i + + + + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + False + True + com.ublinux.ubl-settings-video + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + True + False + 5 + + + Enabled + True + True + False + True + + + False + True + 0 + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + end + 5 + True + + + Save + True + True + True + image5 + + + False + True + end + 0 + + + + + Cancel + True + True + True + image4 + + + False + True + end + 1 + + + + + False + True + 0 + + + + + False + True + end + 2 + + + + + True + False + vertical + + + True + False + vertical + 5 + + + True + False + 5 + + + True + False + Port + + + False + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + Main display + True + True + False + True + + + False + True + 2 + + + + + False + True + 1 + + + + + True + False + 5 + + + True + False + Resolution (px): + + + False + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + Show unsupported + True + True + False + True + + + False + True + 2 + + + + + False + True + 2 + + + + + True + False + 5 + + + True + False + Frequency (Hz): + + + False + True + 0 + + + + + True + False + 0 + + 60 + 75 + + + + True + True + 1 + + + + + False + True + 3 + + + + + True + False + 5 + + + True + False + Rotation: + + + False + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + False + True + 4 + + + + + True + False + 5 + + + True + False + Position: + + + False + True + 0 + + + + + True + False + 5 + True + + + True + False + 0 + + + True + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 5 + + + + + Do not switch off display + True + True + False + True + + + False + True + 6 + + + + + Create modeline for current resolution with CVT + True + True + False + True + + + False + True + 7 + + + + + Use "CVT Reduced Blanking"gshgrbehr + True + True + False + True + + + False + True + 8 + + + + + Create modeline for current resolution with GTF + True + True + False + True + + + False + True + 9 + + + + + True + False + + + False + True + 10 + + + + + False + True + 0 + + + + + True + False + 5 + 5 + vertical + 5 + + + Configure manually through parameter line: + True + True + False + True + + + False + True + 0 + + + + + True + False + True + center + 1920x1080 + + + True + True + 1 + + + + + False + True + 1 + + + + + False + True + 3 + + + + + True + True + 0 + + + + + + diff --git a/ubl-settings-video-monitor.glade b/ubl-settings-video-monitor.glade new file mode 100644 index 0000000..155909f --- /dev/null +++ b/ubl-settings-video-monitor.glade @@ -0,0 +1,192 @@ + + + + + + True + False + True + Switch + system-shutdown-symbolic + + + True + False + True + Delete + user-trash-symbolic + + + False + True + value-increase-symbolic + + + True + False + Configure + open-menu-symbolic + + + + True + False + start + 3 + 3 + 3 + 3 + 10 + 20 + vertical + + + True + False + True + + + + + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + True + + + + + + + False + True + 1 + + + + + True + False + 15 + + + True + True + True + image14 + + + + False + True + 0 + + + + + True + True + True + image13 + + + + False + True + 1 + + + + + True + True + True + True + end + image3 + + + + False + True + end + 2 + + + + + True + True + True + Add + image15 + + + + False + True + 3 + + + + + False + True + 2 + + + + + True + False + + + True + False + False + 128 + com.ublinux.ubl-settings-video.display + 6 + + + -1 + + + + diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index f9dfd06..c72f264 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -741,670 +741,11 @@ translated and supported by community. False dialog-information-symbolic - - True - False - True - Switch - system-shutdown-symbolic - - - True - False - True - Delete - user-trash-symbolic - - - False - True - value-increase-symbolic - True False document-edit-symbolic - - True - False - Configure - open-menu-symbolic - - - - True - False - start - 3 - 3 - 10 - 20 - vertical - - - True - False - True - - - - - - - False - True - 0 - - - - - True - False - 5 - 5 - True - - - - - - - False - True - 1 - - - - - True - False - 15 - - - True - True - True - image14 - - - - False - True - 0 - - - - - True - True - True - image13 - - - - False - True - 1 - - - - - True - True - True - True - end - image3 - - - - False - True - end - 2 - - - - - True - True - True - Add - image15 - - - - False - True - 3 - - - - - False - True - 2 - - - - - True - False - process-stop-symbolic - - - True - False - emblem-ok-symbolic - - - False - True - com.ublinux.ubl-settings-video - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - vertical - - - True - False - 5 - - - Enabled - True - True - False - True - - - False - True - 0 - - - - - False - True - 1 - - - - - True - False - vertical - - - True - False - end - 5 - True - - - Save - True - True - True - image5 - - - False - True - end - 0 - - - - - Cancel - True - True - True - image4 - - - False - True - end - 1 - - - - - False - True - 0 - - - - - False - True - end - 2 - - - - - True - False - vertical - - - True - False - vertical - 5 - - - True - False - 5 - - - True - False - Port - - - False - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - Main display - True - True - False - True - - - False - True - 2 - - - - - False - True - 1 - - - - - True - False - 5 - - - True - False - Resolution (px): - - - False - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - Show unsupported - True - True - False - True - - - False - True - 2 - - - - - False - True - 2 - - - - - True - False - 5 - - - True - False - Frequency (Hz): - - - False - True - 0 - - - - - True - False - 0 - - 60 - 75 - - - - True - True - 1 - - - - - False - True - 3 - - - - - True - False - 5 - - - True - False - Rotation: - - - False - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - False - True - 4 - - - - - True - False - 5 - - - True - False - Position: - - - False - True - 0 - - - - - True - False - 5 - True - - - True - False - 0 - - - True - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - True - True - 1 - - - - - False - True - 5 - - - - - Do not switch off display - True - True - False - True - - - False - True - 6 - - - - - Create modeline for current resolution with CVT - True - True - False - True - - - False - True - 7 - - - - - Use "CVT Reduced Blanking"gshgrbehr - True - True - False - True - - - False - True - 8 - - - - - Create modeline for current resolution with GTF - True - True - False - True - - - False - True - 9 - - - - - True - False - - - False - True - 10 - - - - - False - True - 0 - - - - - True - False - 5 - 5 - vertical - 5 - - - Configure manually through parameter line: - True - True - False - True - - - False - True - 0 - - - - - True - False - True - center - 1920x1080 - - - True - True - 1 - - - - - False - True - 1 - - - - - False - True - 3 - - - - - True - True - 0 - - - - - True False @@ -2753,21 +2094,4 @@ translated and supported by community. both - - True - False - - - True - False - False - 128 - com.ublinux.ubl-settings-video.display - 6 - - - -1 - - -