From e959af4ec21b951251ec8be0f6d8e282615af0ab Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Wed, 7 Oct 2009 17:21:29 -0400 Subject: [PATCH] Increase import filter for *.midi and *.riff Fix song.cpp and translations so the somewhat common *.midi extension is recognized. (cherry picked from commit c504bc84d47ecae4645fb7b818cd032b28ac595d) --- data/locale/ca.ts | 2 +- data/locale/cs.ts | 4 ++-- data/locale/de.ts | 6 +++--- data/locale/en.ts | 2 +- data/locale/es.ts | 2 +- data/locale/fr.ts | 2 +- data/locale/ir.ts | 2 +- data/locale/it.ts | 4 ++-- data/locale/ja.ts | 4 ++-- data/locale/ko.ts | 4 ++-- data/locale/nl.ts | 2 +- data/locale/pt_br.ts | 2 +- data/locale/ru.ts | 2 +- data/locale/sv.ts | 2 +- src/core/song.cpp | 3 ++- 15 files changed, 22 insertions(+), 21 deletions(-) diff --git a/data/locale/ca.ts b/data/locale/ca.ts index d6a05d677..83d13329f 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -6935,7 +6935,7 @@ Latència: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 565094ea9..4fed53b99 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -8406,8 +8406,8 @@ Zpoždění %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) - MIDI sekvence (*.mid *.rif);;FL Studio projekt (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) + MIDI sekvence (*.mid *.midi *.rif *.riff);;FL Studio projekt (*.flp) diff --git a/data/locale/de.ts b/data/locale/de.ts index 1a125bc2a..c779969e9 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -6007,9 +6007,9 @@ Latenz: %2 ms DIeses Projekt ist leer, weshalb das Exportieren keinen Sinn macht. Bitte erstellen Sie erst ein paar Einträge im Song-Editor! - - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) - MIDI-Dateien (*.mid *.rif);;FL Studio Projekte (*.flp) + + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) + MIDI-Dateien (*.mid *.midi *.rif *.riff);;FL Studio Projekte (*.flp) diff --git a/data/locale/en.ts b/data/locale/en.ts index 7e4f2ab60..d2387f2a2 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -5843,7 +5843,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/es.ts b/data/locale/es.ts index e6b4678e4..0f8a13b26 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -7897,7 +7897,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/fr.ts b/data/locale/fr.ts index afe001139..a8e30305b 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -7088,7 +7088,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/ir.ts b/data/locale/ir.ts index 6c13eaf19..19af9a2b5 100644 --- a/data/locale/ir.ts +++ b/data/locale/ir.ts @@ -7917,7 +7917,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/it.ts b/data/locale/it.ts index 35a12ab58..5c18b9e44 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -5874,8 +5874,8 @@ Latenza: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) - Sequenze MIDI (*.mid *.rif);;Progetti FL Studio (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) + Sequenze MIDI (*.mid *.midi *.rif *.riff);;Progetti FL Studio (*.flp) diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 889384267..81e70b6a5 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -5876,8 +5876,8 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) - MIDI シーケンス (*.mid *.rif);; FL Studio プロジェクト (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) + MIDI シーケンス (*.mid *.midi *.rif *.riff);; FL Studio プロジェクト (*.flp) diff --git a/data/locale/ko.ts b/data/locale/ko.ts index df2716f96..7f980993f 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -5849,8 +5849,8 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) - 미디 시퀀스 (*.mid *.rif);;FL Studio 프로젝트 (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) + 미디 시퀀스 (*.mid *.midi *.rif *.riff);;FL Studio 프로젝트 (*.flp) diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 61c50726e..7c7970610 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -8761,7 +8761,7 @@ Vertraging: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/pt_br.ts b/data/locale/pt_br.ts index 6976a4261..74e93cf9a 100644 --- a/data/locale/pt_br.ts +++ b/data/locale/pt_br.ts @@ -7805,7 +7805,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/ru.ts b/data/locale/ru.ts index 20ab6cbf8..ff5ed2df9 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -8843,7 +8843,7 @@ Please note that in some cases parallelizing won't work with small buffer-s - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 64859dd14..756382de4 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -6668,7 +6668,7 @@ Latency: %2 ms - MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp) + MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp) diff --git a/src/core/song.cpp b/src/core/song.cpp index cf6900589..83b296cf4 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -1071,7 +1071,8 @@ void song::importProject() { QFileDialog ofd( NULL, tr( "Import file" ), configManager::inst()->userProjectsDir(), - tr("MIDI sequences (*.mid *.rif);;FL Studio projects (*.flp)") ); + tr("MIDI sequences (*.mid *.midi *.rif *.riff);;FL Studio projects (*.flp)") ); + ofd.setFileMode( QFileDialog::ExistingFiles ); if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() ) {