From d158b5d30fd22059d5657b25c2de501dbb3c0a6f Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 22 Jan 2026 10:46:06 +0000 Subject: [PATCH 1/3] Template update --- source/CMakeLists.txt | 4 ++-- source/ubl-settings-video.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 23fd855..2731c99 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -12,6 +12,7 @@ pkg_check_modules(VTE291 REQUIRED vte-2.91) include_directories(${VTE291_INCLUDE_DIRS}) link_directories(${VTE291_LIBRARY_DIRS}) add_definitions(${VTE291_CFLAGS_OTHER}) +add_definitions(-DVTE_INCLUDE) pkg_check_modules(JSON REQUIRED json-c) include_directories(${JSON_INCLUDE_DIRS}) @@ -20,9 +21,8 @@ add_definitions(${JSON_CFLAGS_OTHER}) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) -option(WEBKIT_FOUND "No" OFF) if(WEBKIT_LIBRARIES_FOUND) - option(WEBKIT_FOUND "Yes" ON) + add_definitions(-DWEBKIT_INCLUDE) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) include_directories(${WEBKIT_INCLUDE_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS}) diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 56c6666..a683559 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -15,7 +15,6 @@ #include #include #include "ubl-strings.h" -#define VTE_INCLUDE #include #include #include From 752aff68dbbdd644cc8f43bebb07bda0500d64ab Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 27 Jan 2026 16:47:26 +0600 Subject: [PATCH 2/3] Wiki link fix --- locale/ubl-settings-video-video-drivers_ru.po | 4 ++++ locale/ubl-settings-video.pot | 4 ++++ source/ubl-settings-video.h | 1 - source/ubl-strings.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/locale/ubl-settings-video-video-drivers_ru.po b/locale/ubl-settings-video-video-drivers_ru.po index dd981d9..c88d8dc 100644 --- a/locale/ubl-settings-video-video-drivers_ru.po +++ b/locale/ubl-settings-video-video-drivers_ru.po @@ -17,6 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: source/ubl-settings-video.h:26 +msgid "https://wiki.ublinux.com/software/programs_and_utilities/all/ubl-settings-video" +msgstr "https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubl-settings-video" + msgid "X.org amdgpu video driver" msgstr "X.org видеодрайвер amdgpu" diff --git a/locale/ubl-settings-video.pot b/locale/ubl-settings-video.pot index d5d9c33..1da8f2c 100644 --- a/locale/ubl-settings-video.pot +++ b/locale/ubl-settings-video.pot @@ -17,6 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: source/ubl-settings-video.h:26 +msgid "https://wiki.ublinux.com/software/programs_and_utilities/all/ubl-settings-video" +msgstr "" + #: source/ubl-settings-video.h:26 msgid "https://wiki.ublinux.com" msgstr "" diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index a683559..8a5f570 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -21,7 +21,6 @@ #ifndef UBL_SETINGS_VIDEO_H #define UBL_SETINGS_VIDEO_H -#define WIKI_LINK "https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-video" #define HOMEPAGE_LINK _("https://wiki.ublinux.com") #define icon_name "com.ublinux.ubl-settings-video" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index d0b5852..da0c69e 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,5 +1,6 @@ #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL) #define HELP_LABEL yon_char_unite(_("ubl-settings-video version:")," ", version_application,"\n",_("Video adapter and display settings"),"\n",_("Usage:"), " ubl-settings-video ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL) +#define WIKI_LINK _("https://wiki.ublinux.com/software/programs_and_utilities/all/ubl-settings-video") #define PARAMETER_DEFAULT_LABEL _("Default settings") #define MONITOR_LABEL _("Monitor ") #define TITLE_LABEL _("Video adapter and display settings") From 2491216e7d5de689bf3e2adda430e68868f8a56f Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 30 Jan 2026 10:45:51 +0600 Subject: [PATCH 3/3] Wiki link edit --- locale/ubl-settings-video.pot | 2 +- locale/ubl-settings-video_ru.po | 4 ++++ source/ubl-settings-video.h | 2 -- source/ubl-strings.h | 2 +- ubl-settings-video-monitor.glade | 36 +++++++++++++++++++------------- ubl-settings-video.glade | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/locale/ubl-settings-video.pot b/locale/ubl-settings-video.pot index 1da8f2c..42b2449 100644 --- a/locale/ubl-settings-video.pot +++ b/locale/ubl-settings-video.pot @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: source/ubl-settings-video.h:26 -msgid "https://wiki.ublinux.com/software/programs_and_utilities/all/ubl-settings-video" +msgid "https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-video" msgstr "" #: source/ubl-settings-video.h:26 diff --git a/locale/ubl-settings-video_ru.po b/locale/ubl-settings-video_ru.po index f0f0546..ff6b977 100644 --- a/locale/ubl-settings-video_ru.po +++ b/locale/ubl-settings-video_ru.po @@ -17,6 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: source/ubl-settings-video.h:26 +msgid "https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-video" +msgstr "https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubl-settings-video" + #: source/ubl-settings-video.h:26 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 8a5f570..05b02f5 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -25,8 +25,6 @@ #define icon_name "com.ublinux.ubl-settings-video" -#define banner_path "/com/ublinux/images/ubl-settings-video-banner.png" - #define glade_path "/com/ublinux/ui/ubl-settings-video.glade" #define glade_path_driver "/com/ublinux/ui/ubl-settings-video-driver-tab.glade" #define glade_path_html "/com/ublinux/ui/ubl-settings-video-html.glade" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index da0c69e..0aa3725 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,6 +1,6 @@ #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL) #define HELP_LABEL yon_char_unite(_("ubl-settings-video version:")," ", version_application,"\n",_("Video adapter and display settings"),"\n",_("Usage:"), " ubl-settings-video ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL) -#define WIKI_LINK _("https://wiki.ublinux.com/software/programs_and_utilities/all/ubl-settings-video") +#define WIKI_LINK _("https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-video") #define PARAMETER_DEFAULT_LABEL _("Default settings") #define MONITOR_LABEL _("Monitor ") #define TITLE_LABEL _("Video adapter and display settings") diff --git a/ubl-settings-video-monitor.glade b/ubl-settings-video-monitor.glade index c2980ae..a4171b1 100644 --- a/ubl-settings-video-monitor.glade +++ b/ubl-settings-video-monitor.glade @@ -1,24 +1,32 @@ - + - + + 100 + 80 True - False - center - center + True - + True - False False - 128 - com.ublinux.ubl-settings-video.display - 6 + center + center + + + True + False + False + 128 + com.ublinux.ubl-settings-video.display + 6 + + + -1 + + - - -1 - @@ -171,7 +179,7 @@ True True True - Add + Add image15