205 |
i = preferences().getIntProperty("lastUsedOrchestraInstrumentIndex", 0); |
i = preferences().getIntProperty("lastUsedOrchestraInstrumentIndex", 0); |
206 |
if(cbInstruments.getItemCount() > i) cbInstruments.setSelectedIndex(i); |
if(cbInstruments.getItemCount() > i) cbInstruments.setSelectedIndex(i); |
207 |
} |
} |
208 |
|
|
209 |
|
String s = preferences().getStringProperty("lastUsedInstrumentSelectionMethod"); |
210 |
|
if("fromOrchestra".equals(s)) { |
211 |
|
if(!rbSelectFromOrchestra.isSelected()) rbSelectFromOrchestra.doClick(0); |
212 |
|
cbInstruments.requestFocusInWindow(); |
213 |
|
} else if("fromDb".equals(s)) { |
214 |
|
if(!rbSelectFromDb.isSelected()) rbSelectFromDb.doClick(0); |
215 |
|
} else if("fromFile".equals(s)) { |
216 |
|
if(!rbSelectFromFile.isSelected()) rbSelectFromFile.doClick(0); |
217 |
|
btnBrowse.requestFocusInWindow(); |
218 |
|
} else { |
219 |
|
if(!rbSelectFromOrchestra.isSelected()) rbSelectFromOrchestra.doClick(0); |
220 |
|
} |
221 |
|
|
222 |
|
updateState(); |
223 |
} |
} |
224 |
|
|
225 |
private JPanel |
private JPanel |
399 |
onOk() { |
onOk() { |
400 |
if(!btnOk.isEnabled()) return; |
if(!btnOk.isEnabled()) return; |
401 |
|
|
402 |
|
String s = "lastUsedInstrumentSelectionMethod"; |
403 |
|
|
404 |
if(rbSelectFromOrchestra.isSelected()) { |
if(rbSelectFromOrchestra.isSelected()) { |
405 |
Instrument instr = (Instrument)cbInstruments.getSelectedItem(); |
Instrument instr = (Instrument)cbInstruments.getSelectedItem(); |
406 |
instrumentFile = instr.getPath(); |
instrumentFile = instr.getPath(); |
416 |
preferences().setIntProperty("lastUsedOrchestraInstrumentIndex", i); |
preferences().setIntProperty("lastUsedOrchestraInstrumentIndex", i); |
417 |
} |
} |
418 |
|
|
419 |
|
preferences().setStringProperty(s, "fromOrchestra"); |
420 |
|
|
421 |
return; |
return; |
422 |
} |
} |
423 |
|
|
426 |
instrumentIndex = Integer.parseInt(spinnerIndex.getValue().toString()); |
instrumentIndex = Integer.parseInt(spinnerIndex.getValue().toString()); |
427 |
|
|
428 |
StdUtils.updateRecentElements("recentInstrumentFiles", instrumentFile); |
StdUtils.updateRecentElements("recentInstrumentFiles", instrumentFile); |
429 |
|
preferences().setStringProperty(s, "fromFile"); |
430 |
setVisible(false); |
setVisible(false); |
431 |
return; |
return; |
432 |
} |
} |
433 |
|
|
434 |
if(!rbSelectFromDb.isSelected()) return; |
if(!rbSelectFromDb.isSelected()) return; |
435 |
|
|
436 |
|
preferences().setStringProperty(s, "fromDb"); |
437 |
|
|
438 |
String instr = cbDbInstrument.getSelectedItem().toString(); |
String instr = cbDbInstrument.getSelectedItem().toString(); |
439 |
preferences().setStringProperty("lastUsedDbInstrument", instr); |
preferences().setStringProperty("lastUsedDbInstrument", instr); |
440 |
final InstrumentsDb.GetInstrument t = new InstrumentsDb.GetInstrument(instr); |
final InstrumentsDb.GetInstrument t = new InstrumentsDb.GetInstrument(instr); |