From 9f3bd0e5b4020c3d47b573f6b5e0f9b292d05ac8 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 11 Aug 2013 20:13:51 +0200 Subject: [PATCH] Improved VapourSynth warning message (added notice about Python 3.3). --- gui/win_addJob.ui | 14 +++++++------- src/version.h | 6 +++--- src/win_main.cpp | 19 ++++++++++--------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gui/win_addJob.ui b/gui/win_addJob.ui index e4c4db4..6ad4278 100644 --- a/gui/win_addJob.ui +++ b/gui/win_addJob.ui @@ -6,7 +6,7 @@ 0 0 - 640 + 569 614 @@ -50,10 +50,10 @@ - Select the source video file. This can be an Avisynth script or any type of video file supported by FFmpegSource2 (libavformat). + Select the source video file. This can be an Avisynth/VapourSynth script or any type of video file supported by FFmpegSource2 (libavformat). - Source Media/Avisynth File: + Source Media/Avisynth/VapourSynth File: @@ -62,7 +62,7 @@ - Select the source video file. This can be an Avisynth script or any type of video file supported by FFmpegSource2 (libavformat). + Select the source video file. This can be an Avisynth/VapourSynth script or any type of video file supported by FFmpegSource2 (libavformat). true @@ -110,7 +110,7 @@ Select the output H.264/AVC file. This can be a Matroska (MKV,) MPEG-4 Part-14 (MP4) or "raw" H.264 file. - Output AVC/H.264 File: + Output H.264/MP4/MKV File: @@ -170,7 +170,7 @@ - Here you can load a user-defined template that you have saved before. Use the "Save As" button to save your current configuration to a new profile. + Here you can load a user-defined template that you have saved before. Use the "Save As" button to save your current configuration to a new template. Template: @@ -192,7 +192,7 @@ - Here you can load a user-defined template that you have saved before. Use the "Save As" button to save your current configuration to a new profile. + Here you can load a user-defined template that you have saved before. Use the "Save As" button to save your current configuration to a new template. -1 diff --git a/src/version.h b/src/version.h index 21d4d83..3b82044 100644 --- a/src/version.h +++ b/src/version.h @@ -20,9 +20,9 @@ /////////////////////////////////////////////////////////////////////////////// #define VER_X264_MAJOR 2 -#define VER_X264_MINOR 1 -#define VER_X264_PATCH 9 -#define VER_X264_BUILD 564 +#define VER_X264_MINOR 2 +#define VER_X264_PATCH 0 +#define VER_X264_BUILD 568 #define VER_X264_MINIMUM_REV 2339 #define VER_X264_CURRENT_API 135 diff --git a/src/win_main.cpp b/src/win_main.cpp index bda871a..3bb0365 100644 --- a/src/win_main.cpp +++ b/src/win_main.cpp @@ -836,27 +836,28 @@ void MainWindow::init(void) qDebug(""); } - //Check for Vapoursynth support + //Check for VapourSynth support if(!qApp->arguments().contains("--skip-vapoursynth-check", Qt::CaseInsensitive)) { - qDebug("[Check for Vapoursynth support]"); + qDebug("[Check for VapourSynth support]"); volatile double avisynthVersion = 0.0; const int result = VapourSynthCheckThread::detect(m_vapoursynthPath); if(result < 0) { - QString text = tr("A critical error was encountered while checking your Vapoursynth installation.").append("
"); - text += tr("This is most likely caused by an erroneous Vapoursynth Plugin, please try to clean your Filters folder!").append("
"); - text += tr("We suggest to move all .dll files out of your Vapoursynth Filters folder and try again."); - int val = QMessageBox::critical(this, tr("Vapoursynth Error"), QString("%1").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore")); + QString text = tr("A critical error was encountered while checking your VapourSynth installation.").append("
"); + text += tr("This is most likely caused by an erroneous VapourSynth Plugin, please try to clean your Filters folder!").append("
"); + text += tr("We suggest to move all .dll files out of your VapourSynth Filters folder and try again."); + int val = QMessageBox::critical(this, tr("VapourSynth Error"), QString("%1").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore")); if(val != 1) { close(); qApp->exit(-1); return; } } if((!result) || (m_vapoursynthPath.isEmpty())) { if(!m_preferences->disableWarnings()) { - QString text = tr("It appears that Vapoursynth is not currently installed on your computer.
Therefore Vapoursynth (.vpy) input will not be working at all!").append("

"); - text += tr("Please download and install Vapoursynth for Windows (R19 or later):").append("
").append(LINK("http://www.vapoursynth.com/")); - int val = QMessageBox::warning(this, tr("Vapoursynth Missing"), QString("%1").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore")); + QString text = tr("It appears that VapourSynth is not currently installed on your computer.
Therefore VapourSynth (.vpy) input will not be working at all!").append("

"); + text += tr("Please download and install VapourSynth for Windows (R19 or later):").append("
").append(LINK("http://www.vapoursynth.com/")).append("

"); + text += tr("Note that Python 3.3 (x86) is a prerequisite for installing VapourSynth:").append("
").append(LINK("http://www.python.org/getit/")).append("
"); + int val = QMessageBox::warning(this, tr("VapourSynth Missing"), QString("%1").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore")); if(val != 1) { close(); qApp->exit(-1); return; } } }