Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Make sure that the current configuration can be saved to a template, even if it equals the "<Recently Used>" configuration. Also added Avisynth credits.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-02-13 16:44:50 +01:00
parent aedd58b092
commit 9667385870
8 changed files with 117 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
gui/win_help.ui
View File

@ -26,20 +26,77 @@
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="label"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="text"> <item>
<string/> <widget class="QLabel" name="logo_x264">
</property> <property name="minimumSize">
<property name="pixmap"> <size>
<pixmap resource="../res/resources.qrc">:/images/x264.png</pixmap> <width>48</width>
</property> <height>40</height>
<property name="scaledContents"> </size>
<bool>false</bool> </property>
</property> <property name="maximumSize">
<property name="alignment"> <size>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <width>48</width>
</property> <height>40</height>
</widget> </size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../res/resources.qrc">:/images/x264.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="logo_avisynth">
<property name="minimumSize">
<size>
<width>48</width>
<height>67</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>48</width>
<height>67</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>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<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>
<item> <item>
<widget class="QPlainTextEdit" name="plainTextEdit"> <widget class="QPlainTextEdit" name="plainTextEdit">

12
gui/win_main.ui
View File

@ -37,7 +37,7 @@
<enum>Qt::ActionsContextMenu</enum> <enum>Qt::ActionsContextMenu</enum>
</property> </property>
<property name="alternatingRowColors"> <property name="alternatingRowColors">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum> <enum>QAbstractItemView::SingleSelection</enum>
@ -350,6 +350,7 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionWebWiki"/> <addaction name="actionWebWiki"/>
<addaction name="actionWebBluRay"/> <addaction name="actionWebBluRay"/>
<addaction name="actionWebAvsWiki"/>
<addaction name="actionWebSecret"/> <addaction name="actionWebSecret"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
@ -559,6 +560,15 @@
<string>Secret Recipe (Shush!)</string> <string>Secret Recipe (Shush!)</string>
</property> </property>
</action> </action>
<action name="actionWebAvsWiki">
<property name="icon">
<iconset resource="../res/resources.qrc">
<normaloff>:/buttons/book_open.png</normaloff>:/buttons/book_open.png</iconset>
</property>
<property name="text">
<string>Avisynth Usage Wiki</string>
</property>
</action>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>buttonAddJob</tabstop> <tabstop>buttonAddJob</tabstop>

BIN
res/images/avisynth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

1
res/resources.qrc
View File

@ -32,6 +32,7 @@
<file>buttons/trash.png</file> <file>buttons/trash.png</file>
<file>buttons/world_link.png</file> <file>buttons/world_link.png</file>
<file>buttons/wrench.png</file> <file>buttons/wrench.png</file>
<file>images/avisynth.png</file>
<file>images/movie.png</file> <file>images/movie.png</file>
<file>images/update.png</file> <file>images/update.png</file>
<file>images/x264.png</file> <file>images/x264.png</file>

2
src/version.h
View File

@ -22,7 +22,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 0 #define VER_X264_MINOR 0
#define VER_X264_PATCH 2 #define VER_X264_PATCH 2
#define VER_X264_BUILD 147 #define VER_X264_BUILD 164
#define VER_X264_MINIMUM_REV 2146 #define VER_X264_MINIMUM_REV 2146
#define VER_X264_CURRENT_API 120 #define VER_X264_CURRENT_API 120

5
src/win_addJob.cpp
View File

@ -531,6 +531,11 @@ void AddJobDialog::saveTemplateButtonClicked(void)
for(int i = 0; i < cbxTemplate->count(); i++) for(int i = 0; i < cbxTemplate->count(); i++)
{ {
const QString tempName = cbxTemplate->itemText(i);
if(tempName.contains('<') || tempName.contains('>'))
{
continue;
}
OptionsModel* test = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>()); OptionsModel* test = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>());
if(test != NULL) if(test != NULL)
{ {

5
src/win_help.cpp
View File

@ -65,8 +65,11 @@ HelpDialog::~HelpDialog(void)
void HelpDialog::showEvent(QShowEvent *event) void HelpDialog::showEvent(QShowEvent *event)
{ {
logo_x264->setHidden(m_avs2yuv);
logo_avisynth->setVisible(m_avs2yuv);
QDialog::showEvent(event); QDialog::showEvent(event);
m_startAgain = true; m_startAgain = true;
if(!m_avs2yuv) if(!m_avs2yuv)

25
src/win_main.cpp
View File

@ -38,6 +38,7 @@
#include <QLibrary> #include <QLibrary>
#include <QProcess> #include <QProcess>
#include <QProgressDialog> #include <QProgressDialog>
#include <QScrollBar>
#include <Mmsystem.h> #include <Mmsystem.h>
@ -139,6 +140,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures)
connect(actionWebAvisynth64, SIGNAL(triggered()), this, SLOT(showWebLink())); connect(actionWebAvisynth64, SIGNAL(triggered()), this, SLOT(showWebLink()));
connect(actionWebWiki, SIGNAL(triggered()), this, SLOT(showWebLink())); connect(actionWebWiki, SIGNAL(triggered()), this, SLOT(showWebLink()));
connect(actionWebBluRay, SIGNAL(triggered()), this, SLOT(showWebLink())); connect(actionWebBluRay, SIGNAL(triggered()), this, SLOT(showWebLink()));
connect(actionWebAvsWiki, SIGNAL(triggered()), this, SLOT(showWebLink()));
connect(actionWebSecret, SIGNAL(triggered()), this, SLOT(showWebLink())); connect(actionWebSecret, SIGNAL(triggered()), this, SLOT(showWebLink()));
connect(actionPreferences, SIGNAL(triggered()), this, SLOT(showPreferences())); connect(actionPreferences, SIGNAL(triggered()), this, SLOT(showPreferences()));
@ -395,6 +397,7 @@ void MainWindow::showAbout(void)
aboutBox.setWindowTitle(tr("About...")); aboutBox.setWindowTitle(tr("About..."));
aboutBox.setText(text.replace("-", "&minus;")); aboutBox.setText(text.replace("-", "&minus;"));
aboutBox.addButton(tr("About x264"), QMessageBox::NoRole); aboutBox.addButton(tr("About x264"), QMessageBox::NoRole);
aboutBox.addButton(tr("About AVS"), QMessageBox::NoRole);
aboutBox.addButton(tr("About Qt"), QMessageBox::NoRole); aboutBox.addButton(tr("About Qt"), QMessageBox::NoRole);
aboutBox.setEscapeButton(aboutBox.addButton(tr("Close"), QMessageBox::NoRole)); aboutBox.setEscapeButton(aboutBox.addButton(tr("Close"), QMessageBox::NoRole));
@ -409,7 +412,8 @@ void MainWindow::showAbout(void)
text2 += tr("<nobr><tt>x264 - the best H.264/AVC encoder. Copyright (c) 2003-2012 x264 project.<br>"); text2 += tr("<nobr><tt>x264 - the best H.264/AVC encoder. Copyright (c) 2003-2012 x264 project.<br>");
text2 += tr("Free software library for encoding video streams into the H.264/MPEG-4 AVC format.<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.<br><br>"); text2 += tr("Released under the terms of the GNU General Public License.<br><br>");
text2 += tr("Please visit <a href=\"%1\">%1</a> for obtaining a <u>commercial</u> x264 license!<br></tt></nobr>").arg("http://x264licensing.com/"); 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); QMessageBox x264Box(this);
x264Box.setIconPixmap(QIcon(":/images/x264.png").pixmap(48,48)); x264Box.setIconPixmap(QIcon(":/images/x264.png").pixmap(48,48));
@ -421,6 +425,24 @@ void MainWindow::showAbout(void)
} }
break; break;
case 1: case 1:
{
QString text2;
text2 += tr("<nobr><tt>Avisynth - powerful tool for video post-production.<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.org/");
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.org/mediawiki/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("-", "&minus;"));
x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole));
MessageBeep(MB_ICONINFORMATION);
x264Box.exec();
}
break;
case 2:
QMessageBox::aboutQt(this); QMessageBox::aboutQt(this);
break; break;
default: default:
@ -443,6 +465,7 @@ void MainWindow::showWebLink(void)
if(QObject::sender() == actionWebAvisynth64) QDesktopServices::openUrl(QUrl("http://code.google.com/p/avisynth64/downloads/list")); if(QObject::sender() == actionWebAvisynth64) QDesktopServices::openUrl(QUrl("http://code.google.com/p/avisynth64/downloads/list"));
if(QObject::sender() == actionWebWiki) QDesktopServices::openUrl(QUrl("http://mewiki.project357.com/wiki/X264_Settings")); if(QObject::sender() == actionWebWiki) QDesktopServices::openUrl(QUrl("http://mewiki.project357.com/wiki/X264_Settings"));
if(QObject::sender() == actionWebBluRay) QDesktopServices::openUrl(QUrl("http://www.x264bluray.com/")); if(QObject::sender() == actionWebBluRay) QDesktopServices::openUrl(QUrl("http://www.x264bluray.com/"));
if(QObject::sender() == actionWebAvsWiki) QDesktopServices::openUrl(QUrl("http://avisynth.org/mediawiki/Main_Page#Usage"));
if(QObject::sender() == actionWebSecret) QDesktopServices::openUrl(QUrl("http://www.youtube.com/watch_popup?v=AXIeHY-OYNI")); if(QObject::sender() == actionWebSecret) QDesktopServices::openUrl(QUrl("http://www.youtube.com/watch_popup?v=AXIeHY-OYNI"));
} }