Show
Ignore:
Timestamp:
02/02/09 02:35:26 (4 years ago)
Author:
wolke
Message:

merge rev 756:761 from trunk

Location:
branches/new_fx_rack_and_sample_fun
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/new_fx_rack_and_sample_fun

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/new_fx_rack_and_sample_fun/gui/src/PatternPropertiesDialog.cpp

    r377 r762  
    6565                } 
    6666        } 
     67 
     68        defaultNameCheck( pattern->get_name() ); 
     69        okBtn->setEnabled(true); 
    6770} 
    6871 
     
    107110} 
    108111 
     112void PatternPropertiesDialog::defaultNameCheck( QString pattName ) 
     113{ 
     114 
     115        PatternList *patternList = Hydrogen::get_instance()->getSong()->get_pattern_list(); 
     116         
     117        for (uint i = 0; i < patternList->get_size(); i++) { 
     118                if ( patternList->get(i)->get_name() == pattName) { 
     119                                patternNameTxt->setText( trUtf8( "%1#2").arg(patternList->get(i)->get_name()) ); 
     120                } 
     121        } 
     122} 
     123 
    109124 
    110125bool PatternPropertiesDialog::nameCheck( QString pattName )