Commit 47dd6c9c authored by Michael Pyne's avatar Michael Pyne
Browse files

Forward port fix for Play Queue being created twice and Play Queue changes not being

saved on exit to trunk.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=760147
parent b8d97f6a
...@@ -835,8 +835,10 @@ void PlaylistCollection::saveConfig() ...@@ -835,8 +835,10 @@ void PlaylistCollection::saveConfig()
{ {
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(KGlobal::config(), "Playlists");
config.writeEntry("ImportPlaylists", m_importPlaylists); config.writeEntry("ImportPlaylists", m_importPlaylists);
config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked()); config.writeEntry("showUpcoming", action("showUpcoming")->isChecked());
config.writePathEntry("DirectoryList", m_folderList); config.writePathEntry("DirectoryList", m_folderList);
config.sync();
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
...@@ -924,9 +926,9 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) ...@@ -924,9 +926,9 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
actions()->addAction("showUpcoming", upcomingAction); actions()->addAction("showUpcoming", upcomingAction);
upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue"))); upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue")));
connect(historyAction, SIGNAL(toggled(bool)), connect(historyAction, SIGNAL(triggered(bool)),
this, SLOT(slotSetHistoryPlaylistEnabled(bool))); this, SLOT(slotSetHistoryPlaylistEnabled(bool)));
connect(upcomingAction, SIGNAL(toggled(bool)), connect(upcomingAction, SIGNAL(triggered(bool)),
this, SLOT(slotSetUpcomingPlaylistEnabled(bool))); this, SLOT(slotSetUpcomingPlaylistEnabled(bool)));
} }
......
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