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

Timestamp:

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

Author:

gabriel

Message:

Merge rev 505:528 from trunk

Files:

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

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

@@ -24 +24 @@
 #include "PlaylistDialog.h"
 #include "../HydrogenApp.h"
+#include "../InstrumentRack.h"
+#include "SoundLibrary/SoundLibraryPanel.h"
 
 #include <hydrogen/LocalFileMng.h>
@@ -171 +173 @@
                 QTreeWidget* m_pPlaylist = m_pPlaylistTree;
                 QTreeWidgetItem* m_pPlaylistItem = m_pPlaylist->topLevelItem ( aselected );
-                m_pPlaylist->setCurrentItem ( m_pPlaylistItem );
-                }
-
-        QTimer *timer = new QTimer( this );
+                m_pPlaylistItem->setBackgroundColor ( 0, QColor( 50, 50, 50) );
+                m_pPlaylistItem->setBackgroundColor ( 1, QColor( 50, 50, 50) );
+                m_pPlaylistItem->setBackgroundColor ( 2, QColor( 50, 50, 50) );
+                }
+
+        timer = new QTimer( this );
         connect(timer, SIGNAL(timeout() ), this, SLOT( updateActiveSongNumber() ) );
         timer->start( 1000 );   // update player control at 1 fps
@@ -213 +217 @@
         QTreeWidget* m_pPlaylist = m_pPlaylistTree;
         QTreeWidgetItem* m_pPlaylistItem = m_pPlaylistTree->currentItem();
+        int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
         QTreeWidgetItem * m_pItem = m_pPlaylist->topLevelItem ( 1 );
 
@@ -238 +243 @@
                         delete m_pPlaylistItem;
                         updatePlayListVector();
+                        if (  Playlist::get_instance()->getActiveSongNumber() == index ){
+                                Playlist::get_instance()->setActiveSongNumber( -1 );
+                        }else if (  Playlist::get_instance()->getActiveSongNumber() > index  ){
+                                Playlist::get_instance()->setActiveSongNumber(  Playlist::get_instance()->getActiveSongNumber() -1 );
+                        }
+                        
                 }
         }
@@ -332 +343 @@
                         m_pPlaylist->setCurrentItem ( m_pPlaylistItem );
                         Playlist::get_instance()->setSelectedSongNr( 0 );
-//                      Playlist::get_instance()->setNextSongByNumber( 0 );
                 }
 
@@ -557 +567 @@
 void PlaylistDialog::o_upBClicked()
 {       
+        timer->stop();
 
         Playlist* pList = Playlist::get_instance();
@@ -564 +575 @@
         int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
 
-        if (index == 0 ) return;
+        if (index == 0 ){
+                timer->start( 1000 ); 
+                return;
+        }
 
         QTreeWidgetItem* tmpPlaylistItem = m_pPlaylist->takeTopLevelItem ( index );
@@ -571 +585 @@
         m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
 
-        if ( pList->getSelectedSongNr() > 0 )
+        if ( pList->getSelectedSongNr() >= 0 )
                 pList->setSelectedSongNr( pList->getSelectedSongNr() -1 );
-        if ( pList->getActiveSongNumber() > 0 )
+
+        if ( pList->getActiveSongNumber() == index ){
                 pList->setActiveSongNumber( pList->getActiveSongNumber() -1 );
+        }else if ( pList->getActiveSongNumber() == index -1 ){
+                pList->setActiveSongNumber( pList->getActiveSongNumber() +1 );
+        }
 
         updatePlayListVector();
@@ -583 +601 @@
 void PlaylistDialog::o_downBClicked()
 {
-
+        timer->stop();
         Playlist* pList = Playlist::get_instance();
 
@@ -591 +609 @@
         int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
 
-        if ( index == length - 1) 
-                        return;
+        if ( index == length - 1){
+                timer->start( 1000 );
+                return;
+        }
 
 
@@ -600 +620 @@
         m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
 
-        if ( pList->getSelectedSongNr() > 0 )
+        if ( pList->getSelectedSongNr() >= 0 )
                 pList->setSelectedSongNr( pList->getSelectedSongNr() +1 );
-        if (pList ->getActiveSongNumber() > 0 )
+
+        if (pList ->getActiveSongNumber() == index ){
                 pList->setActiveSongNumber( pList->getActiveSongNumber() +1 );
-
+        }else if ( pList->getActiveSongNumber() == index +1 ){
+                pList->setActiveSongNumber( pList->getActiveSongNumber() -1 );
+        }
         updatePlayListVector();
 
@@ -703 +726 @@
 
         pH2App->setStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( index +1 ), 5000 );
+
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
 
 ///exec script
@@ -762 +787 @@
                 Hydrogen::get_instance()->m_PlayList.push_back( playListItem );
         }
+        timer->start( 1000 );
 }
 
 
 void PlaylistDialog::updateActiveSongNumber()
-{                       
+{
+        QTreeWidget* m_pPlaylist = m_pPlaylistTree;
+
+        for ( uint i = 0; i < Hydrogen::get_instance()->m_PlayList.size(); ++i ){
+                if ( !m_pPlaylist->topLevelItem( i ) )
+                        break;
+                ( m_pPlaylist->topLevelItem( i ) )->setBackground( 0, QBrush() );
+                ( m_pPlaylist->topLevelItem( i ) )->setBackground( 1, QBrush() );
+                ( m_pPlaylist->topLevelItem( i ) )->setBackground( 2, QBrush() );
+                
+        }
+                
         int selected = Playlist::get_instance()->getActiveSongNumber();
         if ( selected == -1 ) 
                 return;
         
-        QTreeWidget* m_pPlaylist = m_pPlaylistTree;
         QTreeWidgetItem* m_pPlaylistItem = m_pPlaylist->topLevelItem ( selected );      
-        m_pPlaylist->setCurrentItem ( m_pPlaylistItem );
+        //m_pPlaylist->setCurrentItem ( m_pPlaylistItem );
+        m_pPlaylistItem->setBackgroundColor ( 0, QColor( 50, 50, 50) );
+        m_pPlaylistItem->setBackgroundColor ( 1, QColor( 50, 50, 50) );
+        m_pPlaylistItem->setBackgroundColor ( 2, QColor( 50, 50, 50) );
 }