Fix bug when used together with metacity
The playlist and equalizer windows where hidden when switching to another desktop
This commit is contained in:
parent
221e1255d0
commit
d1a98b5367
3 changed files with 3 additions and 19 deletions
|
@ -259,7 +259,7 @@ MainDisplay::SetupToggleButtons (void)
|
||||||
m_eq->resize (skin->getSize (Skin::BUTTON_MW_EQ));
|
m_eq->resize (skin->getSize (Skin::BUTTON_MW_EQ));
|
||||||
m_eq->move (skin->getPos (Skin::BUTTON_MW_EQ));
|
m_eq->move (skin->getPos (Skin::BUTTON_MW_EQ));
|
||||||
m_eq->setChecked (m_mw->getEQ ()->isVisible ());
|
m_eq->setChecked (m_mw->getEQ ()->isVisible ());
|
||||||
connect (m_eq, SIGNAL (toggled (bool)),
|
connect (m_eq, SIGNAL (clicked (bool)),
|
||||||
m_mw->getEQ (), SLOT (setVisible (bool)));
|
m_mw->getEQ (), SLOT (setVisible (bool)));
|
||||||
connect (m_mw->getEQ (), SIGNAL (visibilityChanged (bool)),
|
connect (m_mw->getEQ (), SIGNAL (visibilityChanged (bool)),
|
||||||
m_eq, SLOT (setChecked (bool)));
|
m_eq, SLOT (setChecked (bool)));
|
||||||
|
@ -269,7 +269,7 @@ MainDisplay::SetupToggleButtons (void)
|
||||||
m_pls->resize (skin->getSize (Skin::BUTTON_MW_PLS));
|
m_pls->resize (skin->getSize (Skin::BUTTON_MW_PLS));
|
||||||
m_pls->move (skin->getPos (Skin::BUTTON_MW_PLS));
|
m_pls->move (skin->getPos (Skin::BUTTON_MW_PLS));
|
||||||
m_pls->setChecked (m_mw->getPL ()->isVisible ());
|
m_pls->setChecked (m_mw->getPL ()->isVisible ());
|
||||||
connect (m_pls, SIGNAL (toggled (bool)),
|
connect (m_pls, SIGNAL (clicked (bool)),
|
||||||
m_mw->getPL (), SLOT (setVisible (bool)));
|
m_mw->getPL (), SLOT (setVisible (bool)));
|
||||||
connect (m_mw->getPL (), SIGNAL (visibilityChanged (bool)),
|
connect (m_mw->getPL (), SIGNAL (visibilityChanged (bool)),
|
||||||
m_pls, SLOT (setChecked (bool)));
|
m_pls, SLOT (setChecked (bool)));
|
||||||
|
|
|
@ -142,9 +142,6 @@ PlaylistView::PlaylistView (QWidget *parent) : QListView (parent)
|
||||||
|
|
||||||
connect (xmmsh.xplayback (), SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
|
connect (xmmsh.xplayback (), SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
|
||||||
this, SLOT(handleStatus(Xmms::Playback::Status)));
|
this, SLOT(handleStatus(Xmms::Playback::Status)));
|
||||||
|
|
||||||
connect (this, SIGNAL (clicked (QModelIndex)),
|
|
||||||
this, SLOT (on_item_clicked (QModelIndex)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -200,7 +197,7 @@ PlaylistView::contextMenuEvent (QContextMenuEvent *e)
|
||||||
|
|
||||||
qm.addSeparator ();
|
qm.addSeparator ();
|
||||||
|
|
||||||
a= new QAction (tr ("Change Playlist"), this);
|
a= new QAction (tr ("Choose Playlist"), this);
|
||||||
connect (a, SIGNAL (triggered ()), qobject_cast<PlaylistWidget *>(parent ()), SLOT (openPlaylistChooser ()));
|
connect (a, SIGNAL (triggered ()), qobject_cast<PlaylistWidget *>(parent ()), SLOT (openPlaylistChooser ()));
|
||||||
qm.addAction (a);
|
qm.addAction (a);
|
||||||
|
|
||||||
|
@ -306,13 +303,3 @@ PlaylistView::showEntryInfo (void)
|
||||||
m_entry_info->show ();
|
m_entry_info->show ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
PlaylistView::on_item_clicked (QModelIndex index)
|
|
||||||
{
|
|
||||||
if (m_entry_info) {
|
|
||||||
uint32_t id = model ()->data (index, PlaylistModel::MedialibIdRole)
|
|
||||||
.toUInt ();
|
|
||||||
m_entry_info->setId (id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -66,9 +66,6 @@ class PlaylistView : public QListView {
|
||||||
protected:
|
protected:
|
||||||
void mouseDoubleClickEvent (QMouseEvent *event);
|
void mouseDoubleClickEvent (QMouseEvent *event);
|
||||||
|
|
||||||
private slots:
|
|
||||||
void on_item_clicked (QModelIndex index);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Xmms::Playback::Status m_status;
|
Xmms::Playback::Status m_status;
|
||||||
QFont *m_font;
|
QFont *m_font;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue