fixed some bugs, updated Russian translation

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3620 90c681e8-e032-0410-971d-27865f9a5e38

22 files changed, 64 insertions, 42 deletions

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>