Commit 35bc462a authored by Scott Wheeler's avatar Scott Wheeler

Make pressing enter on a playlist item play that item.

CCMAIL:59631-done@bugs.kde.org

svn path=/trunk/kdemultimedia/juk/; revision=231408
parent 7957fddc
......@@ -252,7 +252,7 @@ void JuK::setupLayout()
setCentralWidget(m_splitter);
// playlist item activation connection
connect(m_splitter, SIGNAL(signalDoubleClicked()), this, SLOT(slotPlaySelectedFile()));
connect(m_splitter, SIGNAL(signalActivated()), this, SLOT(slotPlaySelectedFile()));
connect(m_splitter, SIGNAL(signalListBoxDoubleClicked()), this, SLOT(startPlayingPlaylist()));
// create status bar
......
......@@ -815,8 +815,6 @@ void Playlist::setup()
connect(this, SIGNAL(selectionChanged()),
this, SLOT(slotEmitSelected()));
connect(this, SIGNAL(doubleClicked(QListViewItem *)),
this, SLOT(slotEmitDoubleClicked(QListViewItem *)));
connect(this, SIGNAL(contextMenuRequested( QListViewItem *, const QPoint&, int)),
this, SLOT(slotShowRMBMenu(QListViewItem *, const QPoint &, int)));
connect(this, SIGNAL(itemRenamed(QListViewItem *, const QString &, int)),
......
......@@ -270,7 +270,6 @@ private:
private slots:
void slotEmitSelected() { emit signalSelectionChanged(selectedItems()); }
void slotEmitDoubleClicked(QListViewItem *) { emit signalDoubleClicked(); }
void slotShowRMBMenu(QListViewItem *item, const QPoint &point, int column);
void slotApplyModification(QListViewItem *item, const QString &text, int column);
void slotRenameTag();
......
......@@ -555,14 +555,22 @@ void PlaylistSplitter::setupPlaylist(Playlist *p, bool raise, const char *icon,
{
connect(p, SIGNAL(signalSelectionChanged(const PlaylistItemList &)),
m_editor, SLOT(slotSetItems(const PlaylistItemList &)));
connect(p, SIGNAL(signalDoubleClicked()),
this, SIGNAL(signalDoubleClicked()));
connect(p, SIGNAL(doubleClicked(QListViewItem *)),
this, SIGNAL(signalActivated()));
connect(p, SIGNAL(returnPressed(QListViewItem *)),
this, SIGNAL(signalActivated()));
connect(p, SIGNAL(signalNumberOfItemsChanged(Playlist *)),
this, SLOT(slotPlaylistCountChanged(Playlist *)));
connect(p, SIGNAL(signalAboutToRemove(PlaylistItem *)),
this, SLOT(slotPlaylistItemRemoved(PlaylistItem *)));
connect(p, SIGNAL(signalFilesDropped(const QStringList &, Playlist *)),
this, SLOT(slotAddToPlaylist(const QStringList &, Playlist *)));
connect(p, SIGNAL(signalSetNext(PlaylistItem *)),
this, SLOT(slotSetNextItem(PlaylistItem *)));
......
......@@ -226,7 +226,7 @@ public slots:
void slotDeletePlaylist() { m_playlistBox->deleteItem(); }
signals:
void signalDoubleClicked();
void signalActivated();
void signalListBoxDoubleClicked();
void signalPlaylistChanged();
void signalSelectedPlaylistCountChanged(int);
......
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