Changeset 538 for branches/jackMidi/gui/src/PlaylistEditor/PlaylistDialog.cpp

Timestamp:

09/29/08 05:36:14 (5 years ago)

Author:

gabriel

Message:

Merge rev 465:505 from trunk

Files:

• branches/jackMidi/gui/src/PlaylistEditor/PlaylistDialog.cpp (modified) (6 diffs)

branches/jackMidi/gui/src/PlaylistEditor/PlaylistDialog.cpp

@@ -118 +118 @@
         up_btn->setFontSize(7);
         up_btn->setToolTip( trUtf8( "sort" ) );
-        connect(up_btn, SIGNAL(clicked(Button*)), this, SLOT(on_upBTN_clicked()) );
+        connect(up_btn, SIGNAL(clicked(Button*)), this, SLOT(o_upBClicked()) );
         sideBarLayout->addWidget(up_btn);
 
@@ -132 +132 @@
         down_btn->setFontSize(7);
         down_btn->setToolTip( trUtf8( "sort" ) );
-        connect(down_btn, SIGNAL(clicked(Button*)), this, SLOT(on_downBTN_clicked()));
+        connect(down_btn, SIGNAL(clicked(Button*)), this, SLOT(o_downBClicked()));
         sideBarLayout->addWidget(down_btn);
         
@@ -555 +555 @@
 
 
-void PlaylistDialog::on_upBTN_clicked()
+void PlaylistDialog::o_upBClicked()
 {       
+
+        Playlist* pList = Playlist::get_instance();
 
         QTreeWidget* m_pPlaylist = m_pPlaylistTree;
@@ -568 +570 @@
         m_pPlaylist->insertTopLevelItem ( index -1, tmpPlaylistItem );
         m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
+
+        if ( pList->getSelectedSongNr() > 0 )
+                pList->setSelectedSongNr( pList->getSelectedSongNr() -1 );
+        if ( pList->getActiveSongNumber() > 0 )
+                pList->setActiveSongNumber( pList->getActiveSongNumber() -1 );
+
         updatePlayListVector();
 
@@ -573 +581 @@
 
 
-void PlaylistDialog::on_downBTN_clicked()
-{
+void PlaylistDialog::o_downBClicked()
+{
+
+        Playlist* pList = Playlist::get_instance();
 
         QTreeWidget* m_pPlaylist = m_pPlaylistTree;
@@ -589 +599 @@
         m_pPlaylist->insertTopLevelItem ( index +1, tmpPlaylistItem );
         m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
+
+        if ( pList->getSelectedSongNr() > 0 )
+                pList->setSelectedSongNr( pList->getSelectedSongNr() +1 );
+        if (pList ->getActiveSongNumber() > 0 )
+                pList->setActiveSongNumber( pList->getActiveSongNumber() +1 );
+
         updatePlayListVector();