Attachment #861 for bug #230

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 230
Collapse All | Expand All




void PlaylistBrowserView::keyPressEvent( TQKeyEvent *e )
{
    switch( e->key() ) {
         case Key_Enter:          //load <--this shortcut does not work
            Playlist::instance()->clear();
//             What is the correct TQString to pass? currentItem() does not work.
//             Playlist::instance()->setPlaylistName( currentItem(), true );
            break;

         case SHIFT+Key_Enter:    //load and play <--this shortcut does not work
            PlaylistBrowser::instance()->slotDoubleClicked( currentItem() );
            break;

        case SHIFT+Key_Delete:    //delete <--this shortcut does not work
//         case Key_Delete:          //remove <-- Where is delete/remove defined as unique operations?
            PlaylistBrowser::instance()->removeSelectedItems();
            break;

        case Key_F2:              //rename <--this shortcut does not work
            PlaylistBrowser::instance()->renameSelectedItem();
            break;


Lines 875-883 Link Here

(-)amarok/amarok/src/playlistbrowseritem.cpp (-2 / +8 lines)
875	{	875	{
876	KPopupMenu menu( listView() );	876	KPopupMenu menu( listView() );
877		877
878	enum Id { LOAD, APPEND, QUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC };	878	enum Id { LOAD, PLAY, APPEND, QUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC };
879		879
880	menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );	880	menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD );
		881	menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Load and &Play" ), PLAY );
881	menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );	882	menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
882	menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE );	883	menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE );
883		884
Lines 893-904 Link Here
893	menu.insertSeparator();	894	menu.insertSeparator();
894	menu.insertItem( SmallIconSet( Amarok::icon("edit") ), i18n( "&Rename" ), RENAME );	895	menu.insertItem( SmallIconSet( Amarok::icon("edit") ), i18n( "&Rename" ), RENAME );
895	menu.insertItem( SmallIconSet( Amarok::icon("remove_from_playlist") ), i18n( "&Delete" ), DELETE );	896	menu.insertItem( SmallIconSet( Amarok::icon("remove_from_playlist") ), i18n( "&Delete" ), DELETE );
896	menu.setAccel( Key_L, LOAD );	897	// If we can't get the shortcuts to work correctly, then remove/comment all four from the context menu.
		898	menu.setAccel( Key_Enter, LOAD );
		899	menu.setAccel( SHIFT+Key_Enter, PLAY );
897	menu.setAccel( Key_F2, RENAME );	900	menu.setAccel( Key_F2, RENAME );
898	menu.setAccel( SHIFT+Key_Delete, DELETE );	901	menu.setAccel( SHIFT+Key_Delete, DELETE );
899		902
900	switch( menu.exec( position ) )	903	switch( menu.exec( position ) )
901	{	904	{
		905	case PLAY:
		906	PlaylistEntry::slotDoubleClicked();
		907	break;
902	case LOAD:	908	case LOAD:
903	Playlist::instance()->clear();	909	Playlist::instance()->clear();
904	Playlist::instance()->setPlaylistName( text(0), true );	910	Playlist::instance()->setPlaylistName( text(0), true );

Return to bug 230

Lines 2888-2903 Link Here

(-)amarok/amarok/src/playlistbrowser.cpp (-4 / +10 lines)
2888	void PlaylistBrowserView::keyPressEvent( TQKeyEvent *e )	2888	void PlaylistBrowserView::keyPressEvent( TQKeyEvent *e )
2889	{	2889	{
2890	switch( e->key() ) {	2890	switch( e->key() ) {
2891	case Key_Space: //load	2891	case Key_Enter: //load <--this shortcut does not work
		2892	Playlist::instance()->clear();
		2893	// What is the correct TQString to pass? currentItem() does not work.
		2894	// Playlist::instance()->setPlaylistName( currentItem(), true );
		2895	break;
		2896
		2897	case SHIFT+Key_Enter: //load and play <--this shortcut does not work
2892	PlaylistBrowser::instance()->slotDoubleClicked( currentItem() );	2898	PlaylistBrowser::instance()->slotDoubleClicked( currentItem() );
2893	break;	2899	break;
2894		2900
2895	case SHIFT+Key_Delete: //delete	2901	case SHIFT+Key_Delete: //delete <--this shortcut does not work
2896	case Key_Delete: //remove	2902	// case Key_Delete: //remove <-- Where is delete/remove defined as unique operations?
2897	PlaylistBrowser::instance()->removeSelectedItems();	2903	PlaylistBrowser::instance()->removeSelectedItems();
2898	break;	2904	break;
2899		2905
2900	case Key_F2: //rename	2906	case Key_F2: //rename <--this shortcut does not work
2901	PlaylistBrowser::instance()->renameSelectedItem();	2907	PlaylistBrowser::instance()->renameSelectedItem();
2902	break;	2908	break;
2903		2909