/[svn]/qsampler/trunk/src/qsamplerMainForm.ui.h
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerMainForm.ui.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 341 by capela, Tue Jan 18 11:29:01 2005 UTC revision 369 by capela, Fri Feb 11 13:30:21 2005 UTC
# Line 205  void qsamplerMainForm::setup ( qsamplerO Line 205  void qsamplerMainForm::setup ( qsamplerO
205      // We got options?      // We got options?
206      m_pOptions = pOptions;      m_pOptions = pOptions;
207    
         // Set initial instrument name display mode.  
     qsamplerChannel::setInstrumentNames(m_pOptions->bInstrumentNames);  
   
208      // Some child forms are to be created right now.      // Some child forms are to be created right now.
209      m_pMessages = new qsamplerMessages(this);      m_pMessages = new qsamplerMessages(this);
210      // Set message defaults...      // Set message defaults...
# Line 559  bool qsamplerMainForm::loadSessionFile ( Line 556  bool qsamplerMainForm::loadSessionFile (
556      if (piChannelIDs == NULL) {      if (piChannelIDs == NULL) {
557          appendMessagesClient("lscp_list_channels");          appendMessagesClient("lscp_list_channels");
558          appendMessagesError(tr("Could not get current list of channels.\n\nSorry."));          appendMessagesError(tr("Could not get current list of channels.\n\nSorry."));
559      }      } else {
560                        // Try to (re)create each channel.
561      // Try to (re)create each channel.                  m_pWorkspace->setUpdatesEnabled(false);
562      m_pWorkspace->setUpdatesEnabled(false);                  for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) {
563      for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) {                          createChannelStrip(new qsamplerChannel(this, piChannelIDs[iChannel]));
564          createChannelStrip(new qsamplerChannel(this, piChannelIDs[iChannel]));                          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
565          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);                  }
566      }                  m_pWorkspace->setUpdatesEnabled(true);
567      m_pWorkspace->setUpdatesEnabled(true);          }
568    
569      // Save as default session directory.      // Save as default session directory.
570      if (m_pOptions)      if (m_pOptions)
# Line 963  void qsamplerMainForm::viewOptions (void Line 960  void qsamplerMainForm::viewOptions (void
960          int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;          int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;
961          bool    bOldCompletePath    = m_pOptions->bCompletePath;          bool    bOldCompletePath    = m_pOptions->bCompletePath;
962          int     iOldMaxRecentFiles  = m_pOptions->iMaxRecentFiles;          int     iOldMaxRecentFiles  = m_pOptions->iMaxRecentFiles;
         bool    bOldInstrumentNames = m_pOptions->bInstrumentNames;  
963          // Load the current setup settings.          // Load the current setup settings.
964          pOptionsForm->setup(m_pOptions);          pOptionsForm->setup(m_pOptions);
965          // Show the setup dialog...          // Show the setup dialog...
# Line 977  void qsamplerMainForm::viewOptions (void Line 973  void qsamplerMainForm::viewOptions (void
973                  updateMessagesCapture();                  updateMessagesCapture();
974              }              }
975              // Check wheather something immediate has changed.              // Check wheather something immediate has changed.
             if (( bOldInstrumentNames && !m_pOptions->bInstrumentNames) ||  
                 (!bOldInstrumentNames &&  m_pOptions->bInstrumentNames))  
                 qsamplerChannel::setInstrumentNames(m_pOptions->bInstrumentNames);  
976              if (( bOldCompletePath && !m_pOptions->bCompletePath) ||              if (( bOldCompletePath && !m_pOptions->bCompletePath) ||
977                  (!bOldCompletePath &&  m_pOptions->bCompletePath) ||                  (!bOldCompletePath &&  m_pOptions->bCompletePath) ||
978                  (iOldMaxRecentFiles != m_pOptions->iMaxRecentFiles))                  (iOldMaxRecentFiles != m_pOptions->iMaxRecentFiles))
Legend:
Removed from v.341  
changed lines
  Added in v.369
  ViewVC Help
Powered by ViewVC