← Back to branch summary

~ubuntu-branches/ubuntu/maverick/amarok/maverick-backports

« back to all changes in this revision

Viewing changes to src/playlist/view/PlaylistViewCommon.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-09-16 12:47:14 UTC
  • mfrom: (1.77.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20100916124714-i8jk9s2z4iyixmcw
Tags: 2:2.3.2-0ubuntu1
* New upstream release.
* Drop patches that are applied upstream:
  - debian/mysql_no_openssl_fix.diff
  - kubuntu/08_fix_ftbfs_glib_2.25.diff
  - kubuntu/09_fix_applet_destructor_crash.diff
* Drop patch that is not needed anymore:
  - kubuntu/05_kstatusnotifieritem_gnome_support.diff
* Adapt patch to new upstream version:
  - debian/mysqle_amarok_local_errmsg_feature.diff
  - kubuntu/10_soundmenu_support.diff
  - kubuntu/11_soundmenu_mpris2.0.diff
* Update install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/playlist/view/PlaylistViewCommon.cpp
65
65
            // there are no cover actions if the song/album is not in the collection
66
66
            KMenu *menuCover = new KMenu( i18n( "Album" ), menu );
67
67
            menuCover->addActions( coverActionsList );
 
68
            menuCover->setIcon( KIcon( "filename-album-amarok" ) );
68
69
            menu->addMenu( menuCover );
69
70
            menu->addSeparator();
70
71
        }
113
114
    QAction *separator = new QAction( parent );
114
115
    separator->setSeparator( true );
115
116
 
116
 
    const bool isCurrentTrack = index->data( Playlist::ActiveTrackRole ).toBool();
117
 
 
118
 
    if( m_stopAfterTrackAction == 0 )
119
 
    {
120
 
        m_stopAfterTrackAction = new QAction( KIcon( "media-playback-stop-amarok" ), i18n( "Stop Playing After This Track" ), parent );
121
 
        QObject::connect( m_stopAfterTrackAction, SIGNAL( triggered() ), parent, SLOT( stopAfterTrack() ) );
122
 
    }
123
 
    actions << m_stopAfterTrackAction;
124
 
 
125
 
    //actions << separator;
126
 
 
127
117
    const bool isQueued = index->data( Playlist::StateRole ).toInt() & Item::Queued;
128
118
    const QString queueText = !isQueued ? i18n( "Queue Track" ) : i18n( "Dequeue Track" );
129
119
 
146
136
 
147
137
    //actions << separator;
148
138
 
 
139
    const bool isCurrentTrack = index->data( Playlist::ActiveTrackRole ).toBool();
 
140
 
 
141
    if( m_stopAfterTrackAction == 0 )
 
142
    {
 
143
        m_stopAfterTrackAction = new QAction( KIcon( "media-playback-stop-amarok" ), i18n( "Stop Playing After This Track" ), parent );
 
144
        QObject::connect( m_stopAfterTrackAction, SIGNAL( triggered() ), parent, SLOT( stopAfterTrack() ) );
 
145
    }
 
146
    actions << m_stopAfterTrackAction;
 
147
 
 
148
    //actions << separator;
 
149
 
149
150
    if( m_removeTracTrackAction == 0 )
150
151
    {
151
152
        m_removeTracTrackAction = new QAction( KIcon( "media-track-remove-amarok" ), i18n( "Remove From Playlist" ), parent );