diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp index 52c4a16a417..303369f3400 100644 --- a/src/core/ProjectRenderer.cpp +++ b/src/core/ProjectRenderer.cpp @@ -41,15 +41,15 @@ const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] = { { ProjectRenderer::WaveFile, - QT_TRANSLATE_NOOP( "ProjectRenderer", "WAV-File (*.wav)" ), + QT_TRANSLATE_NOOP( "ProjectRenderer", "WAV (*.wav)" ), ".wav", &AudioFileWave::getInst }, { ProjectRenderer::FlacFile, - QT_TRANSLATE_NOOP("ProjectRenderer", "FLAC-File (*.flac)"), + QT_TRANSLATE_NOOP("ProjectRenderer", "FLAC (*.flac)"), ".flac", &AudioFileFlac::getInst }, { ProjectRenderer::OggFile, - QT_TRANSLATE_NOOP( "ProjectRenderer", "Compressed OGG-File (*.ogg)" ), + QT_TRANSLATE_NOOP( "ProjectRenderer", "OGG (*.ogg)" ), ".ogg", #ifdef LMMS_HAVE_OGGVORBIS &AudioFileOgg::getInst @@ -58,7 +58,7 @@ const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] = #endif }, { ProjectRenderer::MP3File, - QT_TRANSLATE_NOOP( "ProjectRenderer", "Compressed MP3-File (*.mp3)" ), + QT_TRANSLATE_NOOP( "ProjectRenderer", "MP3 (*.mp3)" ), ".mp3", #ifdef LMMS_HAVE_MP3LAME &AudioFileMP3::getInst @@ -66,8 +66,8 @@ const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] = NULL #endif }, - // ... insert your own file-encoder-infos here... may be one day the - // user can add own encoders inside the program... + // Insert your own file-encoder infos here. + // Maybe one day the user can add own encoders inside the program. { ProjectRenderer::NumFileFormats, NULL, NULL, NULL } @@ -109,15 +109,15 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings ProjectRenderer::~ProjectRenderer() { - Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev + Engine::mixer()->restoreAudioDevice(); // Also deletes audio dev. Engine::mixer()->changeQuality( m_oldQualitySettings ); } -// little help-function for getting file-format from a file-extension (only for -// registered file-encoders) +// Little help function for getting file format from a file extension +// (only for registered file-encoders). ProjectRenderer::ExportFileFormats ProjectRenderer::getFileFormatFromExtension( const QString & _ext ) { @@ -131,7 +131,7 @@ ProjectRenderer::ExportFileFormats ProjectRenderer::getFileFormatFromExtension( ++idx; } - return( WaveFile ); // default + return( WaveFile ); // Default. } @@ -151,9 +151,8 @@ void ProjectRenderer::startProcessing() if( isReady() ) { - // have to do mixer stuff with GUI-thread-affinity in order to - // make slots connected to sampleRateChanged()-signals being - // called immediately + // Have to do mixer stuff with GUI-thread affinity in order to + // make slots connected to sampleRateChanged()-signals being called immediately. Engine::mixer()->setAudioDevice( m_fileDev, m_qualitySettings, false ); @@ -182,7 +181,7 @@ void ProjectRenderer::run() Engine::getSong()->startExport(); Engine::getSong()->updateLength(); - //skip first empty buffer + // Skip first empty buffer. Engine::mixer()->nextBuffer(); const Song::PlayPos & exportPos = Engine::getSong()->getPlayPos( @@ -193,7 +192,7 @@ void ProjectRenderer::run() tick_t endTick = exportEndpoints.second.getTicks(); tick_t lengthTicks = endTick - startTick; - // Continually track and emit progress percentage to listeners + // Continually track and emit progress percentage to listeners. while( exportPos.getTicks() < endTick && Engine::getSong()->isExporting() == true && !m_abort ) @@ -207,12 +206,12 @@ void ProjectRenderer::run() } } - // notify mixer of the end of processing + // Notify mixer of the end of processing. Engine::mixer()->stopProcessing(); Engine::getSong()->stopExport(); - // if the user aborted export-process, the file has to be deleted + // If the user aborted export-process, the file has to be deleted. const QString f = m_fileDev->outputFile(); if( m_abort ) { @@ -255,4 +254,3 @@ void ProjectRenderer::updateConsoleProgress() } - diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp index d17981c9ec8..f0a013dcfec 100644 --- a/src/gui/ExportProjectDialog.cpp +++ b/src/gui/ExportProjectDialog.cpp @@ -47,7 +47,7 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name, setWindowTitle( tr( "Export project to %1" ).arg( QFileInfo( _file_name ).fileName() ) ); - // get the extension of the chosen file + // Get the extension of the chosen file. QStringList parts = _file_name.split( '.' ); QString fileExt; if( parts.size() > 0 ) @@ -60,16 +60,16 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name, { if( ProjectRenderer::fileEncodeDevices[i].isAvailable() ) { - // get the extension of this format + // Get the extension of this format. QString renderExt = ProjectRenderer::fileEncodeDevices[i].m_extension; - // add to combo box + // Add to combo box. fileFormatCB->addItem( ProjectRenderer::tr( ProjectRenderer::fileEncodeDevices[i].m_description ), - QVariant(ProjectRenderer::fileEncodeDevices[i].m_fileFormat) // format tag; later used for identification + QVariant( ProjectRenderer::fileEncodeDevices[i].m_fileFormat ) // Format tag; later used for identification. ); - // if this is our extension, select it + // If this is our extension, select it. if( QString::compare( renderExt, fileExt, Qt::CaseInsensitive ) == 0 ) { @@ -84,9 +84,8 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name, for(int i=0; i<=MAX_LEVEL; ++i) { QString info=""; - if (i==0){ info = tr("(fastest)"); } - else if (i==4){ info = tr("(default)"); } - else if (i==MAX_LEVEL){ info = tr("(smallest)"); } + if ( i==0 ){ info = tr( "( Fastest - biggest )" ); } + else if ( i==MAX_LEVEL ){ info = tr( "( Slowest - smallest )" ); } compLevelCB->addItem( QString::number(i)+" "+info, @@ -95,7 +94,7 @@ ExportProjectDialog::ExportProjectDialog( const QString & _file_name, } compLevelCB->setCurrentIndex(MAX_LEVEL/2); #ifndef LMMS_HAVE_SF_COMPLEVEL - //Disable this widget; the setting would be ignored by the renderer. + // Disable this widget; the setting would be ignored by the renderer. compressionWidget->setVisible(false); #endif @@ -175,8 +174,8 @@ void ExportProjectDialog::startExport() os.setCompressionLevel(level); } - //Make sure we have the the correct file extension - //so there's no confusion about the codec in use. + // Make sure we have the the correct file extension + // so there's no confusion about the codec in use. auto output_name = m_fileName; if (!(m_multiExport || output_name.endsWith(m_fileExtension,Qt::CaseInsensitive))) { @@ -190,9 +189,9 @@ void ExportProjectDialog::startExport() connect( m_renderManager.get(), SIGNAL( progressChanged( int ) ), progressBar, SLOT( setValue( int ) ) ); connect( m_renderManager.get(), SIGNAL( progressChanged( int ) ), - this, SLOT( updateTitleBar( int ) )) ; + this, SLOT( updateTitleBar( int ) )); connect( m_renderManager.get(), SIGNAL( finished() ), - this, SLOT( accept() ) ); + this, SLOT( accept() ) ) ; connect( m_renderManager.get(), SIGNAL( finished() ), gui->mainWindow(), SLOT( resetWindowTitle() ) ); @@ -250,7 +249,7 @@ void ExportProjectDialog::startBtnClicked() { m_ft = ProjectRenderer::NumFileFormats; - //Get file format from current menu selection. + // Get file format from current menu selection. bool successful_conversion = false; QVariant tag = fileFormatCB->itemData(fileFormatCB->currentIndex()); m_ft = static_cast( diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/dialogs/about_dialog.ui index fbc1b56cdb5..63b265d31bf 100644 --- a/src/gui/dialogs/about_dialog.ui +++ b/src/gui/dialogs/about_dialog.ui @@ -6,20 +6,21 @@ 0 0 - 558 - 357 + 504 + 286 - 558 - 357 + 504 + 286 About LMMS + @@ -46,7 +48,6 @@ - @@ -65,7 +66,7 @@ - Version %1 (%2/%3, Qt %4, %5) + Version %1 (%2/%3, Qt %4, %5). @@ -78,8 +79,8 @@ - 40 - 20 + 0 + 0 @@ -106,8 +107,8 @@ - 20 - 10 + 0 + 0 @@ -115,7 +116,7 @@ - LMMS - easy music production for everyone + LMMS - easy music production for everyone. true @@ -132,8 +133,8 @@ - 20 - 10 + 0 + 0 @@ -141,7 +142,7 @@ - Copyright © %1 + Copyright © %1. true @@ -158,8 +159,8 @@ - 20 - 10 + 0 + 0 @@ -167,7 +168,7 @@ - <html><head/><body><p><a href="https://lmms.io"><span style=" text-decoration: underline; color:#0000ff;">https://lmms.io</span></a></p></body></html> + <html><head/><body><p><a href="https://lmms.io"><span style=" text-decoration: underline; color:#33cc33;">https://lmms.io</span></a></p></body></html> true @@ -181,8 +182,8 @@ - 20 - 40 + 0 + 0 @@ -236,7 +237,6 @@ Current language not translated (or native English). - If you're interested in translating LMMS in another language or want to improve existing translations, you're welcome to help us! Simply contact the maintainer! @@ -278,6 +278,7 @@ If you're interested in translating LMMS in another language or want to improve accepted() AboutDialog accept() + buttonBox rejected() AboutDialog reject() + diff --git a/src/gui/dialogs/export_project.ui b/src/gui/dialogs/export_project.ui index 43ad56f3541..c8ea5cf2065 100644 --- a/src/gui/dialogs/export_project.ui +++ b/src/gui/dialogs/export_project.ui @@ -6,34 +6,56 @@ 0 0 - 715 - 491 + 379 + 374 - 519 - 412 + 379 + 374 + + + + + 379 + 374 Export project + + + + Export as loop (remove extra bar) + + + + + + + Export between loop markers + + + - Output + File format settings + @@ -62,7 +84,7 @@ - Samplerate: + Sampling rate: @@ -100,12 +122,14 @@ + 0 @@ -122,7 +146,7 @@ - Depth: + Bit depth: @@ -133,17 +157,17 @@ - 16 Bit Integer + 16 Bit integer - 24 Bit Integer + 24 Bit integer - 32 Bit Float + 32 Bit float @@ -180,17 +204,17 @@ - Stereo + Mono - Joint Stereo + Stereo - Mono + Joint stereo @@ -225,9 +249,11 @@ -1 + @@ -236,9 +262,11 @@ + 0 @@ -312,8 +340,8 @@ - 163 - 20 + 0 + 0 @@ -341,22 +369,22 @@ - Zero Order Hold + Zero order hold - Sinc Fastest + Sinc worst (fastest) - Sinc Medium (recommended) + Sinc medium (recommended) - Sinc Best (very slow!) + Sinc best (slowest) @@ -364,7 +392,7 @@ - Oversampling (use with care!): + Oversampling: @@ -392,20 +420,6 @@ - - - - Export as loop (remove end silence) - - - - - - - Export between loop markers - - - @@ -413,8 +427,8 @@ - 20 - 40 + 0 + 0 @@ -433,8 +447,8 @@ - 40 - 20 + 0 + 0