diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index f71e1e0e..1c0d20bb 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -350,153 +350,153 @@ CueImportDialog - + Import Cue Sheet - + The following Cue Sheet will be split and imported into LameXP. - + Loading Cue Sheet file, please be patient... - - - - Failed to load the Cue Sheet file: - - - - - The specified file could not be found! - - - - + Failed to load the Cue Sheet file: + + + + + The specified file could not be found! + + + + + + + Cue Sheet Error - + An unknown error has occured! - + The file could not be opened for reading. Make sure you have the required rights! - + The provided file does not look like a valid Cue Sheet disc image file! - + Could not find any supported audio track in the Cue Sheet image! - + Note that LameXP can not handle "binary" Cue Sheet images. - + The selected Cue Sheet file contains inconsistent information. Take care! - - + + Choose Output Directory - - + + LameXP - + Error: The selected output directory could not be created! - + Error: The selected output directory is not writable! - + Low Diskspace Warning - + There are less than %1 GB of free diskspace available in the selected output directory. - + It is highly recommend to free up more diskspace before proceeding with the import! - + Analyzing file(s), please wait... - + Analysis Failed - + Warning: The format of some of the input files could not be determined! - + Continue Anyway - + Abort - + Splitting file(s), please wait... - + Process was aborted by the user after %1 track(s)! - + An unexpected error has occured while splitting the Cue Sheet! - + Imported %1 track(s) from the Cue Sheet and skipped %2 track(s). - + Cue Sheet Completed @@ -505,7 +505,7 @@ CueSheetImport - + Import Cue Sheet @@ -530,7 +530,12 @@ - + + Load a different Cue Sheet + + + + Discard @@ -1472,7 +1477,7 @@ - + Access Denied @@ -1627,8 +1632,8 @@ - - + + Discard @@ -1832,8 +1837,8 @@ - - + + Yes @@ -1842,8 +1847,8 @@ - - + + No @@ -1928,213 +1933,213 @@ - - + + Open Cue Sheet - - + + Cue Sheet File - - - + + + Beta Updates - + Do you really want LameXP to check for Beta (pre-release) updates? - + LameXP will check for Beta (pre-release) updates from now on. - + Check Now - + LameXP will <i>not</i> check for Beta (pre-release) updates from now on. - - - + + + Shell Integration - + Do you really want to disable the LameXP shell integration? - + The LameXP shell integration has been disabled. - + The LameXP shell integration has been re-enabled. - - + + Add file(s) - - + + Add Folder - - + + New Folder - + Enter the name of the new folder: - + Failed to create folder - + The new folder could not be created: - + Drive is read-only or insufficient access rights! - - - - + + + + Quality Level %1 - - - + + + Compression %1 - - - + + + Uncompressed - + Best Quality (Very Slow) - + High Quality (Recommended) - + Average Quality (Default) - + Low Quality (Fast) - + Poor Quality (Very Fast) - + File name without extension - + Track number with leading zero - + Track title - + Artist name - + Album name - + Year with (at least) four digits - + Comment - + Characters forbidden in file names: - + Rename Macros - + %1 Instance(s) - + Cannot write to the selected directory. Please choose another directory! - + Already Running - + LameXP is already running, please use the running instance! diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index e3399865..ccb57303 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -412,6 +412,10 @@ Missing Source File (Tracks will be skipped!) Fehlende Quelldatei (Tracks werden übersprungen!) + + Load a different Cue Sheet + Ein anderes Cuesheet laden + CueSheetModel diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index bc364069..54486503 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -412,6 +412,10 @@ Missing Source File (Tracks will be skipped!) El archivo de origen no existe (¡Se saltarán pistas!) + + Load a different Cue Sheet + + CueSheetModel diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 44d72ef9..dc814990 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -416,6 +416,10 @@ Missing Source File (Tracks will be skipped!) Fichier source manquant (les pistes seront ignorées !) + + Load a different Cue Sheet + + CueSheetModel diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 1cc472f9..10070751 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -412,6 +412,10 @@ Missing Source File (Tracks will be skipped!) + + Load a different Cue Sheet + + CueSheetModel diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 91f7d9ac..3b77490d 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -412,6 +412,10 @@ Missing Source File (Tracks will be skipped!) + + Load a different Cue Sheet + + CueSheetModel diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 7b4df2da..f3e51885 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -414,6 +414,10 @@ Missing Source File (Tracks will be skipped!) Файл не найден (будет пропущен!) + + Load a different Cue Sheet + + CueSheetModel diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index d618d737..835d1ab9 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -413,6 +413,10 @@ Discard Відмінити + + Load a different Cue Sheet + Обрати інший список CUE + CueSheetModel diff --git a/gui/CueSheetImport.ui b/gui/CueSheetImport.ui index 2e281b9b..05e9a195 100644 --- a/gui/CueSheetImport.ui +++ b/gui/CueSheetImport.ui @@ -514,6 +514,26 @@ + + + + + 175 + 0 + + + + Load a different Cue Sheet + + + + :/icons/folder_explore.png:/icons/folder_explore.png + + + false + + + @@ -626,13 +646,14 @@ + abortButton clicked() CueSheetImport - close() + reject() 688 diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index f38ebbc1..4bf8075b 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index a1f697a7..9eea8377 100644 Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ diff --git a/src/Config.h b/src/Config.h index bd0b5ad1..20ddc472 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 702 +#define VER_LAMEXP_BUILD 705 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Dialog_CueImport.cpp b/src/Dialog_CueImport.cpp index 92739b9a..efaec198 100644 --- a/src/Dialog_CueImport.cpp +++ b/src/Dialog_CueImport.cpp @@ -71,6 +71,7 @@ CueImportDialog::CueImportDialog(QWidget *parent, FileListModel *fileList, const //Enable up/down button connect(imprtButton, SIGNAL(clicked()), this, SLOT(importButtonClicked())); connect(browseButton, SIGNAL(clicked()), this, SLOT(browseButtonClicked())); + connect(loadOtherButton, SIGNAL(clicked()), this, SLOT(loadOtherButtonClicked())); //Translate labelHeaderText->setText(QString("%1
%2").arg(tr("Import Cue Sheet"), tr("The following Cue Sheet will be split and imported into LameXP."))); @@ -226,6 +227,11 @@ void CueImportDialog::importButtonClicked(void) accept(); } +void CueImportDialog::loadOtherButtonClicked(void) +{ + done(-1); +} + void CueImportDialog::analyzedFile(const AudioFileModel &file) { qDebug("Received result: <%s> <%s/%s>", file.filePath().toLatin1().constData(), file.formatContainerType().toLatin1().constData(), file.formatAudioType().toLatin1().constData()); @@ -263,8 +269,7 @@ void CueImportDialog::importCueSheet(void) //Now split files according to Cue Sheet splitFiles(); } - - + //Release locks while(!m_locks.isEmpty()) { diff --git a/src/Dialog_CueImport.h b/src/Dialog_CueImport.h index 025934c2..b809ecf3 100644 --- a/src/Dialog_CueImport.h +++ b/src/Dialog_CueImport.h @@ -46,6 +46,7 @@ protected: private slots: void browseButtonClicked(void); void importButtonClicked(void); + void loadOtherButtonClicked(void); void modelChanged(void); void analyzedFile(const AudioFileModel &file); diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 2cb2f368..80a7ce3d 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -1570,30 +1570,37 @@ void MainWindow::importCueSheetActionTriggered(bool checked) TEMP_HIDE_DROPBOX ( - QString selectedCueFile; + while(true) + { + int result = 0; + QString selectedCueFile; - if(USE_NATIVE_FILE_DIALOG) - { - selectedCueFile = QFileDialog::getOpenFileName(this, tr("Open Cue Sheet"), m_settings->mostRecentInputPath(), QString("%1 (*.cue)").arg(tr("Cue Sheet File"))); - } - else - { - QFileDialog dialog(this, tr("Open Cue Sheet")); - dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setNameFilter(QString("%1 (*.cue)").arg(tr("Cue Sheet File"))); - dialog.setDirectory(m_settings->mostRecentInputPath()); - if(dialog.exec()) + if(USE_NATIVE_FILE_DIALOG) { - selectedCueFile = dialog.selectedFiles().first(); + selectedCueFile = QFileDialog::getOpenFileName(this, tr("Open Cue Sheet"), m_settings->mostRecentInputPath(), QString("%1 (*.cue)").arg(tr("Cue Sheet File"))); + } + else + { + QFileDialog dialog(this, tr("Open Cue Sheet")); + dialog.setFileMode(QFileDialog::ExistingFile); + dialog.setNameFilter(QString("%1 (*.cue)").arg(tr("Cue Sheet File"))); + dialog.setDirectory(m_settings->mostRecentInputPath()); + if(dialog.exec()) + { + selectedCueFile = dialog.selectedFiles().first(); + } } - } - if(!selectedCueFile.isEmpty()) - { - m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath()); - CueImportDialog *cueImporter = new CueImportDialog(this, m_fileListModel, selectedCueFile); - cueImporter->exec(); - LAMEXP_DELETE(cueImporter); + if(!selectedCueFile.isEmpty()) + { + m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath()); + CueImportDialog *cueImporter = new CueImportDialog(this, m_fileListModel, selectedCueFile); + result = cueImporter->exec(); + LAMEXP_DELETE(cueImporter); + } + + qWarning("Result was %d", result); + if(result != (-1)) break; } ) }