/[svn]/qsampler/trunk/src/qsamplerChannelForm.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerChannelForm.cpp

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

revision 1504 by capela, Wed Nov 21 11:46:40 2007 UTC revision 1506 by schoenebeck, Wed Nov 21 19:57:18 2007 UTC
# Line 206  void ChannelForm::setup ( qsamplerChanne Line 206  void ChannelForm::setup ( qsamplerChanne
206          QString sInstrumentFile = pChannel->instrumentFile();          QString sInstrumentFile = pChannel->instrumentFile();
207          if (sInstrumentFile.isEmpty())          if (sInstrumentFile.isEmpty())
208                  sInstrumentFile = qsamplerChannel::noInstrumentName();                  sInstrumentFile = qsamplerChannel::noInstrumentName();
209          ui.InstrumentFileComboBox->setItemText(          ui.InstrumentFileComboBox->setEditText(sInstrumentFile);
                 ui.InstrumentFileComboBox->currentIndex(),  
                 sInstrumentFile);  
210          ui.InstrumentNrComboBox->clear();          ui.InstrumentNrComboBox->clear();
211          ui.InstrumentNrComboBox->insertItems(0,          ui.InstrumentNrComboBox->insertItems(0,
212                  qsamplerChannel::getInstrumentList(sInstrumentFile,                  qsamplerChannel::getInstrumentList(sInstrumentFile,
# Line 447  void ChannelForm::openInstrumentFile (vo Line 445  void ChannelForm::openInstrumentFile (vo
445          if (sInstrumentFile.isEmpty())          if (sInstrumentFile.isEmpty())
446                  return;                  return;
447    
448          ui.InstrumentFileComboBox->setItemText(          ui.InstrumentFileComboBox->setEditText(sInstrumentFile);
                 ui.InstrumentFileComboBox->currentIndex(),  
                 sInstrumentFile);  
   
449          updateInstrumentName();          updateInstrumentName();
450  }  }
451    
# Line 768  void ChannelForm::optionsChanged (void) Line 763  void ChannelForm::optionsChanged (void)
763  // Stabilize current form state.  // Stabilize current form state.
764  void ChannelForm::stabilizeForm (void)  void ChannelForm::stabilizeForm (void)
765  {  {
766          bool bValid = true;          const bool bValid =
767                    ui.EngineNameComboBox->currentIndex() >= 0 &&
768                    ui.EngineNameComboBox->currentText() !=
769                    qsamplerChannel::noEngineName();
770  #if 0  #if 0
771          const QString& sPath = InstrumentFileComboBox->currentText();          const QString& sPath = InstrumentFileComboBox->currentText();
772          bValid = bValid && !sPath.isEmpty() && QFileInfo(sPath).exists();          bValid = bValid && !sPath.isEmpty() && QFileInfo(sPath).exists();
Legend:
Removed from v.1504  
changed lines
  Added in v.1506
  ViewVC Help
Powered by ViewVC