Working views

Updated MainWindow UI:
- Added some comments

Updated SettingsWindow UI:
- Added some comments

Updated GpuPage UI:
- Updated to disable some properties
- Updated to use to AdwViewSwitcher (AdwViewSwitcherTitle, AdwViewStack, AdwViewSwitcherBar)
- Added a placeholder GtkGrid at 0,0
- Added some example AdwViewStackPage items (in comments)

Updated gschema XML:
- Updated descriptions for "app-settings-open" and "nvidia-settings-open"
- Added "modification-open" key

Updated lib.rs:
- Added modificationwindow dependancy
- Removed unused imports

Updated MainWindow class:
- Removed "update_prov()" function
- Updated some comments to be in docs
- Added "update_setting()" call to "close_request()" function, to update "modification-open" setting

Updated SettingsWindow class:
- Updated "close_request()" function to use "update_setting()" function instead of doing it manually

Updated GpuPage class:
- Updated imports and modules
- Added ModificationWindowContainer struct (like SettingsWindowContainer)
- Added "modification_window" struct member
- Switched to using the ViewSwitcherBar ("view_switcher"), as can easily swap the stack used
- Added "get_setting()" function
- Added "update_setting()" function
- Added "replace_stack()" function
- Updated "load_views()" function, calls "create_updater()" function
- Updated "check_properties_for_view()" function
- Refactored "create_properties()" function to remove callback function
- Added "create_updater()" function to create callback function
- Refactored "setup_widgets()" function

Updated Processor class:
- Disabled some debug print statements

Updated Property class:
- Disabled some debug print statements

Updated Provider class:
- Disabled some debug print statements

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

Author: Deren Vural

src/com.gtk_d.NvidiaMonitorRust.gschema.xml

@@ -7,18 +7,25 @@ SPDX-License-Identifier: GPL-3.0-or-later
   <schema id="com.gtk_d.NvidiaMonitorRust" path="/com/gtk_d/NvidiaMonitorRust/">
     <key name="nvidia-settings-open" type="b">
       <default>false</default>
-      <summary>Nvidia settings state</summary>
+      <summary>Nvidia settings window state</summary>
       <description>
         Nvidia settings open/closed
       </description>
     </key>
     <key name="app-settings-open" type="b">
       <default>false</default>
-      <summary>App settings state</summary>
+      <summary>App settings window state</summary>
       <description>
         App settings window open/closed
       </description>
     </key>
+    <key name="modification-open" type="b">
+      <default>false</default>
+      <summary>App view-modification window state</summary>
+      <description>
+        App view-modification window open/closed
+      </description>
+    </key>
 
     <key name="refreshrate" type="i">
       <default>5</default>

src/gpu_page/imp.rs

@@ -19,17 +19,24 @@
  */
 
 // Imports
-use adwaita::{gio, glib, prelude::*};
+use adwaita::{gio, glib, prelude::*, ViewStack, ViewSwitcherBar};
 use gio::Settings;
 use glib::{
     once_cell::sync::Lazy, once_cell::sync::OnceCell, subclass::InitializingObject, ParamSpec,
-    ToValue, Value,
+    ToValue, Value, FromVariant
 };
 use gtk::{subclass::prelude::*, CompositeTemplate, TemplateChild};
-use std::cell::Cell;
+use std::{cell::Cell, cell::RefCell, rc::Rc};
 
 // Modules
-use crate::provider::Provider;
+use crate::{provider::Provider, modificationwindow::ModificationWindow};
+
+/// Structure for storing a SettingsWindow object and any related information
+#[derive(Default)]
+pub struct ModificationWindowContainer {
+    pub window: Option<ModificationWindow>,
+    pub open: bool,
+}
 
 /// Object holding the State and any Template Children
 #[derive(CompositeTemplate, Default)]
@@ -41,8 +48,10 @@ pub struct GpuPage {
     provider: Cell<Option<Provider>>,
     refreshid: Cell<u32>,
 
+    pub modification_window: Rc<RefCell<ModificationWindowContainer>>,
+
     #[template_child]
-    pub view_stack: TemplateChild<adwaita::ViewStack>,
+    pub view_switcher: TemplateChild<ViewSwitcherBar>,
 }
 
 /// The central trait for subclassing a GObject
@@ -89,37 +98,75 @@ impl GpuPage {
 }
 
 impl GpuPage {
-    /*
+    /**
+     * Name:
+     * get_setting
+     *
+     * Description:
+     * Generic function for getting setting value
+     *
+     * Made:
+     * 04/12/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    pub fn get_setting<T: FromVariant>(&self, name: &str) -> T {
+        // Return the value of the property
+        match self.settings.get() {
+            Some(settings) => settings.get::<T>(name),
+            None => panic!("`settings` should be set in `setup_settings`."),
+        }
+    }
+
+    /**
+     * Name:
+     * update_setting
+     *
+     * Description:
+     * Generic function for updating setting values
+     *
+     * Made:
+     * 04/12/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    pub fn update_setting<T: ToVariant>(&self, name: &str, value: T) {
+        // Fetch settings
+        match self.settings.get() {
+            Some(settings) => match settings.set(name, &value) {
+                Ok(_) => println!("..Setting `{}` updated!", name),
+                Err(err) => panic!("..Cannot update `{}` setting: `{}`", name, err),
+            },
+            None => panic!("..Cannot retrieve settings"),
+        }
+    }
+
+    /**
      * Name:
-     * add_stack_item
+     * replace_stack
      *
      * Description:
-     * Add item passed as a parameter to the view_stack object, using name, title & icon passed as parameters
+     * Replace current view_stack using passed value
      *
      * Made:
-     * 03/12/2022
+     * 04/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));
+    pub fn replace_stack(&self, stack: Option<&ViewStack>) {
+        self.view_switcher.set_stack(stack);
     }
 }