fixed playlist names

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

12 files changed, 27 insertions, 12 deletions

diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 4956f008f..69d53ae12 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotovs                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -113,6 +113,21 @@ void PlayListManager::activatePlayList(PlayListModel *model)
 PlayListModel *PlayListManager::createPlayList(const QString &name)
 {
     PlayListModel *model = new PlayListModel (name.isEmpty() ? tr("Playlist") : name, this);
+    QString pl_name = model->name();
+    if(playListNames().contains(pl_name))
+    {
+        int i = 0;
+        forever
+        {
+            i++;
+            if(!playListNames().contains(pl_name + QString(" (%1)").arg(i)))
+            {
+                pl_name = pl_name + QString(" (%1)").arg(i);
+                break;
+            }
+        }
+        model->setName(pl_name);
+    }
     int i = m_models.indexOf(m_selected);
     m_models.insert(i+1, model);
     model->prepareForRepeatablePlaying(m_repeatable);
diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts
index 350da3854..d30120bba 100644
--- a/src/qmmpui/translations/libqmmpui_cs.ts
+++ b/src/qmmpui/translations/libqmmpui_cs.ts
@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <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 cc2fd4f52..f35d0d68c 100644
--- a/src/qmmpui/translations/libqmmpui_de.ts
+++ b/src/qmmpui/translations/libqmmpui_de.ts
@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation>Wiedergabeliste</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts
index 12f036718..03fe51fe3 100644
--- a/src/qmmpui/translations/libqmmpui_it.ts
+++ b/src/qmmpui/translations/libqmmpui_it.ts
@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation>Lista esecuzione</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts
index 4e1b24a1b..70f03120a 100644
--- a/src/qmmpui/translations/libqmmpui_lt.ts
+++ b/src/qmmpui/translations/libqmmpui_lt.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation>Grojaraštis</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts
index 9e391d6ae..4c43da874 100644
--- a/src/qmmpui/translations/libqmmpui_pl.ts
+++ b/src/qmmpui/translations/libqmmpui_pl.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <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 7b219bc02..550bf34fe 100644
--- a/src/qmmpui/translations/libqmmpui_pt_BR.ts
+++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts
index 7bf83a891..4a907a825 100644
--- a/src/qmmpui/translations/libqmmpui_ru.ts
+++ b/src/qmmpui/translations/libqmmpui_ru.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation>Список</translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts
index 7d090faff..acb739631 100644
--- a/src/qmmpui/translations/libqmmpui_tr.ts
+++ b/src/qmmpui/translations/libqmmpui_tr.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts
index 4d02edfae..9c3b9b023 100644
--- a/src/qmmpui/translations/libqmmpui_uk_UA.ts
+++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <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 3cd266fe7..ecb35de98 100644
--- a/src/qmmpui/translations/libqmmpui_zh_CN.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts
index 288a87438..bee40b783 100644
--- a/src/qmmpui/translations/libqmmpui_zh_TW.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts
@@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; }
     <name>PlayListManager</name>
     <message>
         <location filename="../playlistmanager.cpp" line="115"/>
-        <location filename="../playlistmanager.cpp" line="335"/>
+        <location filename="../playlistmanager.cpp" line="350"/>
         <source>Playlist</source>
         <translation type="unfinished"></translation>
     </message>