added tabs move function

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

20 files changed, 65 insertions, 21 deletions

diff --git a/src/ui/forms/playlistbrowser.ui b/src/ui/forms/playlistbrowser.ui
index 200a6d935..0f9280905 100644
--- a/src/ui/forms/playlistbrowser.ui
+++ b/src/ui/forms/playlistbrowser.ui
@@ -68,6 +68,9 @@
      <property name="text">
       <string>...</string>
      </property>
+     <property name="autoRaise">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="3">
@@ -75,6 +78,12 @@
      <property name="text">
       <string>...</string>
      </property>
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonIconOnly</enum>
+     </property>
+     <property name="autoRaise">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>
diff --git a/src/ui/playlistbrowser.cpp b/src/ui/playlistbrowser.cpp
index a2ccaec64..d7e630c43 100644
--- a/src/ui/playlistbrowser.cpp
+++ b/src/ui/playlistbrowser.cpp
@@ -56,16 +56,21 @@ void PlayListBrowser::updateList()
     ui.listWidget->clear();
     foreach(PlayListModel *model, m_pl_manager->playLists())
         ui.listWidget->addItem(model->name());
-    int c = m_pl_manager->indexOf(m_pl_manager->selectedPlayList());
-    ui.listWidget->setCurrentRow (c);
-    QFont font = ui.listWidget->currentItem()->font();
-    font.setBold(true);
-    ui.listWidget->currentItem()->setFont(font);
+    ui.listWidget->setCurrentRow (m_pl_manager->selectedPlayListIndex());
+    //mark current playlist
+    int current = m_pl_manager->currentPlayListIndex();
+    QListWidgetItem *item = ui.listWidget->item(current);
+    if(item)
+    {
+        QFont font = item->font();
+        font.setBold(true);
+        item->setFont(font);
+    }
 }
 
 void PlayListBrowser::on_listWidget_itemDoubleClicked(QListWidgetItem *item)
 {
-    m_pl_manager->selectPlayList(ui.listWidget->row(item));
+    m_pl_manager->activatePlayList(ui.listWidget->row(item));
 }
 
 void PlayListBrowser::on_listWidget_itemChanged(QListWidgetItem *item)
@@ -73,6 +78,11 @@ void PlayListBrowser::on_listWidget_itemChanged(QListWidgetItem *item)
     m_pl_manager->playListAt(ui.listWidget->row(item))->setName(item->text());
 }
 
+void PlayListBrowser::on_listWidget_itemPressed (QListWidgetItem *item)
+{
+    m_pl_manager->selectPlayList(ui.listWidget->row(item));
+}
+
 void PlayListBrowser::rename()
 {
     QListWidgetItem *item = ui.listWidget->currentItem();
diff --git a/src/ui/playlistbrowser.h b/src/ui/playlistbrowser.h
index c3eee00ec..563b527a5 100644
--- a/src/ui/playlistbrowser.h
+++ b/src/ui/playlistbrowser.h
@@ -40,6 +40,7 @@ private slots:
     void updateList();
     void on_listWidget_itemDoubleClicked(QListWidgetItem *item);
     void on_listWidget_itemChanged(QListWidgetItem *item);
+    void on_listWidget_itemPressed (QListWidgetItem *item);
     void rename();
     void on_deleteButton_clicked();
     void on_downButton_clicked();
diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp
index 22cc967ce..eaa75b82e 100644
--- a/src/ui/playlistselector.cpp
+++ b/src/ui/playlistselector.cpp
@@ -185,6 +185,8 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e)
     update();
     if(e->button() == Qt::RightButton)
         m_menu->exec(e->globalPos());
+    else
+        QWidget::mousePressEvent(e);
 }
 
 void PlayListSelector::mouseReleaseEvent (QMouseEvent *e)
@@ -204,6 +206,27 @@ void PlayListSelector::mouseDoubleClickEvent (QMouseEvent *e)
         QWidget::mouseDoubleClickEvent(e);
 }
 
+void PlayListSelector::mouseMoveEvent(QMouseEvent *e)
+{
+    QPoint mp = e->pos();
+    mp.rx() += m_offset;
+    int dest = -1;
+    for(int i = 0; i < m_rects.count(); ++i)
+    {
+        if(m_rects.at(i).contains(mp))
+        {
+            dest = i;
+            break;
+        }
+    }
+    if(dest == -1 || dest == m_pl_manager->selectedPlayListIndex())
+    {
+        QWidget::mouseMoveEvent(e);
+        return;
+    }
+    m_pl_manager->move(m_pl_manager->selectedPlayListIndex(), dest);
+}
+
 void PlayListSelector::resizeEvent (QResizeEvent *)
 {
     updateScrollers();
diff --git a/src/ui/playlistselector.h b/src/ui/playlistselector.h
index 538c156e1..67e281f75 100644
--- a/src/ui/playlistselector.h
+++ b/src/ui/playlistselector.h
@@ -53,6 +53,7 @@ private:
     void mousePressEvent (QMouseEvent *e);
     void mouseReleaseEvent (QMouseEvent *e);
     void mouseDoubleClickEvent (QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
     void resizeEvent (QResizeEvent *);
     void updateOffsets();
     void loadColors();
diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts
index b98645441..6deb51520 100644
--- a/src/ui/translations/qmmp_cs.ts
+++ b/src/ui/translations/qmmp_cs.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts
index b86755f9e..9091c0f85 100644
--- a/src/ui/translations/qmmp_de.ts
+++ b/src/ui/translations/qmmp_de.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>…</translation>
     </message>
diff --git a/src/ui/translations/qmmp_es.ts b/src/ui/translations/qmmp_es.ts
index d859d8863..2a125aa7a 100644
--- a/src/ui/translations/qmmp_es.ts
+++ b/src/ui/translations/qmmp_es.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts
index 2b1a7d1da..e4911384c 100644
--- a/src/ui/translations/qmmp_hu.ts
+++ b/src/ui/translations/qmmp_hu.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts
index 28eac3eb7..0b01872fc 100644
--- a/src/ui/translations/qmmp_it.ts
+++ b/src/ui/translations/qmmp_it.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_ja.ts b/src/ui/translations/qmmp_ja.ts
index 644774bee..e2d2a6d0d 100644
--- a/src/ui/translations/qmmp_ja.ts
+++ b/src/ui/translations/qmmp_ja.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts
index b65b7d543..3c1d7b23a 100644
--- a/src/ui/translations/qmmp_lt.ts
+++ b/src/ui/translations/qmmp_lt.ts
@@ -1391,7 +1391,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_nl.ts b/src/ui/translations/qmmp_nl.ts
index 6c15f30b1..24e346a02 100644
--- a/src/ui/translations/qmmp_nl.ts
+++ b/src/ui/translations/qmmp_nl.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts
index 5d775e442..93faaf72a 100644
--- a/src/ui/translations/qmmp_pl_PL.ts
+++ b/src/ui/translations/qmmp_pl_PL.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts
index 114cace98..4cf754a5e 100644
--- a/src/ui/translations/qmmp_pt_BR.ts
+++ b/src/ui/translations/qmmp_pt_BR.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts
index b954931c3..5305c907f 100644
--- a/src/ui/translations/qmmp_ru.ts
+++ b/src/ui/translations/qmmp_ru.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts
index ff5949392..0a7c81aaa 100644
--- a/src/ui/translations/qmmp_tr.ts
+++ b/src/ui/translations/qmmp_tr.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts
index e00fc2842..2afd73b29 100644
--- a/src/ui/translations/qmmp_uk_UA.ts
+++ b/src/ui/translations/qmmp_uk_UA.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation>...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts
index d994926d3..025c5f1fb 100644
--- a/src/ui/translations/qmmp_zh_CN.ts
+++ b/src/ui/translations/qmmp_zh_CN.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts
index 80991af19..bbbc44eb2 100644
--- a/src/ui/translations/qmmp_zh_TW.ts
+++ b/src/ui/translations/qmmp_zh_TW.ts
@@ -1390,7 +1390,7 @@
     </message>
     <message>
         <location filename="../forms/playlistbrowser.ui" line="69"/>
-        <location filename="../forms/playlistbrowser.ui" line="76"/>
+        <location filename="../forms/playlistbrowser.ui" line="79"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>