From 0d78edd63a31a4ab4c2cebc6f841f5843de6db6c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Apr 2023 12:40:33 +0600 Subject: [PATCH] Fixed banner path; Added commands for proprietary drivers installing, deleting and viewing information --- source/ubl-settings-video.h | 39 +++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index a02998b..f286018 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -14,7 +14,7 @@ #define icon_name "com.ublinux.ubl-settings-video" -#define banner_path "/usr/share/ubl-settings-video/ui/ubl-settings-video-banner.png" +#define banner_path "/usr/share/ubl-settings-video/images/ubl-settings-video-banner.png" #define glade_path "/usr/share/ubl-settings-video/ui/ubl-settings-video.glade" #define LocalePath "/usr/share/locale" @@ -51,6 +51,14 @@ #define remove_drivers_local_command "/usr/bin/ubconfig --target global remove video " +#define install_proprietary_command "pkexec pacman -Sy --noconfirm " + +#define delete_proprietary_command "pkexec pacman -R --noconfirm " + +#define get_info_proprietary_command "pamac-manager --details=" + +#define get_version_proprietary_command "grep \"VERSION_ID=\" /etc/os-release | cut -d= -f2" + #define XORG_MONITOR(port) yon_char_get_augumented(" XORG_MONITOR[",yon_char_get_augumented(port,"] ")) @@ -67,11 +75,7 @@ typedef dictionary* proprietary_config; typedef dictionary* monitor_view; -typedef struct { - GtkWidget *icon; - GtkWidget *box; - GtkWidget *label; -} render_data; + typedef struct { config_str line; @@ -198,6 +202,29 @@ typedef struct GtkWidget *templateMonitorConfigurationParameterLineEntry; GtkWidget *templateMonitorConfigurationDoNotSwitchOffLabel; GtkWidget *templateMonitorConfigurationDoNotSwitchOffCheck; + + GtkWidget *proprietaryTreeView; + GtkWidget *proprietaryInfoButton; + GtkWidget *proprietaryDeleteButton; + GtkWidget *proprietaryInstallButton; + GtkTreeSelection *proprietaryTreeSelection; + GtkWidget *driversTreeView; + GtkWidget *driversInfoButton; + GtkWidget *driversDeleteButton; + GtkWidget *driversInstallButton; + GtkTreeSelection *driversTreeSelection; + + GtkTreeViewColumn *proprietartInstalledColumn; + GtkTreeViewColumn *ProprietaryPackageColumn; + GtkTreeViewColumn *ProprietaryDriverColumn; + GtkTreeViewColumn *ProprietaryDescriptionColumn; + GtkTreeViewColumn *ProprietarySupportedColumn; + + GtkTreeViewColumn *driverInstalledColumn; + GtkTreeViewColumn *driverPackageColumn; + GtkTreeViewColumn *driverDriverColumn; + GtkTreeViewColumn *driverDescriptionColumn; + GtkTreeViewColumn *driverSupportedColumn; } widgets_dict; typedef struct