diff --git a/nvidia-340.html b/driver-info/nvidia-340.html similarity index 100% rename from nvidia-340.html rename to driver-info/nvidia-340.html diff --git a/nvidia-390.html b/driver-info/nvidia-390.html similarity index 100% rename from nvidia-390.html rename to driver-info/nvidia-390.html diff --git a/nvidia-470.html b/driver-info/nvidia-470.html similarity index 100% rename from nvidia-470.html rename to driver-info/nvidia-470.html diff --git a/nvidia-575-open.html b/driver-info/nvidia-575-open.html similarity index 100% rename from nvidia-575-open.html rename to driver-info/nvidia-575-open.html diff --git a/nvidia-575.html b/driver-info/nvidia-575.html similarity index 100% rename from nvidia-575.html rename to driver-info/nvidia-575.html diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index a923aac..0cdc9e8 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -1453,9 +1453,9 @@ template_main_window *yon_main_window_complete(main_window *widgets){ widgets->DriverModulesTab = GTK_WIDGET(gtk_builder_get_object(builder, "DriverModulesTab")); widgets->DriversTab = GTK_WIDGET(gtk_builder_get_object(builder, "DriversTab")); - widgets->MainTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "MainTabLabel")); - widgets->DriversTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "DriversTabLabel")); - widgets->InformationTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "InformationTabLabel")); + // widgets->MainTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "MainTabLabel")); + // widgets->DriversTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "DriversTabLabel")); + // widgets->InformationTabLabel = GTK_WIDGET(gtk_builder_get_object(builder, "InformationTabLabel")); widgets->InformationFrameLabel = GTK_WIDGET(gtk_builder_get_object(builder, "InformationFrameLabel")); widgets->InformationOverlay = GTK_WIDGET(gtk_builder_get_object(builder, "InformationOverlay")); widgets->InformationCompanyLogoImage = GTK_WIDGET(gtk_builder_get_object(builder, "InformationCompanyLogoImage")); diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index f305644..1ca1787 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -152,9 +152,9 @@ typedef struct GtkWidget *DriverModulesTab; GtkWidget *DriversTab; - GtkWidget *MainTabLabel; - GtkWidget *DriversTabLabel; - GtkWidget *InformationTabLabel; + // GtkWidget *MainTabLabel; + // GtkWidget *DriversTabLabel; + // GtkWidget *InformationTabLabel; GtkWidget *InformationFrameLabel; GtkWidget *InformationOverlay; GtkWidget *InformationCompanyLogoImage; @@ -174,10 +174,17 @@ typedef struct GtkWidget *DriversLoadingOverlay; GtkWidget *DriversLoadingSpinner; + GtkWidget *DriversList; + GtkWidget *InstalledModuleLabel; + GtkWidget *InstalledPackageLabel; + GtkWidget *KernelLabel; + GtkWidget *DriverLabel; + GtkWidget *DescriptionLabel; + GtkWidget *DevicesLabel; + GtkWidget *MenusTab; GtkWidget *terminal; - GtkWidget *LoadDriversButton; } main_window; @@ -217,6 +224,25 @@ typedef struct } config; +typedef struct { + GtkWidget *MainBox; + GtkWidget *ModuleInstalledCheck; + GtkWidget *PackageInstalledCheck; + GtkWidget *KernelLabel; + GtkWidget *DriverLabel; + GtkWidget *DescriptionLabel; + GtkWidget *DevicesBox; + GtkWidget *DevicesInfoButton; + GtkWidget *DevicesLabel; + + char *name; + char *module; + char *package; + char *kernel; + int module_installed; + int package_installed; +} driver_struct; + typedef struct { int main; diff --git a/ubl-settings-video-driver-tab.glade b/ubl-settings-video-driver-tab.glade new file mode 100644 index 0000000..14625ba --- /dev/null +++ b/ubl-settings-video-driver-tab.glade @@ -0,0 +1,140 @@ + + + + + + + True + False + vertical + + + True + False + 5 + + + True + True + False + True + + + + + + False + True + 0 + + + + + True + True + False + True + + + + + + False + True + 1 + + + + + True + False + Kernel + + + False + True + 2 + + + + + True + False + Driver + + + False + True + 3 + + + + + True + False + Description + + + True + True + 4 + + + + + True + False + 5 + + + True + True + True + center + image1 + + + + False + True + 0 + + + + + True + False + Devices + + + False + True + 1 + + + + + False + True + 5 + + + + + + False + True + 1 + + + + + True + False + com.ublinux.libublsettingsui-gtk3.important-symbolic + + diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index aa5e4da..9461d96 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -41,48 +41,6 @@ False com.ublinux.libublsettingsui-gtk3.sync-symbolic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False @@ -902,20 +860,95 @@ True False vertical + 5 - + True - True - liststore1 + False + 5 + + + True + False + label + 0 + 0 + + + False + True + 0 + + + + + True + False + label + 0 + 0 + + + False + True + 1 + + - - fixed - 160 - Installed + + True + False + label + 0 + 0 + + False + True + 2 + - + + True + False + label + 0 + 0 + + + False + True + 3 + + + + + True + False + label + 0 + 0 + + + False + True + 4 + + + + + True + False + label + 0 + 0 + + + False + True + 5 + @@ -925,111 +958,14 @@ - + True - True - external - - - True - True - liststore6 - 1 - both - True - 4 - - - fixed - 80 - Module - - - - 9 - 9 - 0 - - - - - - - 80 - Package - descending - 0 - - - - 10 - 10 - 1 - - - - - - - Kernel - - - - 2 - - - - - - - Driver - - - - 3 - - - - - - - Description - - - word - 150 - - - 4 - - - - - - - autosize - Supported Devices - - - word - 220 - - - 5 - - - - - - - + False True True - 1 + 2 @@ -1260,4 +1196,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + False + vertical + + + True + True + liststore1 + + + fixed + 160 + Installed + + + + + + + + False + True + 0 + + + + + True + True + external + + + True + True + liststore6 + 1 + both + True + 4 + + + fixed + 80 + Module + + + + 9 + 9 + 0 + + + + + + + 80 + Package + descending + 0 + + + + 10 + 10 + 1 + + + + + + + Kernel + + + + 2 + + + + + + + Driver + + + + 3 + + + + + + + Description + + + word + 150 + + + 4 + + + + + + + autosize + Supported Devices + + + word + 220 + + + 5 + + + + + + + + + + True + True + 1 + + +