[gnome-music/wip/jfelder/artistsview-selection: 38/41] artistalbumswidget: Remove selection-mode-allowed logic

[Jean Felder <jfelder src gnome org>]

commit a6ff85c36c6894f63a1145afc55181d7e99bd8a7
Author: Jean Felder <jfelder src gnome org>
Date:   Tue Mar 24 20:30:54 2020 +0100

    artistalbumswidget: Remove selection-mode-allowed logic
    
    The selection-mode-allowed logic was used by DiscListBox to
    distinguish the AlbumWidget use case (selection-mode allowed) from the
    ArtistAlbumWidget one (selection-mode is not allowed).
    
    Selection is now possible from an ArtistAlbumsWidget. Therefore, there
    is no need for selection-mode-allowed.

 data/ui/AlbumWidget.ui                   |  1 -
 gnomemusic/views/artistsview.py          |  2 +-
 gnomemusic/widgets/artistalbumswidget.py |  6 ++----
 gnomemusic/widgets/artistalbumwidget.py  | 12 +-----------
 gnomemusic/widgets/disclistboxwidget.py  |  9 +--------
 5 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/data/ui/AlbumWidget.ui b/data/ui/AlbumWidget.ui
index 75d649ac..18ef287f 100644
--- a/data/ui/AlbumWidget.ui
+++ b/data/ui/AlbumWidget.ui
@@ -226,7 +226,6 @@
                     <property name="margin_bottom">64</property>
                     <property name="margin_end">32</property>
                     <property name="selection_mode">0</property>
-                    <property name="selection_mode_allowed">True</property>
                     <property name="visible">True</property>
                   </object>
                 </child>
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index 925f3277..c7252e00 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -147,7 +147,7 @@ class ArtistsView(BaseView):
             return
 
         self._artist_albums = ArtistAlbumsWidget(
-            coreartist, self._application, True)
+            coreartist, self._application)
 
         self.bind_property(
             "selection-mode", self._artist_albums, "selection-mode",
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index 42bb42ed..37c5c96a 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -41,14 +41,13 @@ class ArtistAlbumsWidget(Gtk.ListBox):
     selection_mode = GObject.Property(type=bool, default=False)
 
     def __init__(
-            self, coreartist, application, selection_mode_allowed=False):
+            self, coreartist, application):
         super().__init__()
 
         self._application = application
         self._artist = coreartist.props.artist
         self._model = coreartist.props.model
         self._player = self._application.props.player
-        self._selection_mode_allowed = selection_mode_allowed
 
         self._cover_size_group = Gtk.SizeGroup.new(
             Gtk.SizeGroupMode.HORIZONTAL)
@@ -81,8 +80,7 @@ class ArtistAlbumsWidget(Gtk.ListBox):
         row.props.activatable = False
 
         widget = ArtistAlbumWidget(
-            corealbum, self._selection_mode_allowed,
-            self._songs_grid_size_group, self._cover_size_group)
+            corealbum, self._songs_grid_size_group, self._cover_size_group)
 
         self.bind_property(
             'selection-mode', widget, 'selection-mode',
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index 2c7e5d73..716fa365 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -48,22 +48,17 @@ class ArtistAlbumWidget(Gtk.Box):
     }
 
     def __init__(
-            self, corealbum, selection_mode_allowed, size_group=None,
-            cover_size_group=None):
+            self, corealbum, size_group=None, cover_size_group=None):
         super().__init__(orientation=Gtk.Orientation.HORIZONTAL)
 
         self._size_group = size_group
         self._cover_size_group = cover_size_group
 
         self._selection_mode = False
-        self._selection_mode_allowed = selection_mode_allowed
 
         self._cover_stack.props.size = Art.Size.MEDIUM
         self._cover_stack.update(corealbum)
 
-        allowed = self._selection_mode_allowed
-        self._disc_list_box.props.selection_mode_allowed = allowed
-
         self.bind_property(
             'selection-mode', self._disc_list_box, 'selection-mode',
             GObject.BindingFlags.BIDIRECTIONAL
@@ -90,11 +85,6 @@ class ArtistAlbumWidget(Gtk.Box):
     def _create_widget(self, disc):
         disc_box = self._create_disc_box(disc.props.disc_nr, disc.model)
 
-        self._disc_list_box.bind_property(
-            "selection-mode-allowed", disc_box, "selection-mode-allowed",
-            GObject.BindingFlags.BIDIRECTIONAL
-            | GObject.BindingFlags.SYNC_CREATE)
-
         self._disc_list_box.bind_property(
             "selection-mode", disc_box, "selection-mode",
             GObject.BindingFlags.BIDIRECTIONAL
diff --git a/gnomemusic/widgets/disclistboxwidget.py b/gnomemusic/widgets/disclistboxwidget.py
index 8c6fea4a..514393f4 100644
--- a/gnomemusic/widgets/disclistboxwidget.py
+++ b/gnomemusic/widgets/disclistboxwidget.py
@@ -45,7 +45,6 @@ class DiscBox(Gtk.ListBoxRow):
     }
 
     selection_mode = GObject.Property(type=bool, default=False)
-    selection_mode_allowed = GObject.Property(type=bool, default=True)
     show_disc_label = GObject.Property(type=bool, default=False)
     show_durations = GObject.Property(type=bool, default=False)
     show_favorites = GObject.Property(type=bool, default=False)
@@ -125,8 +124,7 @@ class DiscBox(Gtk.ListBoxRow):
 
         mod_mask = Gtk.accelerator_get_default_mod_mask()
         if ((event.get_state() & mod_mask) == Gdk.ModifierType.CONTROL_MASK
-                and not self.props.selection_mode
-                and self.props.selection_mode_allowed):
+                and not self.props.selection_mode):
             self.props.selection_mode = True
             widget.props.select_click = True
             widget.props.coresong.props.selected = True
@@ -151,8 +149,6 @@ class DiscListBox(Gtk.ListBox):
     """
     __gtype_name__ = 'DiscListBox'
 
-    selection_mode_allowed = GObject.Property(type=bool, default=False)
-
     def __init__(self):
         """Initialize"""
         super().__init__()
@@ -191,7 +187,4 @@ class DiscListBox(Gtk.ListBox):
 
         :param bool value: Activate selection mode
         """
-        if not self.props.selection_mode_allowed:
-            return
-
         self._selection_mode = value