Better Loading of Views

Updated GpuPage UI:
- Added AdwViewStack and title + switcher bar for the new views
- There are some commented out defaults here for my sanity

Updated gschema XML:
- Added "viewconfigs" string list key with some defaults: UUID:viewposition:View Title
- Added "pageconfigs" string list key with some defaults: UUID:View Title:Property Position:Property ID
- Removed unused keys "settingsconfig", "smiconfig", "settingsandsmiconfig", "optimusconfig"

Updated GpuPage class:
- Removed unused imports
- Added "refreshid" struct member, a u32 value that is either 0 or some SourceId value
- Added "view_stack" template_child struct member, holds the views of each GpuPage
- Added "add_stack_item()" function in GpuPage trait for appending a view item to the stack
- Updated "constructed()" function in ObjectImpl trait to set new "refreshid" struct member to "0" (i.e. no ID stored)
- Updated "property()","set_property()" and "properties()" functions for new "refreshid" struct member
- Added "load_views()" function that loads all saved views from settings, then calls functions to populate
- Added "check_properties_for_view()" function that uses passed view title, returns list of saved properties
- Added "create_properties()" function that adds labels (of properties) to a passed grid and a recurring closure to fill them, returns the grid afterwards (stores the ID of the recurring closure in new "refreshid" struct member to allow removal of this closure!)
- Refactored "setup_widgets()" into the above functions, added (currently mostly empty) closure for edit_button "clicked" signal: to be updated for ModificationWindow class. At the moment only re-runs "load_views()" function

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

Author: Deren Vural

install_schemas.sh

@@ -42,18 +42,26 @@ SPDX-License-Identifier: GPL-3.0-or-later
       </description>
     </key>
 
-    <!-- Not entirely sure what these are for..-->
-    <key name="settingsconfig" type="as">
-      <default>[]</default>
+    <key name="viewconfigs" type="as">
+      <default>[
+      "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:0:GPU",
+      "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:1:VRAM",
+      "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:2:Fans"
+      ]</default>
     </key>
-    <key name="smiconfig" type="as">
-      <default>[]</default>
-    </key>
-    <key name="settingsandsmiconfig" type="as">
-      <default>[]</default>
-    </key>
-    <key name="optimusconfig" type="as">
-      <default>[]</default>
+
+    <key name="pageconfigs" type="as">
+      <default>[
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:GPU:0:util",
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:GPU:1:temp",
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:GPU:2:power_usage",
+
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:VRAM:2:memory_usage",
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:VRAM:3:memory_total",
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:VRAM:4:mem_ctrl_util",
+
+        "GPU-fb231809-72f7-79fd-eb6c-178b24827aa9:Fans:5:fan_speed"
+      ]</default>
     </key>
   </schema>
 </schemalist>

src/com.gtk_d.NvidiaMonitorRust.gschema.xml

@@ -25,7 +25,7 @@ use glib::{
     once_cell::sync::Lazy, once_cell::sync::OnceCell, subclass::InitializingObject, ParamSpec,
     ToValue, Value,
 };
-use gtk::{subclass::prelude::*, CompositeTemplate};
+use gtk::{subclass::prelude::*, CompositeTemplate, TemplateChild};
 use std::cell::Cell;
 
 // Modules
@@ -39,6 +39,10 @@ pub struct GpuPage {
     uuid: Cell<String>,
     name: Cell<String>,
     provider: Cell<Option<Provider>>,
+    refreshid: Cell<u32>,
+
+    #[template_child]
+    pub view_stack: TemplateChild<adwaita::ViewStack>,
 }
 
 /// The central trait for subclassing a GObject
@@ -84,6 +88,35 @@ impl GpuPage {
     // }
 }
 
+impl GpuPage {
+    /*
+     * Name:
+     * add_stack_item
+     *
+     * Description:
+     * Add item passed as a parameter to the view_stack object, using name, title & icon passed as parameters
+     *
+     * Made:
+     * 03/12/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    pub fn add_stack_item<T: IsA<gtk::Widget>>(&self, item: &T, name: Option<&str>, title: &str, icon: &str) {
+        // Add the passed item to the stack
+        self.view_stack.add_titled(item, name, title);
+
+        // Set the icon of the new item
+        //NOTE: see https://world.pages.gitlab.gnome.org/Rust/libadwaita-rs/stable/latest/docs/libadwaita/struct.ViewStack.html
+        //      function "add_titled_with_icon" not in stable yet
+        let new_item = self.view_stack.page(item);
+        new_item.set_icon_name(Some(icon));
+    }
+}
+
 /**
  * Trait Name:
  * ObjectImpl
@@ -123,6 +156,7 @@ impl ObjectImpl for GpuPage {
         self.parent_constructed(obj);
 
         // Setup
+        self.refreshid.set(0);
         //obj.setup_settings();
         //obj.load_properties();//TODO
         //obj.setup_widgets();
@@ -161,6 +195,7 @@ impl ObjectImpl for GpuPage {
                 glib::ParamSpecString::builder("uuid").build(),
                 glib::ParamSpecString::builder("name").build(),
                 glib::ParamSpecObject::builder("provider", glib::Type::OBJECT).build(),
+                glib::ParamSpecUInt::builder("refreshid").build(),
             ]
         });
 
@@ -216,6 +251,12 @@ impl ObjectImpl for GpuPage {
                 }
                 Err(_) => panic!("The value needs to be of type `Provider`."),
             },
+            "refreshid" => match value.get() {
+                Ok(input_refreshid_property) => {
+                    self.refreshid.replace(input_refreshid_property);
+                }
+                Err(_) => panic!("The value needs to be of type `u32`."),
+            },
             _ => panic!("Property `{}` does not exist..", pspec.name()),
         }
 
@@ -270,6 +311,13 @@ impl ObjectImpl for GpuPage {
 
                 value.to_value()
             }
+            "refreshid" => {
+                let value: u32 = self.refreshid.take();
+
+                self.refreshid.set(value.clone());
+
+                value.to_value()
+            }
             _ => panic!("Property `{}` does not exist..", pspec.name()),
         }
     }