Commit d4e7c32a authored by Jakob Leben's avatar Jakob Leben

Qt: ooops, fix deleting playlist items by key press

parent b5c4baa4
......@@ -288,17 +288,25 @@ void StandardPLPanel::browseInto( )
QModelIndex() );
}
/* Delete and Suppr key remove the selection
FilterKey function and code function */
void StandardPLPanel::keyPressEvent( QKeyEvent *e )
void StandardPLPanel::wheelEvent( QWheelEvent *e )
{
switch( e->key() )
// Accept this event in order to prevent unwanted volume up/down changes
e->accept();
}
bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
{
if (event->type() == QEvent::KeyPress)
{
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
if( keyEvent->key() == Qt::Key_Delete ||
keyEvent->key() == Qt::Key_Back )
{
case Qt::Key_Back:
case Qt::Key_Delete:
deleteSelection();
break;
return true;
}
}
return false;
}
void StandardPLPanel::deleteSelection()
......@@ -316,7 +324,7 @@ void StandardPLPanel::createIconView()
this, popupPlView( const QPoint & ) );
CONNECT( iconView, activated( const QModelIndex & ),
this, activate( const QModelIndex & ) );
iconView->installEventFilter( this );
layout->addWidget( iconView, 1, 0, 1, -1 );
}
......@@ -328,7 +336,7 @@ void StandardPLPanel::createListView()
this, popupPlView( const QPoint & ) );
CONNECT( listView, activated( const QModelIndex & ),
this, activate( const QModelIndex & ) );
listView->installEventFilter( this );
layout->addWidget( listView, 1, 0, 1, -1 );
}
......@@ -380,6 +388,7 @@ void StandardPLPanel::createTreeView()
this, popupSelectColumn( QPoint ) );
CONNECT( treeView, customContextMenuRequested( const QPoint & ),
this, popupPlView( const QPoint & ) );
treeView->installEventFilter( this );
/* SignalMapper for columns */
selectColumnsSigMapper = new QSignalMapper( this );
......@@ -447,12 +456,6 @@ void StandardPLPanel::cycleViews()
assert( 0 );
}
void StandardPLPanel::wheelEvent( QWheelEvent *e )
{
// Accept this event in order to prevent unwanted volume up/down changes
e->accept();
}
void StandardPLPanel::activate( const QModelIndex &index )
{
if( model->hasChildren( index ) )
......
......@@ -60,9 +60,6 @@ public:
protected:
friend class PlaylistWidget;
virtual void keyPressEvent( QKeyEvent *e );
virtual void wheelEvent( QWheelEvent *e );
PLModel *model;
private:
enum {
......@@ -99,6 +96,8 @@ private:
void createTreeView();
void createIconView();
void createListView();
void wheelEvent( QWheelEvent *e );
bool eventFilter ( QObject * watched, QEvent * event );
public slots:
void setRoot( playlist_item_t * );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment