← Back to branch summary

~tobyll/moovida/media_scanner_ignore_files

« back to all changes in this revision

Viewing changes to elisa-plugins/elisa/plugins/daap/controller.py

  • Committer: Florian Boucault
  • Date: 2008-09-29 16:41:08 UTC
  • Revision ID: kaleo@samantha-20080929164108-vsspfl741r9jhuts
Reverted revision 753. Too big of a patch before a release and contains
obvious bugs: broken slideshow, disappearing selector when using the mouse in
vertical lists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
elisa-plugins/elisa/plugins/daap/controller.py
55
55
        return deferred
56
56
 
57
57
    def node_clicked(self, widget, item):
58
 
        browser = self.frontend.retrieve_controllers('/poblesec/browser')[0]
59
 
        controller_path = '/poblesec/music/daap/albums'
60
 
        dfr = browser.history.append_controller(controller_path,
61
 
                                                item.name, artist=item)
 
58
        widget_index = self.nodes._widget_index_from_item_index(widget.model.index(item))
 
59
        selected_item = self.nodes._widgets[widget_index]
 
60
 
 
61
        if selected_item != self._previous_clicked:
 
62
            selected_item.activate(previous=self._previous_clicked)
 
63
            self._previous_clicked = selected_item
 
64
 
 
65
            browser = self.frontend.retrieve_controllers('/poblesec/browser')[0]
 
66
            controller_path = '/poblesec/music/daap/albums'
 
67
            dfr = browser.history.append_controller(controller_path,
 
68
                                                    item.name, artist=item)
62
69
 
63
70
class ArtistsDaapPreviewListController(ArtistsDaapController, MenuItemPreviewListController):
64
71
    view_mode = ArtistsViewMode
102
109
        return deferred
103
110
 
104
111
    def node_clicked(self, widget, item):
105
 
        browser = self.frontend.retrieve_controllers('/poblesec/browser')[0]
106
 
        controller_path = '/poblesec/music/daap/tracks'
107
 
        dfr = browser.history.append_controller(controller_path,
108
 
                                                item.name, album=item)
 
112
        widget_index = self.nodes._widget_index_from_item_index(widget.model.index(item))
 
113
        selected_item = self.nodes._widgets[widget_index]
 
114
 
 
115
        if selected_item != self._previous_clicked:
 
116
            selected_item.activate(previous=self._previous_clicked)
 
117
            self._previous_clicked = selected_item
 
118
 
 
119
            browser = self.frontend.retrieve_controllers('/poblesec/browser')[0]
 
120
            controller_path = '/poblesec/music/daap/tracks'
 
121
            dfr = browser.history.append_controller(controller_path,
 
122
                                                    item.name, album=item)
109
123
 
110
124
class AlbumsDaapPreviewListController(AlbumsDaapController, MenuItemPreviewListController):
111
125
    view_mode = AlbumsViewMode
144
158
        return deferred
145
159
 
146
160
    def node_clicked(self, widget, item):
147
 
        self.play_audio(item)
 
161
        widget_index = self.nodes._widget_index_from_item_index(widget.model.index(item))
 
162
        selected_item = self.nodes._widgets[widget_index]
 
163
 
 
164
        if selected_item != self._previous_clicked:
 
165
            selected_item.activate(previous=self._previous_clicked)
 
166
            self._previous_clicked = selected_item
 
167
            self.play_audio(item)
148
168
 
149
169
    def play_audio(self, item):
150
170
        player = self.frontend.retrieve_controllers('/poblesec/music_player')[0]