From c9f33d20e74227b0d93a65809acdcfe1a5a2045c Mon Sep 17 00:00:00 2001 From: manongjohn Date: Sun, 14 Mar 2021 18:20:27 -0400 Subject: [PATCH] Update ffmpeg Preference wording --- toonz/sources/toonz/preferencespopup.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index 44897f30..2c041a64 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -1043,7 +1043,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) { // Import / Export {ffmpegPath, tr("Executable Directory:")}, - {ffmpegTimeout, tr("Process Timeout:")}, + {ffmpegTimeout, tr("Import/Export Timeout (sec; -1 = no timeout):")}, {fastRenderPath, tr("Fast Render Output Directory:")}, {rhubarbPath, tr("Executable Directory:")}, {rhubarbTimeout, tr("Analyze Audio Timeout (sec; -1 = no timeout):") }, @@ -1628,14 +1628,6 @@ QWidget* PreferencesPopup::createImportExportPage() { QGridLayout* ffmpegOptionsLay = insertGroupBox(tr("FFmpeg"), lay); { insertUI(ffmpegPath, ffmpegOptionsLay); - - putLabel( - tr("Number of seconds to wait for FFmpeg to complete processing the " - "output:"), - ffmpegOptionsLay); - putLabel( - tr("Note: FFmpeg begins working once all images have been processed."), - ffmpegOptionsLay); insertUI(ffmpegTimeout, ffmpegOptionsLay); insertUI(fastRenderPath, ffmpegOptionsLay);