Updated gschema xml

- Added (string list) GPU UUID list

Updated Provider class
- Switched from enum (ProviderType) to i32 values (will probably switch back at some point)
- Updated constructor to include ProviderType (i32) and set as property
- Updated default impl to include ProviderType (i32)
- Refactored to create "get_gpu_uuids" as new function, to be called MainWindow class

Updated Processor class
- Modified "process" and "parse" functions to return Option<Vec<String>> and Vec<String> respectively
- Modified parse to actually return a Vec instead of just one line

Updated MainWindow class & UI
- Updated UI to include a panel with a listbox of GPU rows
- Refactored to create "create_provider" as new function, called by "refresh_cards" in imp.rs and "open_nvidia_settings" action in mod.rs
- Updated class to include new UI template objects and their callbacks
- Callbacks for most menu items disabled (will be removing most of them)
- CustomButton at bottom of panel now used for refreshing GPU rows
- Updated to have "setup_widgets" function for updating initial GPU list and adding callbacks
- Updated UI to have some clear comments

Updated main.rs
- Added CustomButton module import to allow import in MainWindow class

Signed-off-by: Deren Vural <[email protected]>

Author: Deren Vural

src/com.gtk_d.NvidiaMonitorRust.gschema.xml

@@ -42,6 +42,15 @@ SPDX-License-Identifier: GPL-3.0-or-later
       </description>
     </key>
 
+    <!-- List of GPUs -->
+    <key name="gpus" type="as">
+      <default>[]</default>
+      <summary>GPU UUIDs</summary>
+      <description>
+        List of UUIDs of scanned GPUs
+      </description>
+    </key>
+
     <!-- Not entirely sure what these are for..-->
     <key name="settingsconfig" type="as">
       <default>[]</default>

src/main.rs

@@ -27,6 +27,7 @@ mod provider;
 mod subprocess;
 use mainwindow::MainWindow;
 mod settingswindow;
+mod custom_button;
 
 // Imports
 use adwaita::prelude::*;

src/mainwindow/imp.rs

@@ -19,21 +19,25 @@
  */
 
 // Imports
-use adwaita::{gio, glib, prelude::*, subclass::prelude::*};
+use adwaita::{gio, glib, prelude::*, subclass::prelude::*, ActionRow};
 use gio::Settings;
 use glib::{once_cell::sync::OnceCell, signal::Inhibit, subclass::InitializingObject};
-use gtk::{subclass::prelude::*, CompositeTemplate}; //, Entry, ListBox, TemplateChild};
+use gtk::{subclass::prelude::*, CompositeTemplate, TemplateChild, ListBox};
 use std::{cell::Cell, cell::RefCell, rc::Rc};
 
+use crate::formatter::Formatter;
+use crate::processor::Processor;
+use crate::property::Property;
+use crate::provider::Provider;
 // Modules
 //use crate::utils::data_path;
 use crate::settingswindow::SettingsWindow;
+use crate::custom_button::CustomButton;
 
 // Structure for storing SettingsWindow and info
 pub struct SettingsWindowContainer {
     pub window: Option<SettingsWindow>,
     pub open: bool,
-    //... other values associated to that window
 }
 impl Default for SettingsWindowContainer {
     fn default() -> Self {
@@ -51,6 +55,13 @@ pub struct MainWindow {
     pub settings: OnceCell<Settings>,
     pub app_id: Cell<String>,
     pub settings_window: Rc<RefCell<SettingsWindowContainer>>,
+    pub provider: Cell<Option<Provider>>,
+
+    #[template_child]
+    pub cards_list: TemplateChild<ListBox>,
+
+    #[template_child]
+    pub refresh_button: TemplateChild<CustomButton>,
 }
 
 // The central trait for subclassing a GObject
@@ -63,13 +74,201 @@ impl ObjectSubclass for MainWindow {
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
+        klass.bind_template_callbacks();
     }
 
     fn instance_init(obj: &InitializingObject<Self>) {
         obj.init_template();
     }
 }
 
+/*
+ * Name:
+ * MainWindow
+ *
+ * Description:
+ * Trait shared by all MainWindow objects
+ *
+ * Made:
+ * 13/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+#[gtk::template_callbacks]
+impl MainWindow {
+    #[template_callback]
+    fn card_selected(&self, row: &ActionRow) {
+        println!("CARD CHOSEN: {}", row.title());
+    }
+
+    pub fn create_provider(provider_type: i32) -> Provider {
+        match provider_type {
+            0 => {
+                // Nvidia Settings and Nvidia SMI
+                // Create new provider
+                Provider::new(|| {
+                    vec![
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "utilization.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "temperature.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "memory.used,memory.total", "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "fan.speed",                "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "power.draw",               "", &Formatter::new(), &1),
+                    ]
+                }, 0)
+            }
+            1 => {
+                // Nvidia Settings
+                // Create new provider
+                Provider::new(|| {
+                    vec![
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"), "utilization.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"), "temperature.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"), "memory.used,memory.total", "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"), "fan.speed",                "", &Formatter::new(), &1),
+                    ]
+                }, 1)
+            }
+            2 => {
+                // Nvidia SMI
+                // Create new provider
+                Provider::new(|| {
+                    vec![
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "utilization.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "temperature.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "memory.used,memory.total", "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "fan.speed",                "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "power.draw",               "", &Formatter::new(), &1),
+                    ]
+                }, 2)
+            }
+            3 => {
+                // Nvidia Optimus
+                // Create new provider
+                Provider::new(|| {
+                    vec![
+                        Property::new(&Processor::new("optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"), "utilization.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"), "temperature.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"), "memory.used,memory.total", "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"), "fan.speed",                "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"), "power.draw",               "", &Formatter::new(), &1),
+                    ]
+                }, 3)
+            },
+            _ => {
+                // Assume Default (Nvidia Settings and Nvidia SMI)
+                // Create new provider
+                Provider::new(|| {
+                    vec![
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "utilization.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "temperature.gpu",          "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "memory.used,memory.total", "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-settings", "-q GpuUUID -t"),                         "fan.speed",                "", &Formatter::new(), &1),
+                        Property::new(&Processor::new("nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"), "power.draw",               "", &Formatter::new(), &1),
+                    ]
+                }, 0)
+            }
+        }
+    }
+
+    #[template_callback]
+    fn refresh_cards(&self, button: &CustomButton) {
+        //TEST: Grab button label
+        let label_val = button.label().expect("cannot grab label of refresh button");
+        println!("Button Pressed: {}", label_val);
+
+        // Clear current ActionRow objects from GtkListBox
+        let mut done: bool = false;
+        while done == false {
+            // Try to grab a child
+            let current_child: Option<gtk::Widget> = self.cards_list.get().first_child();
+
+            // Check if there are any children left
+            match current_child {
+                Some(valid_child) => {
+                    // Remove child
+                    self.cards_list.get().remove(&valid_child);
+                }
+                None => {
+                    // End loop
+                    done = true;
+                }
+            }
+        }
+
+        // Grab settings
+        let settings: &Settings = self.settings.get().expect("..Cannot retrieve settings");
+
+        // Grab provider
+        let provider: Option<Provider> = self.provider.take();
+
+        // If provider does not exist
+        match provider {
+            Some(existing_provider) => {
+                // Update GPU list
+                //let gpu_uuids = existing_provider.gpus;
+                let gpu_uuids = ["",""];
+
+                // Store GPU list in settings
+                settings
+                    .set_strv("gpus", &gpu_uuids)
+                    .expect("..Cannot store list of GPU UUID in `gpus` setting");
+
+                // Re-Store provider
+                self.provider.set(Some(existing_provider));
+            }
+            None => {
+                // Check provider type
+                let provider_type: i32 = self.settings.get().expect("..cannot fetch settings").int("provider");
+
+                let new_provider: Provider = MainWindow::create_provider(provider_type);
+
+                // Update GPU list
+                //let gpu_uuids = new_provider.gpus;
+                let gpu_uuids = ["",""];
+
+                // Store new provider
+                self.provider.set(Some(new_provider));
+
+                // Store GPU list in settings
+                settings
+                    .set_strv("gpus", &gpu_uuids)
+                    .expect("..Cannot store list of GPU UUID in `gpus` setting");
+            }
+        }
+
+        // Grab provider
+        let provider: Option<Provider> = self.provider.take();
+
+        // Fetch updated GPU list
+        //let gpus: Vec<GString> = settings.strv("gpus");
+
+        // For each scanned GPU
+        let gpus = vec![("title 1","subtitle 1"), ("title 2","subtitle 2"), ("title 3","subtitle 3")];//TEST
+        for i in 0..gpus.len() {
+            // Get GPU data
+            let title: &str = gpus[i].0;//TEST
+            let subtitle: &str = gpus[i].1;//TEST
+            //let gpu_name = provider.get_gpu_data(&gpus[i], "name");
+            //let gpu_uuid = provider.get_gpu_data(&gpus[i], "UUID");
+
+            // Create new ActionRow object
+            let current_row: ActionRow = ActionRow::builder()
+                                                    .title(title)
+                                                    .subtitle(subtitle)
+                                                    .build();
+
+            // Append new ActionRow object to GtkListBox
+            self.cards_list.append(&current_row);
+        }
+
+        // Put provider back
+        self.provider.set(provider);
+    }
+}
 /*
  * Trait Name:
  * ObjectImpl
@@ -93,7 +292,7 @@ impl ObjectImpl for MainWindow {
 
         // Setup
         obj.setup_settings();
-        //obj.setup_tasks();
+        obj.setup_widgets();
         obj.restore_data();
         obj.setup_callbacks();
         obj.setup_actions();