From 73b5f5312a00236f264403e995d268641212b61f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 23 Aug 2013 08:12:25 +0000 Subject: improved sorting implementation git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3648 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/groupedcontainer.cpp | 53 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'src/qmmpui/groupedcontainer.cpp') diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp index 59eba7398..c789a3fd9 100644 --- a/src/qmmpui/groupedcontainer.cpp +++ b/src/qmmpui/groupedcontainer.cpp @@ -18,10 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "playlistmodel.h" #include "groupedcontainer_p.h" GroupedContainer::GroupedContainer() { + m_reverted = false; } GroupedContainer::~GroupedContainer() @@ -295,6 +297,56 @@ void GroupedContainer::randomizeList() addTracks(tracks); } +void GroupedContainer::sort(int mode) +{ + if(mode == PlayListModel::ARTIST || mode == PlayListModel::ALBUM || mode == PlayListModel::DATE) + { + QList tracks = takeAllTracks(); + doSort(mode, tracks, m_reverted); + addTracks(tracks); + } + else + { + m_items.clear(); + foreach (PlayListGroup *g, m_groups) + { + QList tracks = g->takeAll(); + doSort(mode, tracks, m_reverted); + g->addTracks(tracks); + m_items.append(g); + foreach (PlayListTrack *t, tracks) + { + m_items.append(t); + } + } + updateIndex(); + } + m_reverted = !m_reverted; +} + +void GroupedContainer::sortSelection(int mode) +{ + QList tracks = takeAllTracks(); + QList selected_tracks; + QList selected_indexes; + for(int i = 0; i < tracks.count(); ++i) + { + if(tracks[i]->isSelected()) + { + selected_tracks.append(tracks[i]); + selected_indexes.append(i); + } + } + doSort(mode, selected_tracks, m_reverted); + + for (int i = 0; i < selected_indexes.count(); i++) + tracks.replace(selected_indexes[i], selected_tracks[i]); + + addTracks(tracks); + + m_reverted = !m_reverted; +} + void GroupedContainer::updateIndex() { for(int i = 0; i < m_groups.count(); ++i) @@ -311,4 +363,3 @@ void GroupedContainer::updateIndex() } } } - -- cgit v1.2.3-13-gbd6f