Finished new "About" dialog and removed old code.
This commit is contained in:
parent
fb721fb532
commit
e694ed1154
231
gui/win_about.ui
231
gui/win_about.ui
@ -10,7 +10,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>709</width>
|
||||
<height>285</height>
|
||||
<height>275</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -37,7 +37,7 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="tabAbout">
|
||||
<attribute name="title">
|
||||
<string>About</string>
|
||||
<string>Information</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
@ -117,9 +117,9 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><nobr><tt><b>Simple x264 Launcher v%1 - graphical interface for x264 &amp; x265</b><br>
|
||||
<string><nobr><tt><b>Simple x264 Launcher v%1 - graphical interface for x264/x265</b><br>
|
||||
Copyright (c) 2004−%2 LoRd_MuldeR &lt;mulder2@gmx.de&gt;. Some rights reserved.<br>
|
||||
Built on %3 at %4 with %5 for Win-%6.<br>
|
||||
Built on %3 at %4 with %5 (Win-%6) and Qt %7.<br>
|
||||
<br>
|
||||
This program is free software: you can redistribute it and/or modify<br>
|
||||
it under the terms of the GNU General Public License &lt;http://www.gnu.org/&gt;.<br>
|
||||
@ -143,7 +143,7 @@ Please check the web−site at <a href="http://muldersoft.com/">
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabX264">
|
||||
<attribute name="title">
|
||||
<string>x264</string>
|
||||
<string>x264 Encoder</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
@ -230,7 +230,7 @@ Released under the terms of the GNU General Public License, version 2.<br>
|
||||
Please visit <a href="http://x264licensing.com/">http://x264licensing.com/</a> for obtaining a commercial x264 license.<br>
|
||||
Read the <a href="http://mewiki.project357.com/wiki/X264_Settings">user's manual</a> to get started and use the <a href="http://forum.doom9.org/forumdisplay.php?f=77">support forum</a> for help!<br>
|
||||
<br>
|
||||
Note: Simple x264 Launcher is not affiliated with or endosed by the x264 project.</tt></nobr>
|
||||
Note: Simple x264 Launcher is not affiliated with or endorsed by the x264 project.</tt></nobr>
|
||||
</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
@ -249,7 +249,7 @@ Note: Simple x264 Launcher is not affiliated with or endosed by the x264 project
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabX265">
|
||||
<attribute name="title">
|
||||
<string>x265</string>
|
||||
<string>x265 Encoder</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
@ -330,13 +330,13 @@ Note: Simple x264 Launcher is not affiliated with or endosed by the x264 project
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><nobr><tt><b>x265 - free H.265/HEVC encoder. Copyright (C) 2003-2014 x265 project.</b><br>
|
||||
Commercially funded open source implementation of the HEVC compression standard.<br>
|
||||
Commercially funded, open source implementation of the HEVC compression standard.<br>
|
||||
Released under the terms of the GNU General Public License, version 2.<br>
|
||||
<br>
|
||||
The x265 project is coordinated by <a href="http://www.multicorewareinc.com/">MultiCoreWare</a>. See the <a href="http://x265.org/">web-site</a> for details.<br>
|
||||
Read the <a href="http://goo.gl/smws42">user's manual</a> to get started and use the <a href="https://forum.doom9.org/forumdisplay.php?f=81">support forum</a> for help!<br>
|
||||
<br>
|
||||
Note: Simple x264 Launcher is not affiliated with or endosed by the x265 project.</tt></nobr>
|
||||
Note: Simple x264 Launcher is not affiliated with or endorsed by the x265 project.</tt></nobr>
|
||||
</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
@ -353,6 +353,217 @@ Note: Simple x264 Launcher is not affiliated with or endosed by the x265 project
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabAvisynth">
|
||||
<attribute name="title">
|
||||
<string>Avisynth</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<property name="spacing">
|
||||
<number>16</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<widget class="QLabel" name="iconAbout_2">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>76</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>76</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../res/resources.qrc">:/images/avisynth.png</pixmap>
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelAbout_2">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><nobr><tt><b>Avisynth - powerful video processing scripting language.</b><br>
|
||||
Copyright (c) 2000 Ben Rudiak-Gould and all subsequent Avisynth developers.<br>
|
||||
Released under the terms of the GNU General Public License, version 2.<br>
|
||||
<br>
|
||||
Please visit the official web-site at <a href="http://avisynth.nl/">http://avisynth.nl/</a> for more information.<br>
|
||||
Read the <a href="http://avisynth.nl/index.php/First_script">user's manual</a> to get started and use the <a href="http://forum.doom9.org/forumdisplay.php?f=33">support forum</a> for help!<br>
|
||||
<br>
|
||||
The <b>AviSynth+</b> project provides an improved version of the AviSynth frameserver.<br>
|
||||
Please see <a href="http://avs-plus.net/">http://avs-plus.net/</a> or the <a href="http://forum.doom9.org/showthread.php?t=168856">forum thread</a> for more information.</tt></nobr></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabVapourSynth">
|
||||
<attribute name="title">
|
||||
<string>VapourSynth</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_10">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
||||
<property name="spacing">
|
||||
<number>16</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_11">
|
||||
<item>
|
||||
<widget class="QLabel" name="iconAbout_3">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../res/resources.qrc">:/images/python.png</pixmap>
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_12">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelAbout_3">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><nobr><tt><b>VapourSynth - application for video manipulation based on Python.</b><br>
|
||||
Copyright (c) 2012 Fredrik "Myrsloik" Mellbin.<br>
|
||||
Released under the terms of the GNU Lesser General Public License, version 2.1.<br>
|
||||
<br>
|
||||
Please visit the web-site at <a href="http://www.vapoursynth.com">http://www.vapoursynth.com</a> for more information.<br>
|
||||
Read the <a href="http://www.vapoursynth.com/doc/">documentation</a> to get started and use the <a href="http://forum.doom9.org/showthread.php?t=165771">support forum</a> for help!<br>
|
||||
<br>
|
||||
VapourSynth has been inspired by Avisynth and aims to be a 21st century rewrite.</tt></nobr></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@ -360,7 +571,7 @@ Note: Simple x264 Launcher is not affiliated with or endosed by the x265 project
|
||||
<item>
|
||||
<widget class="QLabel" name="labelGPL">
|
||||
<property name="text">
|
||||
<string><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License v2</a></string>
|
||||
<string><a href="http://www.gnu.org/licenses/gpl-2.0.html" class="mylink">GNU General Public License v2</a></string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#define VER_X264_MAJOR 2
|
||||
#define VER_X264_MINOR 3
|
||||
#define VER_X264_PATCH 3
|
||||
#define VER_X264_BUILD 801
|
||||
#define VER_X264_BUILD 804
|
||||
|
||||
#define VER_X264_PORTABLE_EDITION (0)
|
||||
|
||||
|
||||
@ -53,10 +53,16 @@ AboutDialog::AboutDialog(QWidget *parent)
|
||||
x264_version_date().toString(Qt::ISODate).toLatin1().constData(),
|
||||
x264_version_time(),
|
||||
x264_version_compiler(),
|
||||
x264_version_arch()
|
||||
x264_version_arch(),
|
||||
QString::fromLatin1(QT_VERSION_STR)
|
||||
)
|
||||
);
|
||||
|
||||
//Enable hover
|
||||
ui->labelGPL->setAttribute(Qt::WA_Hover, true);
|
||||
((QWidget*)ui->labelGPL->parent())->setAttribute(Qt::WA_Hover, true);
|
||||
((QWidget*)ui->labelGPL->parent()->parent())->setAttribute(Qt::WA_Hover, true);
|
||||
|
||||
//Switch to first tab
|
||||
ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->tabAbout));
|
||||
|
||||
@ -81,7 +87,9 @@ AboutDialog::~AboutDialog(void)
|
||||
|
||||
void AboutDialog::showEvent(QShowEvent *event)
|
||||
{
|
||||
//Fix dialog size
|
||||
QDialog::showEvent(event);
|
||||
|
||||
//Fix dialog size - need to do this in Show event
|
||||
const QSize hint = sizeHint();
|
||||
setFixedSize(hint.isValid() ? hint : size());
|
||||
}
|
||||
|
||||
116
src/win_main.cpp
116
src/win_main.cpp
@ -499,118 +499,13 @@ void MainWindow::showAbout(void)
|
||||
ENSURE_APP_IS_IDLE();
|
||||
m_status = STATUS_BLOCKED;
|
||||
|
||||
AboutDialog *aboutDialog = new AboutDialog(this);
|
||||
if(AboutDialog *aboutDialog = new AboutDialog(this))
|
||||
{
|
||||
aboutDialog->exec();
|
||||
X264_DELETE(aboutDialog);
|
||||
}
|
||||
|
||||
m_status = STATUS_IDLE;
|
||||
|
||||
/*
|
||||
QString text;
|
||||
text += QString().sprintf("<nobr><tt>Simple x264 Launcher v%u.%02u.%u - use 64-Bit x264 with 32-Bit Avisynth<br>", x264_version_major(), x264_version_minor(), x264_version_build());
|
||||
text += QString().sprintf("Copyright (c) 2004-%04d LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved.<br>", qMax(x264_version_date().year(),QDate::currentDate().year()));
|
||||
text += QString().sprintf("Built on %s at %s with %s for Win-%s.<br><br>", x264_version_date().toString(Qt::ISODate).toLatin1().constData(), x264_version_time(), x264_version_compiler(), x264_version_arch());
|
||||
text += QString().sprintf("This program is free software: you can redistribute it and/or modify<br>");
|
||||
text += QString().sprintf("it under the terms of the GNU General Public License <http://www.gnu.org/>.<br>");
|
||||
text += QString().sprintf("Note that this program is distributed with ABSOLUTELY NO WARRANTY.<br><br>");
|
||||
text += QString().sprintf("Please check the web-site at <a href=\"%s\">%s</a> for updates !!!<br></tt></nobr>", home_url, home_url);
|
||||
|
||||
QMessageBox aboutBox(this);
|
||||
aboutBox.setIconPixmap(QIcon(":/images/movie.png").pixmap(64,64));
|
||||
aboutBox.setWindowTitle(tr("About..."));
|
||||
aboutBox.setText(text.replace("-", "−"));
|
||||
aboutBox.addButton(tr("About x264"), QMessageBox::NoRole);
|
||||
aboutBox.addButton(tr("About x265"), QMessageBox::NoRole);
|
||||
aboutBox.addButton(tr("About Avs"), QMessageBox::NoRole);
|
||||
aboutBox.addButton(tr("About Vpy"), QMessageBox::NoRole);
|
||||
aboutBox.addButton(tr("About Qt"), QMessageBox::NoRole);
|
||||
aboutBox.setEscapeButton(aboutBox.addButton(tr("Close"), QMessageBox::NoRole));
|
||||
|
||||
forever
|
||||
{
|
||||
x264_beep(x264_beep_info);
|
||||
switch(aboutBox.exec())
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
QString text2;
|
||||
text2 += tr("<nobr><tt>x264 - the best H.264/AVC encoder. Copyright (C) 2013-2014 x264 project.<br>");
|
||||
text2 += tr("Free software library for encoding video streams into the H.264/MPEG-4 AVC format.<br>");
|
||||
text2 += tr("Released under the terms of the GNU General Public License v2.<br><br>");
|
||||
text2 += tr("Please visit <a href=\"%1\">%1</a> for obtaining a commercial x264 license.<br>").arg("http://x264licensing.com/");
|
||||
text2 += tr("Read the <a href=\"%1\">user's manual</a> to get started and use the <a href=\"%2\">support forum</a> for help!<br></tt></nobr>").arg("http://mewiki.project357.com/wiki/X264_Settings", "http://forum.doom9.org/forumdisplay.php?f=77");
|
||||
|
||||
QMessageBox x264Box(this);
|
||||
x264Box.setIconPixmap(QIcon(":/images/x264.png").pixmap(48,48));
|
||||
x264Box.setWindowTitle(tr("About x264"));
|
||||
x264Box.setText(text2.replace("-", "−"));
|
||||
x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole));
|
||||
x264_beep(x264_beep_info);
|
||||
x264Box.exec();
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
{
|
||||
QString text2;
|
||||
text2 += tr("<nobr><tt>x265 - H.265/HEVC encoder. Copyright (C) 2003-2014 x265 project.<br>");
|
||||
text2 += tr("Commercially funded open source implementation of the H.265/HEVC compression standard.<br>");
|
||||
text2 += tr("Released under the terms of the GNU General Public License v2.<br><br>");
|
||||
text2 += tr("The x265 project is coordinated by <a href=\"%1\">MultiCoreWare</a>. Visit the <a href=\"%2\">x265 web-site</a> for details.<br>").arg("http://www.multicorewareinc.com/", "http://x265.org/");
|
||||
text2 += tr("Read the <a href=\"%1\">user's manual</a> to get started and use the <a href=\"%2\">support forum</a> for help!<br></tt></nobr").arg("http://goo.gl/smws42", "https://forum.doom9.org/forumdisplay.php?f=81");
|
||||
|
||||
QMessageBox x264Box(this);
|
||||
x264Box.setIconPixmap(QIcon(":/images/x265.png").pixmap(48,48));
|
||||
x264Box.setWindowTitle(tr("About x264"));
|
||||
x264Box.setText(text2.replace("-", "−"));
|
||||
x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole));
|
||||
x264_beep(x264_beep_info);
|
||||
x264Box.exec();
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
QString text2;
|
||||
text2 += tr("<nobr><tt>Avisynth - powerful video processing scripting language.<br>");
|
||||
text2 += tr("Copyright (c) 2000 Ben Rudiak-Gould and all subsequent developers.<br>");
|
||||
text2 += tr("Released under the terms of the GNU General Public License.<br><br>");
|
||||
text2 += tr("Please visit the web-site <a href=\"%1\">%1</a> for more information.<br>").arg("http://avisynth.nl/");
|
||||
text2 += tr("Read the <a href=\"%1\">guide</a> to get started and use the <a href=\"%2\">support forum</a> for help!<br></tt></nobr>").arg("http://avisynth.nl/index.php/First_script", "http://forum.doom9.org/forumdisplay.php?f=33");
|
||||
|
||||
QMessageBox x264Box(this);
|
||||
x264Box.setIconPixmap(QIcon(":/images/avisynth.png").pixmap(48,67));
|
||||
x264Box.setWindowTitle(tr("About Avisynth"));
|
||||
x264Box.setText(text2.replace("-", "−"));
|
||||
x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole));
|
||||
x264_beep(x264_beep_info);
|
||||
x264Box.exec();
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
{
|
||||
QString text2;
|
||||
text2 += tr("<nobr><tt>VapourSynth - application for video manipulation based on Python.<br>");
|
||||
text2 += tr("Copyright (c) 2012 Fredrik Mellbin.<br>");
|
||||
text2 += tr("Released under the terms of the GNU Lesser General Public.<br><br>");
|
||||
text2 += tr("Please visit the web-site <a href=\"%1\">%1</a> for more information.<br>").arg("http://www.vapoursynth.com/");
|
||||
text2 += tr("Read the <a href=\"%1\">documentation</a> to get started and use the <a href=\"%2\">support forum</a> for help!<br></tt></nobr>").arg("http://www.vapoursynth.com/doc/", "http://forum.doom9.org/showthread.php?t=165771");
|
||||
|
||||
QMessageBox x264Box(this);
|
||||
x264Box.setIconPixmap(QIcon(":/images/python.png").pixmap(48,48));
|
||||
x264Box.setWindowTitle(tr("About VapourSynth"));
|
||||
x264Box.setText(text2.replace("-", "−"));
|
||||
x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole));
|
||||
x264_beep(x264_beep_info);
|
||||
x264Box.exec();
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
QMessageBox::aboutQt(this);
|
||||
break;
|
||||
default:
|
||||
m_status = STATUS_IDLE;
|
||||
return;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1075,7 +970,7 @@ void MainWindow::init(void)
|
||||
//---------------------------------------
|
||||
|
||||
//Set Window title
|
||||
setWindowTitle(QString("%1 [%2]").arg(tr("Simple %1 Launcher").arg(m_sysinfo->has256Support() ? "x264/x265" : "x264"), m_sysinfo->hasX64Support() ? "x64" : "x86"));
|
||||
setWindowTitle(QString("%1 (%2)").arg(tr("Simple %1 Launcher").arg(m_sysinfo->has256Support() ? "x264/x265" : "x264"), m_sysinfo->hasX64Support() ? "64-Bit" : "32-Bit"));
|
||||
|
||||
//Enable drag&drop support for this window, required for Qt v4.8.4+
|
||||
setAcceptDrops(true);
|
||||
@ -1264,6 +1159,7 @@ void MainWindow::showEvent(QShowEvent *e)
|
||||
|
||||
if(m_status == STATUS_PRE_INIT)
|
||||
{
|
||||
setWindowTitle(tr("%1 - Starting...").arg(windowTitle()));
|
||||
QTimer::singleShot(0, this, SLOT(init()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,9 +34,6 @@
|
||||
<None Include="res\icons\movie.ico">
|
||||
<Filter>Resource Files</Filter>
|
||||
</None>
|
||||
<None Include="gui\win_about.ui">
|
||||
<Filter>Dialogs</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\global.h">
|
||||
@ -105,9 +102,6 @@
|
||||
<ClInclude Include="src\source_vapoursynth.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\win_about.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\main.cpp">
|
||||
@ -322,6 +316,12 @@
|
||||
<CustomBuild Include="src\tool_abstract.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="src\win_about.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="gui\win_about.ui">
|
||||
<Filter>Dialogs</Filter>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="x264_launcher.rc">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user