From 9667385870cb6f1b1227e0fb2f3706ef036a4a1c Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 13 Feb 2012 16:44:50 +0100 Subject: [PATCH] Make sure that the current configuration can be saved to a template, even if it equals the "" configuration. Also added Avisynth credits. --- gui/win_help.ui | 85 +++++++++++++++++++++++++++++++++------- gui/win_main.ui | 12 +++++- res/images/avisynth.png | Bin 0 -> 11722 bytes res/resources.qrc | 1 + src/version.h | 2 +- src/win_addJob.cpp | 5 +++ src/win_help.cpp | 5 ++- src/win_main.cpp | 25 +++++++++++- 8 files changed, 117 insertions(+), 18 deletions(-) create mode 100644 res/images/avisynth.png diff --git a/gui/win_help.ui b/gui/win_help.ui index b59b7f0..ced1461 100644 --- a/gui/win_help.ui +++ b/gui/win_help.ui @@ -26,20 +26,77 @@ 12 - - - - - - :/images/x264.png - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + + + + + 48 + 40 + + + + + 48 + 40 + + + + + + + :/images/x264.png + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 48 + 67 + + + + + 48 + 67 + + + + + + + :/images/avisynth.png + + + true + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/gui/win_main.ui b/gui/win_main.ui index 66e8bdb..0cd8b8e 100644 --- a/gui/win_main.ui +++ b/gui/win_main.ui @@ -37,7 +37,7 @@ Qt::ActionsContextMenu - true + false QAbstractItemView::SingleSelection @@ -350,6 +350,7 @@ + @@ -559,6 +560,15 @@ Secret Recipe (Shush!) + + + + :/buttons/book_open.png:/buttons/book_open.png + + + Avisynth Usage Wiki + + buttonAddJob diff --git a/res/images/avisynth.png b/res/images/avisynth.png new file mode 100644 index 0000000000000000000000000000000000000000..fe10be35621b83e6b1798fed44eb3786e03b24f1 GIT binary patch literal 11722 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/trash.png buttons/world_link.png buttons/wrench.png + images/avisynth.png images/movie.png images/update.png images/x264.png diff --git a/src/version.h b/src/version.h index aa3d650..6dbcc59 100644 --- a/src/version.h +++ b/src/version.h @@ -22,7 +22,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 0 #define VER_X264_PATCH 2 -#define VER_X264_BUILD 147 +#define VER_X264_BUILD 164 #define VER_X264_MINIMUM_REV 2146 #define VER_X264_CURRENT_API 120 diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp index 660bb46..6b26743 100644 --- a/src/win_addJob.cpp +++ b/src/win_addJob.cpp @@ -531,6 +531,11 @@ void AddJobDialog::saveTemplateButtonClicked(void) for(int i = 0; i < cbxTemplate->count(); i++) { + const QString tempName = cbxTemplate->itemText(i); + if(tempName.contains('<') || tempName.contains('>')) + { + continue; + } OptionsModel* test = reinterpret_cast(cbxTemplate->itemData(i).value()); if(test != NULL) { diff --git a/src/win_help.cpp b/src/win_help.cpp index 723b71d..8959059 100644 --- a/src/win_help.cpp +++ b/src/win_help.cpp @@ -65,8 +65,11 @@ HelpDialog::~HelpDialog(void) void HelpDialog::showEvent(QShowEvent *event) { + logo_x264->setHidden(m_avs2yuv); + logo_avisynth->setVisible(m_avs2yuv); + QDialog::showEvent(event); - + m_startAgain = true; if(!m_avs2yuv) diff --git a/src/win_main.cpp b/src/win_main.cpp index 2b4c5af..e6f2ec5 100644 --- a/src/win_main.cpp +++ b/src/win_main.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -139,6 +140,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures) connect(actionWebAvisynth64, SIGNAL(triggered()), this, SLOT(showWebLink())); connect(actionWebWiki, 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(actionPreferences, SIGNAL(triggered()), this, SLOT(showPreferences())); @@ -395,6 +397,7 @@ void MainWindow::showAbout(void) aboutBox.setWindowTitle(tr("About...")); aboutBox.setText(text.replace("-", "−")); aboutBox.addButton(tr("About x264"), QMessageBox::NoRole); + aboutBox.addButton(tr("About AVS"), QMessageBox::NoRole); aboutBox.addButton(tr("About Qt"), QMessageBox::NoRole); aboutBox.setEscapeButton(aboutBox.addButton(tr("Close"), QMessageBox::NoRole)); @@ -409,7 +412,8 @@ void MainWindow::showAbout(void) text2 += tr("x264 - the best H.264/AVC encoder. Copyright (c) 2003-2012 x264 project.
"); text2 += tr("Free software library for encoding video streams into the H.264/MPEG-4 AVC format.
"); text2 += tr("Released under the terms of the GNU General Public License.

"); - text2 += tr("Please visit %1 for obtaining a commercial x264 license!
").arg("http://x264licensing.com/"); + text2 += tr("Please visit %1 for obtaining a commercial x264 license.
").arg("http://x264licensing.com/"); + text2 += tr("Read the user's manual to get started and use the support forum for help!
").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)); @@ -421,6 +425,24 @@ void MainWindow::showAbout(void) } break; case 1: + { + QString text2; + text2 += tr("Avisynth - powerful tool for video post-production.
"); + text2 += tr("Copyright (c) 2000 Ben Rudiak-Gould and all subsequent developers.
"); + text2 += tr("Released under the terms of the GNU General Public License.

"); + text2 += tr("Please visit the web-site %1 for more information.
").arg("http://avisynth.org/"); + text2 += tr("Read the guide to get started and use the support forum for help!
").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("-", "−")); + x264Box.setEscapeButton(x264Box.addButton(tr("Close"), QMessageBox::NoRole)); + MessageBeep(MB_ICONINFORMATION); + x264Box.exec(); + } + break; + case 2: QMessageBox::aboutQt(this); break; 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() == 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() == 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")); }