Commit f1a37d8e authored by Michael Pyne's avatar Michael Pyne
Browse files

Backport fix for empty now playing bar and track announcement popup after using the search widget

when paused (whew!) to KDE 4.1.  Will be in the 4.1.2 release.

svn path=/branches/KDE/4.1/kdemultimedia/juk/; revision=855549
parent 48e3d753
......@@ -199,6 +199,8 @@ void PlaylistSplitter::setupLayout()
m_playlistBox->object(), SLOT(slotCreateSearchPlaylist()));
connect(m_searchWidget, SIGNAL(signalShown(bool)),
m_playlistBox->object(), SLOT(slotSetSearchEnabled(bool)));
connect(m_searchWidget, SIGNAL(returnPressed()),
m_playlistBox->object(), SLOT(slotPlayFirst()));
connect(ActionCollection::action<KToggleAction>("showSearch"), SIGNAL(toggled(bool)),
m_searchWidget, SLOT(setEnabled(bool)));
......
......@@ -209,6 +209,7 @@ SearchWidget::SearchWidget(QWidget *parent)
connect(&m_searchLine, SIGNAL(signalQueryChanged()), this, SIGNAL(signalQueryChanged()));
connect(&m_searchLine, SIGNAL(signalDownPressed()), this, SIGNAL(signalDownPressed()));
connect(m_searchLine.m_lineEdit, SIGNAL(returnPressed()), this, SIGNAL(returnPressed()));
// I've decided that I think this is ugly, for now.
/*
......
......@@ -30,11 +30,14 @@ class QEvent;
class KComboBox;
class KLineEdit;
class SearchWidget;
class SearchLine : public QFrame
{
Q_OBJECT
friend class SearchWidget;
public:
enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 };
......@@ -88,6 +91,7 @@ public slots:
signals:
void signalQueryChanged();
void signalAdvancedSearchClicked();
void returnPressed();
// This signal is only emitted when the Show/Hide action is triggered.
// Minimizing/closing the JuK window will not trigger this signal.
......
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