From a6aac37d81f984d2754ae6f914448ee31722368d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 16 Jan 2024 10:19:43 +0600 Subject: [PATCH 1/2] Documentation confirmation window fixes, gitignore update --- .gitignore | 3 +- source/ubl-settings-video.c | 2 +- ubl-settings-video.glade | 381 +++++++++++++++++------------------- 3 files changed, 185 insertions(+), 201 deletions(-) diff --git a/.gitignore b/.gitignore index 8f213e3..e2a882b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ build/ source/ubl-settings-video-cm.h .install.sh terminal-commands -source/ubl-settings-app-chooser.* \ No newline at end of file +source/ubl-settings-app-chooser.* +*~ \ No newline at end of file diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 5721c22..e94fffa 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_configuration); + GtkBuilder *builder=gtk_builder_new_from_resource(glade_path); 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"); diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index c72f264..d5dfc0f 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -7,204 +7,6 @@ - - False - False - 450 - dialog-question-symbolic - - - True - False - vertical - - - True - False - - - True - False - start - 20 - 20 - dialog-question-symbolic - 6 - - - False - True - 0 - - - - - True - False - vertical - - - True - False - start - 10 - 5 - Would you like to read documentation in the Web? - True - 0 - - - - - - - False - True - 0 - - - - - True - False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is -translated and supported by community. - True - 0 - - - - False - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - 10 - True - - - - False - True - end - 2 - - - - - - True - True - 1 - - - - - - True - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 30 - True - - - Cancel - True - True - True - - - - True - True - 0 - - - - - Read Online - True - True - True - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - Video adapter and display settings - - - - - - - - False - 32 - dialog-question-symbolic - - - - - True False @@ -364,7 +166,7 @@ translated and supported by community. True False 32 - com.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-video 5 @@ -746,6 +548,187 @@ translated and supported by community. False document-edit-symbolic + + True + False + gtk-missing-image + com.ublinux.libublsettingsui-gtk3.cancel-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.accept-symbolic + + + 450 + False + False + dialog-question-symbolic + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 6 + + + False + True + 0 + + + + + True + False + 10 + vertical + 5 + + + True + False + start + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is +translated and supported by community. + 0 + + + + False + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 10 + True + + + + False + True + end + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + + + True + False + + + True + False + Video adapter and display settings + + + + + + + + Cancel + True + True + True + image3 + + + + + + Open documentation + True + True + True + image4 + + + + end + 1 + + + + + True False From 1b8d1bcbbbc9f041e07ec7fa11a1bdc11013b473 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 16 Jan 2024 10:23:52 +0600 Subject: [PATCH 2/2] Documentation window changes --- ubl-settings-video.css | 4 ++++ ubl-settings-video.glade | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ubl-settings-video.css b/ubl-settings-video.css index 5ca43e9..7bf569e 100644 --- a/ubl-settings-video.css +++ b/ubl-settings-video.css @@ -115,4 +115,8 @@ border-color: @theme_text_color; .boxInfoMessOK{ background-color: #f3f0ac; +} + +.marginright image{ + margin-right: 2px; } \ No newline at end of file diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index d5dfc0f..087756c 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -707,6 +707,7 @@ translated and supported by community. image3 @@ -719,6 +720,7 @@ translated and supported by community. image4