[gnome-music] view: Don't allow right-click in Artists view to enable selection mode
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music] view: Don't allow right-click in Artists view to enable selection mode
- Date: Mon, 12 May 2014 08:50:09 +0000 (UTC)
commit c5595f6784544e0a24f402e58a151a4a3ca6dc1c
Author: Arnel Borja <arnelborja src gnome org>
Date: Fri May 9 03:13:29 2014 +0800
view: Don't allow right-click in Artists view to enable selection mode
gnomemusic/view.py | 2 +-
gnomemusic/widgets.py | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 3fe3598..f66678a 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -1224,7 +1224,7 @@ class Search(ViewContainer):
self._artistAlbumsWidget = Widgets.ArtistAlbums(
artist, albums, self.player,
- self.header_bar, self.selection_toolbar
+ self.header_bar, self.selection_toolbar, True
)
self.add(self._artistAlbumsWidget)
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 0b64a29..e47889b 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -321,12 +321,14 @@ class AlbumWidget(Gtk.EventBox):
class ArtistAlbums(Gtk.VBox):
@log
- def __init__(self, artist, albums, player, header_bar, selection_toolbar):
+ def __init__(self, artist, albums, player,
+ header_bar, selection_toolbar, selectionModeAllowed=False):
Gtk.VBox.__init__(self)
self.player = player
self.artist = artist
self.albums = albums
self.selectionMode = False
+ self.selectionModeAllowed = selectionModeAllowed
self.selection_toolbar = selection_toolbar
self.header_bar = header_bar
self.ui = Gtk.Builder()
@@ -366,7 +368,10 @@ class ArtistAlbums(Gtk.VBox):
@log
def add_album(self, album):
- widget = ArtistAlbumWidget(self.artist, album, self.player, self.model, self.header_bar)
+ widget = ArtistAlbumWidget(
+ self.artist, album, self.player, self.model,
+ self.header_bar, self.selectionModeAllowed
+ )
self._albumBox.pack_start(widget, False, False, 0)
self.widgets.append(widget)
@@ -446,9 +451,9 @@ class ArtistAlbums(Gtk.VBox):
class AllArtistsAlbums(ArtistAlbums):
@log
- def __init__(self, player, header_bar, selection_toolbar):
+ def __init__(self, player, header_bar, selection_toolbar, selectionModeAllowed=False):
ArtistAlbums.__init__(self, _("All Artists"), [], player,
- header_bar, selection_toolbar)
+ header_bar, selection_toolbar, selectionModeAllowed)
self._offset = 0
self._populate()
@@ -468,7 +473,7 @@ class AllArtistsAlbums(ArtistAlbums):
class ArtistAlbumWidget(Gtk.HBox):
@log
- def __init__(self, artist, album, player, model, header_bar):
+ def __init__(self, artist, album, player, model, header_bar, selectionModeAllowed):
super(Gtk.HBox, self).__init__()
self.player = player
self.album = album
@@ -477,6 +482,7 @@ class ArtistAlbumWidget(Gtk.HBox):
self.model.connect('row-changed', self._model_row_changed)
self.header_bar = header_bar
self.selectionMode = False
+ self.selectionModeAllowed = selectionModeAllowed
self.songs = []
self.monitors = []
self.ui = Gtk.Builder()
@@ -587,7 +593,10 @@ class ArtistAlbumWidget(Gtk.HBox):
if not self.selectionMode and \
(event.button == Gdk.BUTTON_SECONDARY or \
(event.button == 1 and event.state & Gdk.ModifierType.CONTROL_MASK)):
- self.header_bar._select_button.set_active(True)
+ if self.selectionModeAllowed:
+ self.header_bar._select_button.set_active(True)
+ else:
+ return
if self.selectionMode:
self.model[widget._iter][6] = not self.model[widget._iter][6]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]