comparison widgets/MIDIFileImportDialog.cpp @ 1417:2487521e857b

Merge
author Chris Cannam
date Wed, 23 Jan 2019 14:44:16 +0000
parents c8a6fd3f9dff
children
comparison
equal deleted inserted replaced
1416:d794630429a7 1417:2487521e857b
45 45
46 available << displayNames; 46 available << displayNames;
47 47
48 bool ok = false; 48 bool ok = false;
49 QString selected = QInputDialog::getItem 49 QString selected = QInputDialog::getItem
50 (0, tr("Select track or tracks to import"), 50 (nullptr, tr("Select track or tracks to import"),
51 tr("<b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import:"), 51 tr("<b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import:"),
52 available, 0, false, &ok); 52 available, 0, false, &ok);
53 53
54 if (!ok || selected.isEmpty()) return ImportNothing; 54 if (!ok || selected.isEmpty()) return ImportNothing;
55 55
65 } 65 }
66 66
67 void 67 void
68 MIDIFileImportDialog::showError(QString error) 68 MIDIFileImportDialog::showError(QString error)
69 { 69 {
70 QMessageBox::critical(0, tr("Error in MIDI file import"), error); 70 QMessageBox::critical(nullptr, tr("Error in MIDI file import"), error);
71 } 71 }
72 72