Improved VapourSynth warning message (added notice about Python 3.3).
This commit is contained in:
parent
28e82ea1a5
commit
9f3bd0e5b4
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>640</width>
|
||||
<width>569</width>
|
||||
<height>614</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -50,10 +50,10 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="toolTip">
|
||||
<string>Select the source video file. This can be an Avisynth script or any type of video file supported by FFmpegSource2 (libavformat).</string>
|
||||
<string>Select the source video file. This can be an Avisynth/VapourSynth script or any type of video file supported by FFmpegSource2 (libavformat).</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Source Media/Avisynth File:</string>
|
||||
<string>Source Media/Avisynth/VapourSynth File:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -62,7 +62,7 @@
|
||||
<item>
|
||||
<widget class="QLineEdit" name="editSource">
|
||||
<property name="toolTip">
|
||||
<string>Select the source video file. This can be an Avisynth script or any type of video file supported by FFmpegSource2 (libavformat).</string>
|
||||
<string>Select the source video file. This can be an Avisynth/VapourSynth script or any type of video file supported by FFmpegSource2 (libavformat).</string>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
@ -110,7 +110,7 @@
|
||||
<string>Select the output H.264/AVC file. This can be a Matroska (MKV,) MPEG-4 Part-14 (MP4) or "raw" H.264 file.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Output AVC/H.264 File:</string>
|
||||
<string>Output H.264/MP4/MKV File:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -170,7 +170,7 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="toolTip">
|
||||
<string>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.</string>
|
||||
<string>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.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Template:</string>
|
||||
@ -192,7 +192,7 @@
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>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.</string>
|
||||
<string>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.</string>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>-1</number>
|
||||
|
@ -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
|
||||
|
@ -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("<br>");
|
||||
text += tr("This is most likely caused by an erroneous Vapoursynth Plugin, please try to clean your Filters folder!").append("<br>");
|
||||
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("<nobr>%1</nobr>").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore"));
|
||||
QString text = tr("A critical error was encountered while checking your VapourSynth installation.").append("<br>");
|
||||
text += tr("This is most likely caused by an erroneous VapourSynth Plugin, please try to clean your Filters folder!").append("<br>");
|
||||
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("<nobr>%1</nobr>").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 <b>not</b> currently installed on your computer.<br>Therefore Vapoursynth (.vpy) input will <b>not</b> be working at all!").append("<br><br>");
|
||||
text += tr("Please download and install Vapoursynth for Windows (R19 or later):").append("<br>").append(LINK("http://www.vapoursynth.com/"));
|
||||
int val = QMessageBox::warning(this, tr("Vapoursynth Missing"), QString("<nobr>%1</nobr>").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore"));
|
||||
QString text = tr("It appears that VapourSynth is <b>not</b> currently installed on your computer.<br>Therefore VapourSynth (.vpy) input will <b>not</b> be working at all!").append("<br><br>");
|
||||
text += tr("Please download and install VapourSynth for Windows (R19 or later):").append("<br>").append(LINK("http://www.vapoursynth.com/")).append("<br><br>");
|
||||
text += tr("Note that Python 3.3 (x86) is a prerequisite for installing VapourSynth:").append("<br>").append(LINK("http://www.python.org/getit/")).append("<br>");
|
||||
int val = QMessageBox::warning(this, tr("VapourSynth Missing"), QString("<nobr>%1</nobr>").arg(text).replace("-", "−"), tr("Quit"), tr("Ignore"));
|
||||
if(val != 1) { close(); qApp->exit(-1); return; }
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user