Changeset 471

Timestamp:

09/14/08 01:36:45 (5 years ago)

Author:

wolke

Message:

create marquee statusbar message to display longer messages than 30 chars. needed by playlist. to see this feature i have change the 'save' and 'save as' message to scrollstatusbarmessage.

Location:

trunk/gui/src

Files:

• HydrogenApp.cpp (modified) (1 diff)
• HydrogenApp.h (modified) (1 diff)
• MainForm.cpp (modified) (6 diffs)
• PlayerControl.cpp (modified) (2 diffs)
• PlayerControl.h (modified) (3 diffs)

trunk/gui/src/HydrogenApp.cpp

@@ -288 +288 @@
 
 
+void HydrogenApp::setScrollStatusBarMessage( const QString& msg, int msec, bool test )
+{
+        getPlayerControl()->showScrollMessage( msg, msec , test);
+}
 
 

trunk/gui/src/HydrogenApp.h

@@ -85 +85 @@
 
                 void setStatusBarMessage( const QString& msg, int msec = 0 );
+                void setScrollStatusBarMessage( const QString& msg, int msec = 0, bool test = true );
 
 #ifdef LADSPA_SUPPORT

trunk/gui/src/MainForm.cpp

@@ -162 +162 @@
         QTimer *playlistDisplayTimer = new QTimer(this);
         connect( playlistDisplayTimer, SIGNAL( timeout() ), this, SLOT( onPlaylistDisplayTimer() ) );
-        playlistDisplayTimer->start(15000);     // update player control at 
+        playlistDisplayTimer->start(30000);     // update player control at 
 // ~ playlist display timer
         
@@ -498 +498 @@
                 action_file_save();
         }
-        h2app->setStatusBarMessage( trUtf8("Song saved."), 10000 );
+        h2app->setScrollStatusBarMessage( trUtf8("Song saved as.") + QString(" Into: ") + defaultFilename, 2000 );
         //update SoundlibraryPanel
         HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
@@ -538 +538 @@
                 updateRecentUsedSongList();
 
-                h2app->setStatusBarMessage( trUtf8("Song saved."), 10000 );
+                h2app->setScrollStatusBarMessage( trUtf8("Song saved.") + QString(" Into: ") + filename, 2000 );
         }
         //update SoundlibraryPanel
@@ -1309 +1309 @@
                                 Playlist::get_instance()->setPrevSongPlaylist();
                                 songnumber = Playlist::get_instance()->getActiveSongNumber();
-                                HydrogenApp::getInstance()->setStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( songnumber +1 ), 5000 );
+                                HydrogenApp::getInstance()->setScrollStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( songnumber +1 ), 5000 );
                                 return TRUE;
                                 break;
@@ -1318 +1318 @@
                                 Playlist::get_instance()->setNextSongPlaylist();
                                 songnumber = Playlist::get_instance()->getActiveSongNumber();
-                                HydrogenApp::getInstance()->setStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( songnumber +1 ), 5000 );
+                                HydrogenApp::getInstance()->setScrollStatusBarMessage( trUtf8( "Playlist: Set song No. %1" ).arg( songnumber +1 ), 5000 );
                                 return TRUE;
                                 break;
@@ -1635 +1635 @@
 {
         if( Hydrogen::get_instance()->m_PlayList.size() == 0)
-                                        return;
+                return;
         int songnumber = Playlist::get_instance()->getActiveSongNumber();
+        QString songname = "";
         if ( songnumber == -1 )
-                                        return; 
-        HydrogenApp::getInstance()->setStatusBarMessage( trUtf8( "Playlist: Aktiv song No. %1" ).arg( songnumber +1 ), 7500 );
-
-}
+                        return;
+
+        if ( Hydrogen::get_instance()->getSong()->__name == "Untitled Song" ){
+                songname = Hydrogen::get_instance()->getSong()->get_filename(); 
+        }else
+        {
+                songname = Hydrogen::get_instance()->getSong()->__name;
+        }
+        QString message = (trUtf8("Playlist: Song No. %1").arg( songnumber + 1)) + QString("  ---  Songname: ") + songname + QString("  ---  Author: ") + Hydrogen::get_instance()->getSong()->__author;
+        HydrogenApp::getInstance()->setScrollStatusBarMessage( message, 2000, true );
+}

trunk/gui/src/PlayerControl.cpp

@@ -435 +435 @@
         m_pStatusTimer = new QTimer( this );
         connect( m_pStatusTimer, SIGNAL( timeout() ), this, SLOT( onStatusTimerEvent() ) );
+
+        m_pScrollTimer = new QTimer( this );
+        connect( m_pScrollTimer, SIGNAL( timeout() ), this, SLOT( onScrollTimerEvent() ) );
+        m_pScrollMessage = "";
 }
 
@@ -975 +979 @@
 
 
+
+void PlayerControl::showScrollMessage( const QString& msg, int msec, bool test )
+{
+
+        if ( test == false ){
+                m_pStatusLabel->setText( msg );
+                m_pScrollTimer->start( msec );  
+        }else
+        {
+                m_pScrollMessage = msg;
+                m_pStatusLabel->setText( msg );
+                m_pStatusTimer->start( msec );
+                m_pScrollTimer->start( msec );  
+                
+        }
+        
+
+}
+
+void PlayerControl::onScrollTimerEvent()
+{
+        int lwl = 25;
+        int msgLength = m_pScrollMessage.length();
+        if ( msgLength > lwl)
+                m_pScrollMessage = m_pScrollMessage.right( msgLength - 1 );
+        m_pScrollTimer->stop();
+
+        if ( msgLength > lwl){
+                showScrollMessage( m_pScrollMessage, 150, false );
+        }else
+        {
+                showMessage( m_pScrollMessage, 2000 );
+        }
+}
+
 void PlayerControl::onStatusTimerEvent()
 {

trunk/gui/src/PlayerControl.h

@@ -86 +86 @@
 
                 void showMessage( const QString& msg, int msec );
+                void showScrollMessage( const QString& msg, int msec, bool test );
 
         private slots:
@@ -108 +109 @@
                 void onBpmTimerEvent();
                 void onStatusTimerEvent();
+                void onScrollTimerEvent();
                 void showButtonClicked( Button* pRef );
 
@@ -179 +181 @@
                 LCDDisplay *m_pStatusLabel;
                 QTimer *m_pStatusTimer;
+                QTimer *m_pScrollTimer;
+                QString m_pScrollMessage; 
 };