From e85bdcc7f44b91c0cb1adfc6ffa0b7ba9a475289 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Wed, 24 Jan 2024 09:06:00 -0500 Subject: [PATCH] header: Rename volume header objects I'm going to add a second popover button to the header, so I need to clarify which button these objects are being attached to. Signed-off-by: Anna Schumaker --- emmental/header/__init__.py | 20 ++++++++--------- tests/header/test_header.py | 44 +++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/emmental/header/__init__.py b/emmental/header/__init__.py index b3654c5..aff2897 100644 --- a/emmental/header/__init__.py +++ b/emmental/header/__init__.py @@ -59,15 +59,15 @@ class Header(Gtk.HeaderBar): self._icons.append(self._volume_icon) self._icons.append(self._background_icon) - self._box = Gtk.ListBox(selection_mode=Gtk.SelectionMode.NONE) - self._box.add_css_class("boxed-list") - self._box.append(self._volume) - self._box.append(self._background) - self._box.append(self._replaygain) + self._vol_box = Gtk.ListBox(selection_mode=Gtk.SelectionMode.NONE) + self._vol_box.add_css_class("boxed-list") + self._vol_box.append(self._volume) + self._vol_box.append(self._background) + self._vol_box.append(self._replaygain) - self._button = buttons.PopoverButton(popover_child=self._box, - child=self._icons, - has_frame=False, margin_end=6) + self._vol_button = buttons.PopoverButton(popover_child=self._vol_box, + child=self._icons, + has_frame=False, margin_end=6) self.bind_property("title", self._title, "title") self.bind_property("subtitle", self._title, "subtitle") @@ -93,7 +93,7 @@ class Header(Gtk.HeaderBar): self._settings.connect("clicked", self.__run_settings) self.pack_start(self._settings) - self.pack_end(self._button) + self.pack_end(self._vol_button) self.set_title_widget(self._title) self._open.connect("track-requested", self.__track_requested) @@ -119,7 +119,7 @@ class Header(Gtk.HeaderBar): status = (f"volume: {round(self.volume * 100)}%\n" f"background listening: {bg_status}\n" f"normalizing: {rg_status}") - self._button.set_tooltip_text(status) + self._vol_button.set_tooltip_text(status) def __track_requested(self, button: open.Button, path: pathlib.Path) -> None: diff --git a/tests/header/test_header.py b/tests/header/test_header.py index df51e36..9de318c 100644 --- a/tests/header/test_header.py +++ b/tests/header/test_header.py @@ -110,7 +110,7 @@ class TestHeader(tests.util.TestCase): self.assertEqual(self.header._volume.volume, vol) self.assertEqual(self.header._volume_icon.get_icon_name(), f"audio-volume-{icon}-symbolic") - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), f"volume: {i*10}%\n" "background listening: off\nnormalizing: off") @@ -128,19 +128,19 @@ class TestHeader(tests.util.TestCase): self.assertTrue(self.header._background.enabled) self.assertEqual(self.header._background_icon.get_icon_name(), "sound-wave-alt") - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), "volume: 100%\nbackground listening: 50%\n" "normalizing: off") self.header.bg_volume = 0.75 self.assertEqual(self.header._background.volume, 0.75) - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), "volume: 100%\nbackground listening: 75%\n" "normalizing: off") self.header._background.volume = 0.25 self.assertEqual(self.header.bg_volume, 0.25) - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), "volume: 100%\nbackground listening: 25%\n" "normalizing: off") @@ -160,7 +160,7 @@ class TestHeader(tests.util.TestCase): self.header.rg_mode = "track" self.assertTrue(self.header._replaygain.enabled) self.assertEqual(self.header._replaygain.mode, "track") - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), "volume: 100%\nbackground listening: off\n" "normalizing: track mode") @@ -168,32 +168,34 @@ class TestHeader(tests.util.TestCase): self.header._replaygain.mode = "album" self.assertFalse(self.header.rg_enabled) self.assertEqual(self.header.rg_mode, "album") - self.assertEqual(self.header._button.get_tooltip_text(), + self.assertEqual(self.header._vol_button.get_tooltip_text(), "volume: 100%\nbackground listening: off\n" "normalizing: off") - def test_popover_button(self): - """Check that the menu popover button was set up correctly.""" - self.assertIsInstance(self.header._button, + def test_volume_popover_button(self): + """Check that the volume popover button was set up correctly.""" + self.assertIsInstance(self.header._vol_button, emmental.buttons.PopoverButton) - self.assertEqual(self.header._button.popover_child, self.header._box) + self.assertEqual(self.header._vol_button.popover_child, + self.header._vol_box) - self.assertEqual(self.header._button.get_child(), self.header._icons) - self.assertEqual(self.header._button.get_margin_end(), 6) - self.assertFalse(self.header._button.get_has_frame()) + self.assertEqual(self.header._vol_button.get_child(), + self.header._icons) + self.assertEqual(self.header._vol_button.get_margin_end(), 6) + self.assertFalse(self.header._vol_button.get_has_frame()) - def test_popover_child(self): - """Check that the menu popover button child was set up correctly.""" - self.assertIsInstance(self.header._box, Gtk.ListBox) - self.assertEqual(self.header._box.get_selection_mode(), + def test_volume_popover_child(self): + """Check that the volume popover button child was set up correctly.""" + self.assertIsInstance(self.header._vol_box, Gtk.ListBox) + self.assertEqual(self.header._vol_box.get_selection_mode(), Gtk.SelectionMode.NONE) - self.assertTrue(self.header._box.has_css_class("boxed-list")) + self.assertTrue(self.header._vol_box.has_css_class("boxed-list")) - self.assertEqual(self.header._box.get_row_at_index(0), + self.assertEqual(self.header._vol_box.get_row_at_index(0), self.header._volume) - self.assertEqual(self.header._box.get_row_at_index(1), + self.assertEqual(self.header._vol_box.get_row_at_index(1), self.header._background) - self.assertEqual(self.header._box.get_row_at_index(2), + self.assertEqual(self.header._vol_box.get_row_at_index(2), self.header._replaygain) def test_accelerators(self):