aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp1
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_de.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_es.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_he.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_it.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts6
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts4
-rw-r--r--src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts4
-rw-r--r--src/qmmpui/playlistmanager.cpp25
-rw-r--r--src/qmmpui/playlistmanager.h4
-rw-r--r--src/qmmpui/playlistmodel.cpp1
-rw-r--r--src/qmmpui/translations/libqmmpui_cs.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_de.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_es.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_fr.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_he.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_hu.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_it.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_ja.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_kk.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_lt.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_nl.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_pl_PL.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_pt_BR.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_ru.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_sk.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_tr.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_uk_UA.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_zh_CN.ts4
-rw-r--r--src/qmmpui/translations/libqmmpui_zh_TW.ts4
42 files changed, 104 insertions, 81 deletions
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index bd367b11d..2270d3a7f 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -296,6 +296,7 @@ void PlayList::createActions()
m_pl_manager, SLOT(reverseList()));
QAction *groupAct = m_sortMenu->addAction(tr("Group tracks"));
groupAct->setCheckable(true);
+ groupAct->setChecked(m_pl_manager->isGroupsEnabled());
connect(groupAct,SIGNAL(triggered(bool)),m_pl_manager,SLOT(setGroupsEnabled(bool)));
//playlist context menu
m_listWidget->menu()->addAction(ActionManager::instance()->action(ActionManager::PL_SHOW_INFO));
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts
index 6a093fad2..9e86e585f 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts
@@ -796,7 +796,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Nový seznam skladeb</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Podle čísla skladby</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Činnosti</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts
index d2dce72c2..103571d69 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts
@@ -796,7 +796,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Neue Wiedergabeliste</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Nach Titelnummer</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Aktionen</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts
index e370aa447..e8b4fdeaa 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Lista nueva</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Lista de reproducción</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Acciones</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts
index 444984b8f..7f11da1ee 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts
@@ -806,12 +806,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts
index 86187a6b5..4fd9daa94 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts
@@ -815,12 +815,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>פעולות</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>רשימת השמעה &amp;חדשה</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts
index edacdbb82..ee1a4577d 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts
@@ -807,12 +807,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Tevékenységek</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts
index 9261bc175..888c3674b 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation type="unfinished">Lista brani</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Azioni</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts
index 7634ec2a6..0c8b81642 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts
@@ -813,12 +813,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>動作</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>新しいプレイリスト(&amp;N)</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts
index c4840367f..196b7a014 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts
@@ -806,7 +806,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation>Трек нөмірі бойынша</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Әрекеттер</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts
index d22044db5..8ea1d0efb 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts
@@ -802,7 +802,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Naujas grojaraštis</translation>
</message>
@@ -818,7 +818,7 @@
<translation>Grojaraštis</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Veiksmai</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts
index a0f3eec7d..fc6eb7120 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts
@@ -796,7 +796,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Nieuwe Afspeellijst</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Op Lied Nummer</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Acties</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts
index e74789513..443d3581e 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Nowa lista odtwarzania</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Lista odtwarzania</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Akcje</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts
index 1a2fdf116..fc9476621 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation type="unfinished">Lista de músicas</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts
index 04f5bece3..80ce4a4c4 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts
@@ -798,10 +798,10 @@
<message>
<location filename="../playlist.cpp" line="297"/>
<source>Group tracks</source>
- <translation type="unfinished"></translation>
+ <translation>Группировать треки</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Новый список</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Список</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Действия</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts
index 09081baeb..0c2b6fa81 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts
@@ -796,7 +796,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Nový playlist</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Podľa čísla skladby</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Činnosti</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts
index b3639eb2a..5a9e077fb 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation type="unfinished">Çalma Listesi</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Eylemler</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts
index 230535255..5235bded6 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation>&amp;Новий список</translation>
</message>
@@ -817,7 +817,7 @@
<translation>Список</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>Дії</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts
index 5bb171f9a..0da42b8bc 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation type="unfinished">播放列表</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>动作</translation>
</message>
diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts
index a01232d29..990c43cd2 100644
--- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts
+++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts
@@ -801,7 +801,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../playlist.cpp" line="571"/>
+ <location filename="../playlist.cpp" line="572"/>
<source>&amp;New PlayList</source>
<translation type="unfinished"></translation>
</message>
@@ -817,7 +817,7 @@
<translation type="unfinished">播放清單</translation>
</message>
<message>
- <location filename="../playlist.cpp" line="305"/>
+ <location filename="../playlist.cpp" line="306"/>
<source>Actions</source>
<translation>動作</translation>
</message>
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index c0f580555..b31e9297f 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -47,8 +47,8 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
m_timer->setSingleShot(true);
connect(m_timer, SIGNAL(timeout()), SLOT(writePlayLists()));
- readPlayLists(); //read playlists
readSettings(); //read settings
+ readPlayLists(); //read playlists
}
PlayListManager::~PlayListManager()
@@ -57,6 +57,7 @@ PlayListManager::~PlayListManager()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("Playlist/repeatable", m_repeatable);
settings.setValue("Playlist/shuffle", m_shuffle);
+ settings.setValue("Playlist/groups", m_groups_enabled);
m_instance = 0;
}
@@ -271,6 +272,11 @@ bool PlayListManager::isShuffle() const
return m_shuffle;
}
+bool PlayListManager::isGroupsEnabled() const
+{
+ return m_groups_enabled;
+}
+
void PlayListManager::readPlayLists()
{
QString line, param, value;
@@ -304,6 +310,8 @@ void PlayListManager::readPlayLists()
tracks.clear();
current = 0;
m_models << new PlayListModel(value, this);
+ if(m_groups_enabled)
+ m_models.last()->prepareGroups(true);
}
else if (param == "current")
{
@@ -338,19 +346,27 @@ void PlayListManager::readPlayLists()
tracks.last()->setLength(value.toInt());
}
buffer.close();
- if(!m_models.isEmpty())
+ if(m_models.isEmpty())
+ {
+ m_models << new PlayListModel(tr("Playlist"),this);
+ if(m_groups_enabled)
+ m_models.last()->prepareGroups(true);
+ }
+ else
{
m_models.last()->add(tracks);
m_models.last()->setCurrent(tracks.at(qBound(0, current, tracks.count()-1)));
}
- else
- m_models << new PlayListModel(tr("Playlist"),this);
if(pl < 0 || pl >= m_models.count())
pl = 0;
m_selected = m_models.at(pl);
m_current = m_models.at(pl);
foreach(PlayListModel *model, m_models)
+ {
connect(model, SIGNAL(nameChanged(QString)), SIGNAL(playListsChanged()));
+ if (m_autosave_playlist)
+ connect(model, SIGNAL(countChanged()), m_timer, SLOT(start()));
+ }
}
void PlayListManager::writePlayLists()
@@ -499,6 +515,7 @@ void PlayListManager::readSettings()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
setRepeatableList(settings.value("Playlist/repeatable",false).toBool());
setShuffle(settings.value("Playlist/shuffle",false).toBool());
+ setGroupsEnabled(settings.value("Playlist/groups",false).toBool());
QmmpUiSettings *ui_settings = QmmpUiSettings::instance();
if (m_autosave_playlist != ui_settings->autoSavePlayList())
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 4f8447778..c6769e4fd 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -90,6 +90,10 @@ public:
* Returns state of "Shuffle" option.
*/
bool isShuffle() const;
+ /*!
+ * Returns \b true if the playlist groups are enabled. Otherwise returns \b false.
+ */
+ bool isGroupsEnabled() const;
signals:
/*!
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 4cddd236e..7c1d5eae7 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -119,6 +119,7 @@ void PlayListModel::add(QList<PlayListTrack *> tracks)
}
emit itemAdded(track);
}
+ preparePlayState();
emit listChanged();
emit countChanged();
}
diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts
index 003625785..aca39a904 100644
--- a/src/qmmpui/translations/libqmmpui_cs.ts
+++ b/src/qmmpui/translations/libqmmpui_cs.ts
@@ -716,8 +716,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Seznam skladeb</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts
index 61a4e6dda..21d212984 100644
--- a/src/qmmpui/translations/libqmmpui_de.ts
+++ b/src/qmmpui/translations/libqmmpui_de.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Wiedergabeliste</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_es.ts b/src/qmmpui/translations/libqmmpui_es.ts
index e21444fd7..799e5508c 100644
--- a/src/qmmpui/translations/libqmmpui_es.ts
+++ b/src/qmmpui/translations/libqmmpui_es.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Lista de reproducción</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_fr.ts b/src/qmmpui/translations/libqmmpui_fr.ts
index 52595ffd3..717b79e30 100644
--- a/src/qmmpui/translations/libqmmpui_fr.ts
+++ b/src/qmmpui/translations/libqmmpui_fr.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_he.ts b/src/qmmpui/translations/libqmmpui_he.ts
index 9931890ab..3909d451f 100644
--- a/src/qmmpui/translations/libqmmpui_he.ts
+++ b/src/qmmpui/translations/libqmmpui_he.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>רשימת השמעה</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_hu.ts b/src/qmmpui/translations/libqmmpui_hu.ts
index 4135276d2..f1c2e6340 100644
--- a/src/qmmpui/translations/libqmmpui_hu.ts
+++ b/src/qmmpui/translations/libqmmpui_hu.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts
index d0fee7ddd..cbce6c8db 100644
--- a/src/qmmpui/translations/libqmmpui_it.ts
+++ b/src/qmmpui/translations/libqmmpui_it.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Lista esecuzione</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_ja.ts b/src/qmmpui/translations/libqmmpui_ja.ts
index 5f90fbe92..44bd14a22 100644
--- a/src/qmmpui/translations/libqmmpui_ja.ts
+++ b/src/qmmpui/translations/libqmmpui_ja.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>プレイリスト</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_kk.ts b/src/qmmpui/translations/libqmmpui_kk.ts
index f9c93fad8..40952d594 100644
--- a/src/qmmpui/translations/libqmmpui_kk.ts
+++ b/src/qmmpui/translations/libqmmpui_kk.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts
index 31f2f13d2..11344200f 100644
--- a/src/qmmpui/translations/libqmmpui_lt.ts
+++ b/src/qmmpui/translations/libqmmpui_lt.ts
@@ -715,8 +715,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Grojaraštis</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_nl.ts b/src/qmmpui/translations/libqmmpui_nl.ts
index ccb10cd6d..9f4deed0f 100644
--- a/src/qmmpui/translations/libqmmpui_nl.ts
+++ b/src/qmmpui/translations/libqmmpui_nl.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Afspeellijst</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_pl_PL.ts b/src/qmmpui/translations/libqmmpui_pl_PL.ts
index 7f92cdd7b..8ef40f8be 100644
--- a/src/qmmpui/translations/libqmmpui_pl_PL.ts
+++ b/src/qmmpui/translations/libqmmpui_pl_PL.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Lista odtwarzania</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts
index 94db84e94..e66dd7f5e 100644
--- a/src/qmmpui/translations/libqmmpui_pt_BR.ts
+++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished">Lista de músicas</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts
index 2f479dccc..b37c855c5 100644
--- a/src/qmmpui/translations/libqmmpui_ru.ts
+++ b/src/qmmpui/translations/libqmmpui_ru.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Список</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_sk.ts b/src/qmmpui/translations/libqmmpui_sk.ts
index cd647fc1f..115d6fd2d 100644
--- a/src/qmmpui/translations/libqmmpui_sk.ts
+++ b/src/qmmpui/translations/libqmmpui_sk.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished">Playlist</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts
index b72dd45d8..dc85c58e3 100644
--- a/src/qmmpui/translations/libqmmpui_tr.ts
+++ b/src/qmmpui/translations/libqmmpui_tr.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation type="unfinished">Çalma Listesi</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts
index a43f63cd8..f2898bd1f 100644
--- a/src/qmmpui/translations/libqmmpui_uk_UA.ts
+++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>Список</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts
index c2c6d7f74..f42fc01b1 100644
--- a/src/qmmpui/translations/libqmmpui_zh_CN.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>播放列表</translation>
</message>
diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts
index 1c9cfce81..5ebb5920f 100644
--- a/src/qmmpui/translations/libqmmpui_zh_TW.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts
@@ -714,8 +714,8 @@
<context>
<name>PlayListManager</name>
<message>
- <location filename="../playlistmanager.cpp" line="160"/>
- <location filename="../playlistmanager.cpp" line="347"/>
+ <location filename="../playlistmanager.cpp" line="161"/>
+ <location filename="../playlistmanager.cpp" line="351"/>
<source>Playlist</source>
<translation>播放清單</translation>
</message>