emmental: Add our Window to the application

Bind the width and height properties to the settings so they are
restored on startup and bind the fullscreen property to mpris.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>

emmental/__init__.py

@@ -4,6 +4,7 @@ from . import gsetup
 from . import db
 from . import mpris2
 from . import options
+from . import window
 from gi.repository import GObject
 from gi.repository import GLib
 from gi.repository import Adw
@@ -18,6 +19,7 @@ class Application(Adw.Application):
 
     db = GObject.Property(type=db.Connection)
     mpris = GObject.Property(type=mpris2.Connection)
+    win = GObject.Property(type=window.Window)
 
     def __init__(self):
         """Initialize an Application."""
@@ -25,6 +27,21 @@ class Application(Adw.Application):
                          resource_base_path=gsetup.RESOURCE_PATH)
         self.add_main_option_entries([options.Version])
 
+    def build_window(self) -> window.Window:
+        """Build a new window instance."""
+        win = window.Window(VERSION_STRING)
+        for (setting, property) in [("window.width", "default-width"),
+                                    ("window.height", "default-height")]:
+            self.db.settings.bind_setting(setting, win, property)
+
+        return win
+
+    def connect_mpris2(self) -> None:
+        """Connect the mpris2 properties and functions."""
+        self.mpris.app.link_property("Fullscreen", self.win, "fullscreened")
+        self.mpris.app.connect("Raise", self.win.present)
+        self.mpris.app.connect("Quit", self.win.close)
+
     def do_handle_local_options(self, opts: GLib.VariantDict) -> int:
         """Handle any command line options."""
         if opts.contains("version"):
@@ -42,13 +59,21 @@ class Application(Adw.Application):
         gsetup.add_style()
         self.db.load()
 
+        self.win = self.build_window()
+        self.add_window(self.win)
+        self.connect_mpris2()
+
     def do_activate(self) -> None:
         """Handle the Adw.Application::activate signal."""
         Adw.Application.do_activate(self)
+        self.win.present()
 
     def do_shutdown(self) -> None:
         """Handle the Adw.Application::shutdown signal."""
         Adw.Application.do_shutdown(self)
+        if self.win is not None:
+            self.win.close()
+            self.win = None
         if self.mpris is not None:
             self.mpris.disconnect()
             self.mpris = None

tests/test_emmental.py

@@ -31,30 +31,58 @@ class TestEmmental(unittest.TestCase):
         self.assertEqual(self.application.get_property("resource-base-path"),
                          "/com/nowheycreamery/emmental")
 
+    @unittest.mock.patch("gi.repository.Adw.Application.add_window")
     @unittest.mock.patch("emmental.db.Connection.load")
     @unittest.mock.patch("gi.repository.Adw.Application.do_startup")
     def test_startup(self, mock_startup: unittest.mock.Mock,
-                     mock_load: unittest.mock.Mock):
+                     mock_load: unittest.mock.Mock,
+                     mock_add_window: unittest.mock.Mock):
         """Test that the startup signal works as expected."""
         self.assertIsNone(self.application.db)
         self.assertIsNone(self.application.mpris)
+        self.assertIsNone(self.application.win)
 
         self.application.emit("startup")
         self.assertIsInstance(self.application.db, emmental.db.Connection)
         self.assertIsInstance(self.application.mpris,
                               emmental.mpris2.Connection)
+        self.assertIsInstance(self.application.win, emmental.window.Window)
 
         mock_startup.assert_called()
         mock_load.assert_called()
+        mock_add_window.assert_called_with(self.application.win)
 
-    def test_shutdown(self):
+    @unittest.mock.patch("gi.repository.Adw.Application.add_window")
+    @unittest.mock.patch("gi.repository.Adw.Application.do_startup")
+    def test_activate(self, mock_startup: unittest.mock.Mock,
+                      mock_add_window: unittest.mock.Mock):
+        """Test activating the application."""
+        self.application.emit("startup")
+
+        with unittest.mock.patch.object(self.application.win,
+                                        "present") as mock_present:
+            self.application.emit("activate")
+            mock_present.assert_called()
+
+    @unittest.mock.patch("gi.repository.Adw.Window.close")
+    def test_shutdown(self, mock_close: unittest.mock.Mock):
         """Test that the shutdown signal works as expected."""
         db = self.application.db = emmental.db.Connection()
         mpris = self.application.mpris = emmental.mpris2.Connection()
+        self.application.win = emmental.window.Window("Test 1.2.3")
 
         self.application.emit("shutdown")
         self.assertIsNone(self.application.db)
         self.assertIsNone(self.application.mpris)
+        self.assertIsNone(self.application.win)
 
         self.assertIsNone(mpris.dbus)
         self.assertFalse(db.connected)
+        mock_close.assert_called()
+
+    def test_window_widgets(self):
+        """Check that the window widgets are added properly."""
+        self.application.db = emmental.db.Connection()
+        win = self.application.build_window()
+
+        self.assertIsInstance(win, emmental.window.Window)

tests/test_settings.py

@@ -0,0 +1,34 @@
+# Copyright 2022 (c) Anna Schumaker.
+"""Test saving and loading Emmental settings."""
+import unittest
+import emmental
+
+
+class TestSettings(unittest.TestCase):
+    """Emmental settings test case."""
+
+    @unittest.mock.patch("gi.repository.Adw.Application.add_window")
+    @unittest.mock.patch("gi.repository.Adw.Application.do_startup")
+    def setUp(self, mock_startup: unittest.mock.Mock,
+              mock_add_window: unittest.mock.Mock):
+        """Set up common variables."""
+        self.app = emmental.Application()
+        self.app.do_startup()
+        self.settings = self.app.db.settings
+        self.win = self.app.win
+
+    def tearDown(self):
+        """Clean up."""
+        self.app.do_shutdown()
+
+    def test_save_window_size(self):
+        """Check saving and loading window size from the database."""
+        self.assertEqual(self.settings["window.width"], 1600)
+        self.assertEqual(self.settings["window.height"], 900)
+
+        self.win.set_default_size(100, 200)
+        self.assertEqual(self.settings["window.width"], 100)
+        self.assertEqual(self.settings["window.height"], 200)
+
+        win = self.app.build_window()
+        self.assertEqual(win.get_default_size(), (100, 200))