From 4c867dc3257855f98be4acd2837377c119907a53 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 29 Sep 2011 17:36:38 +0200 Subject: [PATCH 1/2] Added a button for loading a different Cue Sheet to the Cue Sheet importer dialog. --- etc/Translation/Blank.ts | 640 +---------------------------------- etc/Translation/LameXP_DE.ts | 4 + etc/Translation/LameXP_ES.ts | 4 + etc/Translation/LameXP_FR.ts | 4 + etc/Translation/LameXP_IT.ts | 4 + etc/Translation/LameXP_KR.ts | 4 + etc/Translation/LameXP_RU.ts | 4 + etc/Translation/LameXP_UK.ts | 4 + gui/CueSheetImport.ui | 23 +- src/Config.h | 2 +- src/Dialog_CueImport.cpp | 9 +- src/Dialog_CueImport.h | 1 + src/Dialog_MainWindow.cpp | 47 +-- 13 files changed, 90 insertions(+), 660 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index dbcdc0b1..ce53ec1b 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -4,294 +4,226 @@ AboutDialog - LameXP &minus; Audio Encoder Front-end - Please visit %1 for news and updates! - Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. - Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!! - Special thanks go out to "John33" from %1 for his continuous support. - About LameXP - Show License Text - Accept License - Decline License - 3rd Party S/W - Contributors - About Qt4 - - - Discard - The following people have contributed to LameXP: - Translators: - If you are willing to contribute a LameXP translation, feel free to contact us! - About Contributors - The following third-party software is used in LameXP: - LAME &minus; OpenSource mp3 Encoder - - - - - - - - - - - Released under the terms of the GNU Lesser General Public License. - OggEnc &minus; Ogg Vorbis Encoder - Completely open and patent-free audio encoding technology. - Nero AAC Reference MPEG-4 Encoder - Freeware state-of-the-art HE-AAC encoder with 2-Pass support. - Available from vendor web-site as free download: - Aften &minus; A/52 audio encoder - FLAC &minus; Free Lossless Audio Codec - Open and patent-free lossless audio compression technology. - mpg123 &minus; Fast Console MPEG Audio Player/Decoder - FAAD &minus; OpenSource MPEG-4 and MPEG-2 AAC Decoder - Released under the terms of the GNU General Public License. - AC3Filter Tools &minus; AC3/DTS Decoder - WavPack &minus; Hybrid Lossless Compression - Completely open audio compression format. - Musepack &minus; Living Audio Compression - Monkey's Audio &minus; Lossless Audio Compressor - Freely available source code, simple SDK and non-restrictive licensing. - Shorten &minus; Lossless Audio Compressor - Speex &minus; Free Codec For Free Speech - Open Source patent-free audio format designed for speech. - The True Audio &minus; Lossless Audio Codec - ALAC Decoder - Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. - wma2wav &minus; Dump WMA files to Wave Audio - Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. - avs2wav &minus; Avisynth to Wave Audio converter - By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. - MediaInfo &minus; Media File Analysis Tool - SoX &minus; Sound eXchange - GnuPG &minus; The GNU Privacy Guard - GNU Wget &minus; Software for retrieving files using HTTP - Silk Icons &minus; Over 700 icons in PNG format - By Mark James, released under the Creative Commons 'by' License. - LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of thrird-party software used in LameXP belongs to the individual authors. - About Third-party Software - n/a @@ -299,50 +231,38 @@ AudioFileModel - - Profile - Channels - Samplerate - Bitdepth - Type - Version - - - Bitrate - Constant - Variable @@ -350,153 +270,118 @@ 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! - - - - 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 @@ -504,33 +389,30 @@ CueSheetImport - - Import Cue Sheet - Existing Source File - Missing Source File (Tracks will be skipped!) - Output Directory - Browse... - + Load a different Cue Sheet + + + Discard @@ -538,44 +420,34 @@ CueSheetModel - No. - File / Track - Index - Duration - File %1 - Track %1 - - Unknown Artist - - Unknown Title @@ -583,17 +455,14 @@ DecoderRegistry - All supported types - Playlists - All files @@ -601,7 +470,6 @@ DiskObserverThread - Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur! @@ -609,22 +477,18 @@ DropBox - LameXP - DropBox - LameXP DropBox - You can add files to LameXP via Drag&amp;Drop here! - (Right-click to close the DropBox) @@ -632,12 +496,10 @@ FileListModel - Title - Full Path @@ -645,32 +507,26 @@ LogViewDialog - Log View - Discard - Save to File... - Copy to Clipboard - Log File - The log file shows detailed information about the selected job. @@ -678,1463 +534,1122 @@ MainWindow - LameXP - Audio Encoder Front-end - - Source Files - Add File(s) - Remove - Clear - - Show Details - - Output Directory - Goto Home Folder - Goto Music Folder - Goto Desktop Folder - Make New Folder - Save output files to the same location where the input file is located - Prepend relative source file path to output file - - Meta Data - Meta Information - Edit - Note: Meta information you enter here will <u>supersede</u> data from the source! - Reset - Options - Automatically generate playlist file (.m3u) - Write meta information to encoded files - - Compression - Encoder / Format - Lame MP3 - Ogg Vorbis - MPEG-4 AAC - Wave (PCM) - FLAC - Aften A/52 - Rate Control Method - Quality-based (VBR) - Average Bitrate (ABR) - Constant Bitrate (CBR) - Quality / Bitrate - Minimum - Maximum - - Advanced Options - Bitrate Management (LAME and OggEnc2) - Enable Bitrate Management - Minimum (kbps): - Maximum (kbps): - LAME Algorithm Quality - Faster Processing - Better quality - Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! - Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! - Channel Mode / Sampling Rate - - Auto Select (Default) - Joint Stereo - Forced Joint Stereo - Simple - Dual Mono - Mono - MP3 Channel Mode: - Sampling Rate (Hz): - 16.000 - 22.050 - 24.000 - 32.000 - 44.100 - 48.000 - Enforce Stereo Downmix of Surround (Multi-Channel) Sources - AAC Encoder-Options - Enable 2-Pass Processing (ABR Mode) - Select AAC Profile: - Auto Select (Recommended) - Enforce LC-AAC - Enforce HE-AAC (AAC + SBR) - Enforce HE-AAC v2 (AAC + SBR + PS) - Volume Normalization - Enable Normalization Filter - Peak Volume (dB): - Tone Adjustment - Adjust Treble (dB): - Adjust Bass (dB): - Custom Encoder Parameters - - - - - You can eneter custom parameters here! - Lame MP3: - OggEnc2: - MPEG-4 AAC: - FLAC: - Warning: Custom parameters won't be checked at all. Use them at your own risk !!! - Aften A/52: - Multi-Threading - Choose the number of parallel instances based on the number of CPU cores (Recommended) - Fewer Instances - More Instances - Temp Directory - Browse... - Store temporary files in your system's default TEMP directory (Recommended) - Aften A/52 Options - Film Light - Film Standard - Music Light - Music Standard - Speech - None (Default) - Auto Select - 1+1 (Ch1,Ch2) - 1/0 (C) - 2/0 (L,R) - 3/0 (L,R,C) - 2/1 (L,R,S) - 3/1 (L,R,C,S) - 2/2 (L,R,SL,SR) - 3/2 (L,R,C,SL,SR) - Audio Coding Mode: - Dynamic Range Compression: - Fast Bit Allocation (Less Accurate) - Exponent Search Size: - Rename Output Files - Entere the pattern to rename the output files here! - Rename Output Files - <a href="reset">Reset</a> &nbsp; <a href="#">Show List of Macros</a> - Rename Pattern: - Example File Name: - Reset Advanced Options - Encode Now! - - About... - Exit Program - File - ? - View - Style - Language - Tools - Configuration - Quit - Open File(s)... - - Visit Official Web-Site - - - - Check for Updates - Open Folder... - Clear All - Plastique - Cleanlooks - Windows Vista ("Aero") - Windows Classic - Windows XP ("Luna") - - Disable Update Reminder - - Disable Sound Effects - Install WMA Decoder - Disable Nero AAC Notifications - Show DropBox - From File... - Encode! - Disable Shell Integration - Frequently Asked Questions - Changelog - Translator's Guide - Help && Support - Open Folder Recursively... - Check for Beta Updates - Import Cue Sheet - Disable Slow Startup Notifications - Adding file(s), please wait... - - Access Denied - %1 file(s) have been rejected, because read access was not granted! - This usually means the file is locked by another process. - CDDA Files - %1 file(s) have been rejected, because they are dummy CDDA files! - Sorry, LameXP cannot extract audio tracks from an Audio&minus;CD at present. - We recommend using %1 for that purpose. - Cue Sheet - %1 file(s) have been rejected, because they appear to be Cue Sheet images! - Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. - Files Rejected - %1 file(s) have been rejected, because the file format could not be recognized! - This usually means the file is damaged or the file format is not supported. - Scanning folder(s) for files, please wait... - DEMO VERSION - You can drop in audio files here! - Open File in External Application - Browse File Location - Browse Selected Folder - Bookmark Current Output Folder - License Declined - You have declined the license. Consequently the application will exit now! - Goodbye! - LameXP - Expired - This demo (pre-release) version of LameXP has expired at %1. - LameXP is free software and release versions won't expire. - - Exit Program - It seems that a bogus anti-virus software is slowing down the startup of LameXP. - Please refer to the %1 document for details and solutions! - Slow Startup - - - - - - Discard - - Don't Show Again - Urgent Update - Your version of LameXP is more than a year old. Time for an update! - - - Update Reminder - Your last update check was more than 14 days ago. Check for updates now? - Your did not check for LameXP updates yet. Check for updates now? - Postpone - LameXP detected that your version of the Nero AAC encoder is outdated! - The current version available is %1 (or later), but you still have version %2 installed. - n/a - You can download the latest version of the Nero AAC encoder from the Nero website at: - AAC Encoder Outdated - The Nero AAC encoder could not be found. AAC encoding support will be disabled. - Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! - Your LameXP directory is located here: - You can download the Nero AAC encoder for free from the official Nero website at: - AAC Support Disabled - - - LameXP - You must add at least one file to the list before proceeding! - Not Found - Your currently selected TEMP folder does not exist anymore: - Restore Default - Cancel - Low Diskspace Warning - There are less than %1 GB of free diskspace available on your system's TEMP folder. - It is highly recommend to free up more diskspace before proceeding with the encode! - Your TEMP folder is located at: - Abort Encoding Process - Clean Disk Now - Ignore - Low Diskspace - You are proceeding with low diskspace. Problems might occur! - Sorry, an unsupported encoder has been chosen! - Cannot write to the selected output directory. - Please choose a different directory! - Load Translation - Translation Files - Do you really want to disable the update reminder? - - - - - - Yes - - - - - - No - The update reminder has been disabled. - Please remember to check for updates at regular intervals! - The update reminder has been re-enabled. - Do you really want to disable all sound effects? - - Sound Effects - All sound effects have been disabled. - The sound effects have been re-enabled. - - - Nero AAC Notifications - Do you really want to disable all Nero AAC Encoder notifications? - All Nero AAC Encoder notifications have been disabled. - The Nero AAC Encoder notifications have been re-enabled. - - - Slow Startup Notifications - Do you really want to disable the slow startup notifications? - The slow startup notifications have been disabled. - The slow startup notifications have been re-enabled. - - 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! @@ -2142,22 +1657,18 @@ MetaInfo - Meta Information - Artwork - Edit - Close @@ -2165,52 +1676,42 @@ MetaInfoDialog - Edit this Information - Copy everything to Meta Info tab - Clear all Meta Info - Load Artwork From File - Clear Artwork - Meta Information - The following meta information have been extracted from the original file. - Load Artwork - Artwork Error - Sorry, failed to load artwork from selected file! @@ -2218,204 +1719,158 @@ MetaInfoModel - - Unknown - - Not Specified - Full Path - Format - Container - Compression - Duration - Title - Artist - Album - Genre - Year - Position - - Generate from list position - Comment - Property - Value - Unspecified - OK - Cancel - - Edit Title - Please enter the title for this file: - The title must not be empty. Generating title from file name! - Edit Artist - Please enter the artist for this file: - Edit Album - Please enter the album for this file: - Edit Genre - Please enter the genre for this file: - Edit Year - Please enter the year for this file: - - Edit Position - - Please enter the position (track no.) for this file: - Unspecified (copy from source file) - Edit Comment - Please enter the comment for this file: - - Encoded with LameXP - Not editable - Sorry, this property of the source file cannot be edited! @@ -2423,107 +1878,86 @@ ProcessThread - Starting... - Not found! - The format of this file is NOT supported: - Container Format: - Audio Format: - Unsupported! - Done. - Aborted! - Failed! - Encoding - Filtering - Decoding - The source audio file could not be found: - The source audio file could not be opened for reading: - The target output directory doesn't exist and could NOT be created: - The target output directory is NOT writable: - Unknown File Name - Unknown Title - Unknown Artist - Unknown Album - Unknown Comment @@ -2531,139 +1965,110 @@ ProcessingDialog - LameXP - Processing - Initializing, please wait... - Shutdown the computer as soon as all files have been converted - Abort - Close - Show details for selected job - Browse Output File Location - Encoding Files - Your files are being encoded, please be patient... - Encoding files, please wait... - Multi-threading enabled: Running %1 instances in parallel! - Aborted! Waiting for running jobs to terminate... - Encoding: %1 files of %2 completed so far, please wait... - Creating the playlist file, please wait... - Process was aborted by the user after %1 file(s)! - Process was aborted prematurely by the user! - LameXP - Aborted - Process was aborted by the user. - Error: %1 of %2 files failed. Double-click failed items for detailed information! - LameXP - Error - At least one file has failed! - - All files completed successfully. - LameXP - Done - Playlist creation failed - The playlist file could not be created: - Warning: Computer will shutdown in %1 seconds... - - Cancel Shutdown @@ -2671,12 +2076,10 @@ ProgressModel - Job - Status @@ -2684,17 +2087,14 @@ QApplication - Executable '%1' doesn't support Windows compatibility mode. - Executable '%1' requires Qt v%2, but found Qt v%3. - Executable '%1' requires Windows 2000 or later. @@ -2702,12 +2102,10 @@ ShellIntegration - Audio File supported by LameXP - Convert this file with LameXP v%1 @@ -2715,7 +2113,6 @@ SplashScreen - LameXP is launching... @@ -2723,143 +2120,114 @@ UpdateDialog - LameXP Update Manager - Please wait... - Latest version available: - Currently installed version: - Retry - Show Log - Download && Install - Close - - Build - Unknown - Testing your internet connection, please wait... - It appears that the computer currently is offline! - Please make sure your computer is connected to the internet and try again. - Network connectivity test has failed! - Please make sure your internet connection is working properly and try again. - Checking for new updates online, please wait... - Failed to fetch update information from server! - Sorry, the update server might be busy at this time. Plase try again later. - More information available at: - A new version of LameXP is available! - We highly recommend all users to install this update as soon as possible. - No new updates available at this time. - Your version of LameXP is still up-to-date. Please check for updates regularly! - Your version appears to be newer than the latest release. - This usually indicates your are currently using a pre-release version of LameXP. - Update is being downloaded, please be patient... - Update ready to install. Applicaion will quit... - Update failed. Please try again or download manually! 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..9a119050 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -413,6 +413,10 @@ Discard Відмінити + + Load a different Cue Sheet + + 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/src/Config.h b/src/Config.h index e906f76b..63726dde 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 699 +#define VER_LAMEXP_BUILD 700 /////////////////////////////////////////////////////////////////////////////// // 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 2a7336b7..63cb59c0 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; } ) } From b87e13a5eb756e54de3673bf9f725c4306bc455d Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 29 Sep 2011 19:04:34 +0200 Subject: [PATCH 2/2] * Updated Ukrainian translation. Thanks to Arestarh . --- etc/Translation/Blank.ts | 637 ++++++++++++++++++++++++++++++++++ etc/Translation/LameXP_UK.ts | 2 +- res/localization/LameXP_DE.qm | Bin 71588 -> 71709 bytes res/localization/LameXP_UK.qm | Bin 72793 -> 72908 bytes src/Config.h | 2 +- 5 files changed, 639 insertions(+), 2 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index ce53ec1b..54318f21 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -4,226 +4,294 @@ AboutDialog + LameXP &minus; Audio Encoder Front-end + Please visit %1 for news and updates! + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. + Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!! + Special thanks go out to "John33" from %1 for his continuous support. + About LameXP + Show License Text + Accept License + Decline License + 3rd Party S/W + Contributors + About Qt4 + + + Discard + The following people have contributed to LameXP: + Translators: + If you are willing to contribute a LameXP translation, feel free to contact us! + About Contributors + The following third-party software is used in LameXP: + LAME &minus; OpenSource mp3 Encoder + + + + + + + + + + + Released under the terms of the GNU Lesser General Public License. + OggEnc &minus; Ogg Vorbis Encoder + Completely open and patent-free audio encoding technology. + Nero AAC Reference MPEG-4 Encoder + Freeware state-of-the-art HE-AAC encoder with 2-Pass support. + Available from vendor web-site as free download: + Aften &minus; A/52 audio encoder + FLAC &minus; Free Lossless Audio Codec + Open and patent-free lossless audio compression technology. + mpg123 &minus; Fast Console MPEG Audio Player/Decoder + FAAD &minus; OpenSource MPEG-4 and MPEG-2 AAC Decoder + Released under the terms of the GNU General Public License. + AC3Filter Tools &minus; AC3/DTS Decoder + WavPack &minus; Hybrid Lossless Compression + Completely open audio compression format. + Musepack &minus; Living Audio Compression + Monkey's Audio &minus; Lossless Audio Compressor + Freely available source code, simple SDK and non-restrictive licensing. + Shorten &minus; Lossless Audio Compressor + Speex &minus; Free Codec For Free Speech + Open Source patent-free audio format designed for speech. + The True Audio &minus; Lossless Audio Codec + ALAC Decoder + Copyright (c) 2004 David Hammerton. Contributions by Cody Brocious. + wma2wav &minus; Dump WMA files to Wave Audio + Copyright (c) 2011 LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved. + avs2wav &minus; Avisynth to Wave Audio converter + By Jory Stone <jcsston@toughguy.net> and LoRd_MuldeR <mulder2@gmx.de>. + MediaInfo &minus; Media File Analysis Tool + SoX &minus; Sound eXchange + GnuPG &minus; The GNU Privacy Guard + GNU Wget &minus; Software for retrieving files using HTTP + Silk Icons &minus; Over 700 icons in PNG format + By Mark James, released under the Creative Commons 'by' License. + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of thrird-party software used in LameXP belongs to the individual authors. + About Third-party Software + n/a @@ -231,38 +299,50 @@ AudioFileModel + + Profile + Channels + Samplerate + Bitdepth + Type + Version + + + Bitrate + Constant + Variable @@ -270,118 +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! + + + + 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 @@ -389,30 +504,38 @@ CueSheetImport + + Import Cue Sheet + Existing Source File + Missing Source File (Tracks will be skipped!) + Output Directory + Browse... + Load a different Cue Sheet + Discard @@ -420,34 +543,44 @@ CueSheetModel + No. + File / Track + Index + Duration + File %1 + Track %1 + + Unknown Artist + + Unknown Title @@ -455,14 +588,17 @@ DecoderRegistry + All supported types + Playlists + All files @@ -470,6 +606,7 @@ DiskObserverThread + Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur! @@ -477,18 +614,22 @@ DropBox + LameXP - DropBox + LameXP DropBox + You can add files to LameXP via Drag&amp;Drop here! + (Right-click to close the DropBox) @@ -496,10 +637,12 @@ FileListModel + Title + Full Path @@ -507,26 +650,32 @@ LogViewDialog + Log View + Discard + Save to File... + Copy to Clipboard + Log File + The log file shows detailed information about the selected job. @@ -534,1122 +683,1463 @@ MainWindow + LameXP - Audio Encoder Front-end + + Source Files + Add File(s) + Remove + Clear + + Show Details + + Output Directory + Goto Home Folder + Goto Music Folder + Goto Desktop Folder + Make New Folder + Save output files to the same location where the input file is located + Prepend relative source file path to output file + + Meta Data + Meta Information + Edit + Note: Meta information you enter here will <u>supersede</u> data from the source! + Reset + Options + Automatically generate playlist file (.m3u) + Write meta information to encoded files + + Compression + Encoder / Format + Lame MP3 + Ogg Vorbis + MPEG-4 AAC + Wave (PCM) + FLAC + Aften A/52 + Rate Control Method + Quality-based (VBR) + Average Bitrate (ABR) + Constant Bitrate (CBR) + Quality / Bitrate + Minimum + Maximum + + Advanced Options + Bitrate Management (LAME and OggEnc2) + Enable Bitrate Management + Minimum (kbps): + Maximum (kbps): + LAME Algorithm Quality + Faster Processing + Better quality + Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! + Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! + Channel Mode / Sampling Rate + + Auto Select (Default) + Joint Stereo + Forced Joint Stereo + Simple + Dual Mono + Mono + MP3 Channel Mode: + Sampling Rate (Hz): + 16.000 + 22.050 + 24.000 + 32.000 + 44.100 + 48.000 + Enforce Stereo Downmix of Surround (Multi-Channel) Sources + AAC Encoder-Options + Enable 2-Pass Processing (ABR Mode) + Select AAC Profile: + Auto Select (Recommended) + Enforce LC-AAC + Enforce HE-AAC (AAC + SBR) + Enforce HE-AAC v2 (AAC + SBR + PS) + Volume Normalization + Enable Normalization Filter + Peak Volume (dB): + Tone Adjustment + Adjust Treble (dB): + Adjust Bass (dB): + Custom Encoder Parameters + + + + + You can eneter custom parameters here! + Lame MP3: + OggEnc2: + MPEG-4 AAC: + FLAC: + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! + Aften A/52: + Multi-Threading + Choose the number of parallel instances based on the number of CPU cores (Recommended) + Fewer Instances + More Instances + Temp Directory + Browse... + Store temporary files in your system's default TEMP directory (Recommended) + Aften A/52 Options + Film Light + Film Standard + Music Light + Music Standard + Speech + None (Default) + Auto Select + 1+1 (Ch1,Ch2) + 1/0 (C) + 2/0 (L,R) + 3/0 (L,R,C) + 2/1 (L,R,S) + 3/1 (L,R,C,S) + 2/2 (L,R,SL,SR) + 3/2 (L,R,C,SL,SR) + Audio Coding Mode: + Dynamic Range Compression: + Fast Bit Allocation (Less Accurate) + Exponent Search Size: + Rename Output Files + Entere the pattern to rename the output files here! + Rename Output Files + <a href="reset">Reset</a> &nbsp; <a href="#">Show List of Macros</a> + Rename Pattern: + Example File Name: + Reset Advanced Options + Encode Now! + + About... + Exit Program + File + ? + View + Style + Language + Tools + Configuration + Quit + Open File(s)... + + Visit Official Web-Site + + + + Check for Updates + Open Folder... + Clear All + Plastique + Cleanlooks + Windows Vista ("Aero") + Windows Classic + Windows XP ("Luna") + + Disable Update Reminder + + Disable Sound Effects + Install WMA Decoder + Disable Nero AAC Notifications + Show DropBox + From File... + Encode! + Disable Shell Integration + Frequently Asked Questions + Changelog + Translator's Guide + Help && Support + Open Folder Recursively... + Check for Beta Updates + Import Cue Sheet + Disable Slow Startup Notifications + Adding file(s), please wait... + + Access Denied + %1 file(s) have been rejected, because read access was not granted! + This usually means the file is locked by another process. + CDDA Files + %1 file(s) have been rejected, because they are dummy CDDA files! + Sorry, LameXP cannot extract audio tracks from an Audio&minus;CD at present. + We recommend using %1 for that purpose. + Cue Sheet + %1 file(s) have been rejected, because they appear to be Cue Sheet images! + Please use LameXP's Cue Sheet wizard for importing Cue Sheet files. + Files Rejected + %1 file(s) have been rejected, because the file format could not be recognized! + This usually means the file is damaged or the file format is not supported. + Scanning folder(s) for files, please wait... + DEMO VERSION + You can drop in audio files here! + Open File in External Application + Browse File Location + Browse Selected Folder + Bookmark Current Output Folder + License Declined + You have declined the license. Consequently the application will exit now! + Goodbye! + LameXP - Expired + This demo (pre-release) version of LameXP has expired at %1. + LameXP is free software and release versions won't expire. + + Exit Program + It seems that a bogus anti-virus software is slowing down the startup of LameXP. + Please refer to the %1 document for details and solutions! + Slow Startup + + + + + + Discard + + Don't Show Again + Urgent Update + Your version of LameXP is more than a year old. Time for an update! + + + Update Reminder + Your last update check was more than 14 days ago. Check for updates now? + Your did not check for LameXP updates yet. Check for updates now? + Postpone + LameXP detected that your version of the Nero AAC encoder is outdated! + The current version available is %1 (or later), but you still have version %2 installed. + n/a + You can download the latest version of the Nero AAC encoder from the Nero website at: + AAC Encoder Outdated + The Nero AAC encoder could not be found. AAC encoding support will be disabled. + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! + Your LameXP directory is located here: + You can download the Nero AAC encoder for free from the official Nero website at: + AAC Support Disabled + + + LameXP + You must add at least one file to the list before proceeding! + Not Found + Your currently selected TEMP folder does not exist anymore: + Restore Default + Cancel + Low Diskspace Warning + There are less than %1 GB of free diskspace available on your system's TEMP folder. + It is highly recommend to free up more diskspace before proceeding with the encode! + Your TEMP folder is located at: + Abort Encoding Process + Clean Disk Now + Ignore + Low Diskspace + You are proceeding with low diskspace. Problems might occur! + Sorry, an unsupported encoder has been chosen! + Cannot write to the selected output directory. + Please choose a different directory! + Load Translation + Translation Files + Do you really want to disable the update reminder? + + + + + + Yes + + + + + + No + The update reminder has been disabled. + Please remember to check for updates at regular intervals! + The update reminder has been re-enabled. + Do you really want to disable all sound effects? + + Sound Effects + All sound effects have been disabled. + The sound effects have been re-enabled. + + + Nero AAC Notifications + Do you really want to disable all Nero AAC Encoder notifications? + All Nero AAC Encoder notifications have been disabled. + The Nero AAC Encoder notifications have been re-enabled. + + + Slow Startup Notifications + Do you really want to disable the slow startup notifications? + The slow startup notifications have been disabled. + The slow startup notifications have been re-enabled. + + 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! @@ -1657,18 +2147,22 @@ MetaInfo + Meta Information + Artwork + Edit + Close @@ -1676,42 +2170,52 @@ MetaInfoDialog + Edit this Information + Copy everything to Meta Info tab + Clear all Meta Info + Load Artwork From File + Clear Artwork + Meta Information + The following meta information have been extracted from the original file. + Load Artwork + Artwork Error + Sorry, failed to load artwork from selected file! @@ -1719,158 +2223,204 @@ MetaInfoModel + + Unknown + + Not Specified + Full Path + Format + Container + Compression + Duration + Title + Artist + Album + Genre + Year + Position + + Generate from list position + Comment + Property + Value + Unspecified + OK + Cancel + + Edit Title + Please enter the title for this file: + The title must not be empty. Generating title from file name! + Edit Artist + Please enter the artist for this file: + Edit Album + Please enter the album for this file: + Edit Genre + Please enter the genre for this file: + Edit Year + Please enter the year for this file: + + Edit Position + + Please enter the position (track no.) for this file: + Unspecified (copy from source file) + Edit Comment + Please enter the comment for this file: + + Encoded with LameXP + Not editable + Sorry, this property of the source file cannot be edited! @@ -1878,86 +2428,107 @@ ProcessThread + Starting... + Not found! + The format of this file is NOT supported: + Container Format: + Audio Format: + Unsupported! + Done. + Aborted! + Failed! + Encoding + Filtering + Decoding + The source audio file could not be found: + The source audio file could not be opened for reading: + The target output directory doesn't exist and could NOT be created: + The target output directory is NOT writable: + Unknown File Name + Unknown Title + Unknown Artist + Unknown Album + Unknown Comment @@ -1965,110 +2536,139 @@ ProcessingDialog + LameXP - Processing + Initializing, please wait... + Shutdown the computer as soon as all files have been converted + Abort + Close + Show details for selected job + Browse Output File Location + Encoding Files + Your files are being encoded, please be patient... + Encoding files, please wait... + Multi-threading enabled: Running %1 instances in parallel! + Aborted! Waiting for running jobs to terminate... + Encoding: %1 files of %2 completed so far, please wait... + Creating the playlist file, please wait... + Process was aborted by the user after %1 file(s)! + Process was aborted prematurely by the user! + LameXP - Aborted + Process was aborted by the user. + Error: %1 of %2 files failed. Double-click failed items for detailed information! + LameXP - Error + At least one file has failed! + + All files completed successfully. + LameXP - Done + Playlist creation failed + The playlist file could not be created: + Warning: Computer will shutdown in %1 seconds... + + Cancel Shutdown @@ -2076,10 +2676,12 @@ ProgressModel + Job + Status @@ -2087,14 +2689,17 @@ QApplication + Executable '%1' doesn't support Windows compatibility mode. + Executable '%1' requires Qt v%2, but found Qt v%3. + Executable '%1' requires Windows 2000 or later. @@ -2102,10 +2707,12 @@ ShellIntegration + Audio File supported by LameXP + Convert this file with LameXP v%1 @@ -2113,6 +2720,7 @@ SplashScreen + LameXP is launching... @@ -2120,114 +2728,143 @@ UpdateDialog + LameXP Update Manager + Please wait... + Latest version available: + Currently installed version: + Retry + Show Log + Download && Install + Close + + Build + Unknown + Testing your internet connection, please wait... + It appears that the computer currently is offline! + Please make sure your computer is connected to the internet and try again. + Network connectivity test has failed! + Please make sure your internet connection is working properly and try again. + Checking for new updates online, please wait... + Failed to fetch update information from server! + Sorry, the update server might be busy at this time. Plase try again later. + More information available at: + A new version of LameXP is available! + We highly recommend all users to install this update as soon as possible. + No new updates available at this time. + Your version of LameXP is still up-to-date. Please check for updates regularly! + Your version appears to be newer than the latest release. + This usually indicates your are currently using a pre-release version of LameXP. + Update is being downloaded, please be patient... + Update ready to install. Applicaion will quit... + Update failed. Please try again or download manually! diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 9a119050..835d1ab9 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -415,7 +415,7 @@ Load a different Cue Sheet - + Обрати інший список CUE diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index f38ebbc10ca9297a2616d431166f7647a974b32b..4bf8075b25c51d3e091a37ead82713c2221b5ac3 100644 GIT binary patch delta 4322 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 NR7>~VQ>UMh_doo85D)+W diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index a1f697a7e860ade9ab4855539d70d16c90c723c7..9eea837744fea94592be0fa802b37cd7f5c8f7df 100644 GIT binary patch delta 4351 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 delta 4229 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 diff --git a/src/Config.h b/src/Config.h index 63726dde..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 700 +#define VER_LAMEXP_BUILD 705 /////////////////////////////////////////////////////////////////////////////// // Tools versions