diff --git a/etc/setup/license.rtf b/etc/setup/license.rtf index d8f3e8f..fba20eb 100644 Binary files a/etc/setup/license.rtf and b/etc/setup/license.rtf differ diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi index 2d2eab6..427918e 100644 --- a/etc/setup/setup.nsi +++ b/etc/setup/setup.nsi @@ -132,7 +132,6 @@ VIAddVersionKey "Website" "${MyWebSite}" ;MUI2 Interface Settings ;-------------------------------- -!define MUI_INSTFILESPAGE_COLORS "C5DEFB 000000" !define MUI_ABORTWARNING !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM !define MUI_STARTMENUPAGE_REGISTRY_KEY "${MyRegPath}" diff --git a/gui/win_updater.ui b/gui/win_updater.ui index 391f33a..eb6fe61 100644 --- a/gui/win_updater.ui +++ b/gui/win_updater.ui @@ -9,8 +9,8 @@ 0 0 - 410 - 273 + 428 + 257 @@ -78,7 +78,7 @@ - Web-Update + Web Update @@ -98,21 +98,21 @@ - 72 - 72 + 96 + 182 - 72 - 72 + 96 + 182 - :/images/update.png + :/images/update_wizard.png true @@ -144,7 +144,7 @@ - 32 + 20 20 @@ -152,22 +152,6 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 6 - - - - @@ -234,7 +218,7 @@ 20 - 10 + 8 @@ -305,7 +289,7 @@ 20 - 10 + 8 diff --git a/res/images/update_wizard.png b/res/images/update_wizard.png new file mode 100644 index 0000000..0732709 Binary files /dev/null and b/res/images/update_wizard.png differ diff --git a/res/resources.qrc b/res/resources.qrc index c1335fb..0bf1d1a 100644 --- a/res/resources.qrc +++ b/res/resources.qrc @@ -52,6 +52,7 @@ images/movie.png images/python.png images/update.png + images/update_wizard.png images/x264.png diff --git a/src/version.h b/src/version.h index 6f4996e..7e9d442 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 2 #define VER_X264_PATCH 7 -#define VER_X264_BUILD 698 +#define VER_X264_BUILD 704 #define VER_X264_MINIMUM_REV 2363 #define VER_X264_CURRENT_API 140 diff --git a/src/win_updater.cpp b/src/win_updater.cpp index c1c4e40..e9f1c32 100644 --- a/src/win_updater.cpp +++ b/src/win_updater.cpp @@ -310,7 +310,7 @@ void UpdaterDialog::threadFinished(void) break; case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder: UPDATE_ICON(3, "shield_error"); - UPDATE_TEXT(3, tr("Your are using a pre-release version!")); + UPDATE_TEXT(3, tr("You are using a pre-release version!")); break; default: qWarning("Update thread succeeded with unexpected status code: %d", m_status);