Changeset 518

Timestamp:

09/25/08 11:16:07 (2 months ago)

Author:

wolke

Message:

soundlibrary panel background change color enhancement. now works if playlist load a new song and also work at 'new song' and 'open song' from mainform.cpp

Files:

• trunk/gui/src/MainForm.cpp (modified) (3 diffs)
• trunk/gui/src/PlaylistEditor/PlaylistDialog.cpp (modified) (2 diffs)
• trunk/gui/src/SoundLibrary/SoundLibraryPanel.cpp (modified) (4 diffs)
• trunk/gui/src/SoundLibrary/SoundLibraryPanel.h (modified) (2 diffs)
• trunk/libs/hydrogen/src/playlist.cpp (modified) (5 diffs)

trunk/gui/src/MainForm.cpp

@@ -454 +454 @@
-        h2app->setSong(song);
-        Hydrogen::get_instance()->setSelectedPatternNumber( 0 );
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
-}
-
@@ -631 +632 @@
-        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-}
+
+
-
-void MainForm::action_file_open() {
@@ -695 +698 @@
-                openSongFile( filename );
-        }
+
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
-}
-

trunk/gui/src/PlaylistEditor/PlaylistDialog.cpp

@@ -24 +24 @@
-#include "PlaylistDialog.h"
-#include "../HydrogenApp.h"
+#include "../InstrumentRack.h"
+#include "SoundLibrary/SoundLibraryPanel.h"
-
-#include <hydrogen/LocalFileMng.h>
@@ -725 +727 @@
-        pH2App->setStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( index +1 ), 5000 );
-
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
+
-///exec script
-///this is very very simple and only an experiment

trunk/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -474 +474 @@
-void SoundLibraryPanel::on_drumkitLoadAction()
-{
+        restore_background_color();
+
+        QString sDrumkitName = __sound_library_tree->currentItem()->text(0);
+
+        Drumkit *drumkitInfo = NULL;
+
+        // find the drumkit in the list
+        for ( uint i = 0; i < __system_drumkit_info_list.size(); i++ ) {
+                Drumkit *pInfo = __system_drumkit_info_list[i];
+                if ( pInfo->getName() == sDrumkitName ) {
+                        drumkitInfo = pInfo;
+                        break;
+                }
+        }
+        for ( uint i = 0; i < __user_drumkit_info_list.size(); i++ ) {
+                Drumkit *pInfo = __user_drumkit_info_list[i];
+                if ( pInfo->getName() == sDrumkitName ) {
+                        drumkitInfo = pInfo;
+                        break;
+                }
+        }
+        assert( drumkitInfo );
+
+        setCursor( QCursor( Qt::WaitCursor ) );
+
+        Hydrogen::get_instance()->loadDrumkit( drumkitInfo );
+        Hydrogen::get_instance()->getSong()->__is_modified = true;
+        HydrogenApp::getInstance()->onDrumkitLoad( drumkitInfo->getName() );
+
+        __sound_library_tree->currentItem()->setBackgroundColor ( 0, QColor( 50, 50, 50) );
+
+        setCursor( QCursor( Qt::ArrowCursor ) );
+
+        // update drumkit info in save tab
+        //saveTab_nameTxt ->setText( QString( drumkitInfo->getName().c_str() ) );
+        //saveTab_authorTxt->setText( QString( drumkitInfo->getAuthor().c_str() ) );
+        //saveTab_infoTxt->append( QString( drumkitInfo->getInfo().c_str() ) );
+
+//      HydrogenApp::getInstance()->getPatternEditorPanel()->getPatternEditor()->updateEditor( true );
+
+//HydrogenApp::getInstance()->getPatternEditorPanel()->getDrumPatternEditor()->updateEditor();
+}
+
+
+
+void SoundLibraryPanel::update_background_color()
+{
+        restore_background_color();
+        change_background_color();
+}
+
+
+
+void SoundLibraryPanel::restore_background_color()
+{
-        std::vector<QString> systemList = Drumkit::getSystemDrumkitList();
-        std::vector<QString> userList = Drumkit::getUserDrumkitList();
@@ -481 +536 @@
-                if (  !__system_drumkits_item->child( i ) )
-                        break;
-
-
-
-
+
+
+
-        }
-
@@ -490 +544 @@
-                if (  !__user_drumkits_item->child( i ) )
-                        break;
+                ( __user_drumkits_item->child( i ) )->setBackground(0, QBrush() );
+        }
+}
+
+
+
+void SoundLibraryPanel::change_background_color()
+{
+        std::vector<QString> systemList = Drumkit::getSystemDrumkitList();
+        std::vector<QString> userList = Drumkit::getUserDrumkitList();
+        QString curlib =  Hydrogen::get_instance()->m_currentDrumkit;
+ 
+        for (uint i = 0; i < systemList.size() ; i++){
+                if (  !__system_drumkits_item->child( i ) )
+                        break;
+                if ( ( __system_drumkits_item->child( i ) )->text( 0 ) == curlib ){
+                        ( __system_drumkits_item->child( i ) )->setBackgroundColor ( 0, QColor( 50, 50, 50)  );
+                        break;
+                }
+        }
+
+        for (uint i = 0; i < userList.size() ; i++){
+                if (  !__user_drumkits_item->child( i ) )
+                        break;
-                if ( ( __user_drumkits_item->child( i ))->text( 0 ) == curlib ){
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        QString sDrumkitName = __sound_library_tree->currentItem()->text(0);
-
@@ -509 +636 @@
-        }
-        for ( uint i = 0; i < __user_drumkit_info_list.size(); i++ ) {
-                Drumkit *pInfo = __user_drumkit_info_list[i];
-                if ( pInfo->getName() == sDrumkitName ) {
-                        drumkitInfo = pInfo;
-                        break;
-                }
-        }
-        assert( drumkitInfo );
-
-        setCursor( QCursor( Qt::WaitCursor ) );
-
-        Hydrogen::get_instance()->loadDrumkit( drumkitInfo );
-        Hydrogen::get_instance()->getSong()->__is_modified = true;
-        HydrogenApp::getInstance()->onDrumkitLoad( drumkitInfo->getName() );
-
-        __sound_library_tree->currentItem()->setBackgroundColor ( 0, QColor( 50, 50, 50) );
-
-        setCursor( QCursor( Qt::ArrowCursor ) );
-
-        // update drumkit info in save tab
-        //saveTab_nameTxt ->setText( QString( drumkitInfo->getName().c_str() ) );
-        //saveTab_authorTxt->setText( QString( drumkitInfo->getAuthor().c_str() ) );
-        //saveTab_infoTxt->append( QString( drumkitInfo->getInfo().c_str() ) );
-
-//      HydrogenApp::getInstance()->getPatternEditorPanel()->getPatternEditor()->updateEditor( true );
-
-//HydrogenApp::getInstance()->getPatternEditorPanel()->getDrumPatternEditor()->updateEditor();
-}
-
-
-
-void SoundLibraryPanel::on_drumkitDeleteAction()
-{
-        QString sSoundLibrary = __sound_library_tree->currentItem()->text( 0 );
-
-        //if we delete the current loaded drumkit we can get truble with some empty pointers
-        if ( sSoundLibrary == Hydrogen::get_instance()->getCurrentDrumkitname() ){
-                QMessageBox::warning( this, "Hydrogen", QString( "You try to delet the current loaded drumkit.\nThis is not possible!") );
-                return;
-        }
-
-        bool bIsUserSoundLibrary = false;
-        std::vector<QString> userList = Drumkit::getUserDrumkitList();
-        for ( uint i = 0; i < userList.size(); ++i ) {
-                if ( userList[ i ].endsWith( sSoundLibrary ) ) {
-                        bIsUserSoundLibrary = true;
-                        break;
-                }
-        }
-
-        if ( bIsUserSoundLibrary == false ) {
-                QMessageBox::warning( this, "Hydrogen", QString( "A system drumkit can't be deleted.") );
-                return;
-        }
-
-        int res = QMessageBox::information( this, "Hydrogen", tr( "Warning, the selected drumkit will be deleted from disk.\nAre you sure?"), tr("&Ok"), tr("&Cancel"), 0, 1 );
-        if ( res == 1 ) {
-                return;
-        }
-
-        Drumkit::removeDrumkit( sSoundLibrary );
-        test_expandedItems();
-        updateDrumkitList();
-}
-
-
-
-void SoundLibraryPanel::on_drumkitExportAction()
-{
-        SoundLibraryExportDialog exportDialog( this );
-        exportDialog.exec();
-}
-
-
-
-void SoundLibraryPanel::on_drumkitPropertiesAction()
-{
-        QString sDrumkitName = __sound_library_tree->currentItem()->text(0);
-
-        Drumkit *drumkitInfo = NULL;
-
-        // find the drumkit in the list
-        for ( uint i = 0; i < __system_drumkit_info_list.size(); i++ ) {
-                Drumkit *pInfo = __system_drumkit_info_list[i];
-                if ( pInfo->getName() == sDrumkitName ) {
-                        drumkitInfo = pInfo;
-                        break;
-                }
-        }
-        for ( uint i = 0; i < __user_drumkit_info_list.size(); i++ ) {
-                Drumkit*pInfo = __user_drumkit_info_list[i];
-                if ( pInfo->getName() == sDrumkitName ) {

trunk/gui/src/SoundLibrary/SoundLibraryPanel.h

@@ -51 +51 @@
-        void updateDrumkitList();
-        void test_expandedItems();
+        void update_background_color();
-
-private slots:
@@ -89 +90 @@
-        bool __expand_pattern_list;
-        bool __expand_songs_list;
+        void restore_background_color();
+        void change_background_color();
+
-};
-

trunk/libs/hydrogen/src/playlist.cpp

@@ -21 +21 @@
- */
-
-
-
+
+
+
-
-#include <hydrogen/LocalFileMng.h>
@@ -29 +30 @@
-#include <hydrogen/hydrogen.h>
-#include <hydrogen/playlist.h>
-#include "gui/src/HydrogenApp.h"
-
-#include <vector>
@@ -94 +94 @@
-        loadSong( selected );
-        execScript( realNumber );
+
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
-}
-
@@ -123 +125 @@
-        loadSong( selected );
-        execScript( index );
+
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
-}
-
@@ -153 +157 @@
-        loadSong( selected );
-        execScript( index );
+
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->update_background_color();
-}
-