From e194239b967c496b415a657bc149d50cb2ef4f59 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 14 Dec 2013 14:20:43 +0100 Subject: [PATCH] Improved updater dialog. --- etc/setup/license.rtf | Bin 1652 -> 1624 bytes etc/setup/setup.nsi | 1 - gui/win_updater.ui | 38 ++++++++++------------------------- res/images/update_wizard.png | Bin 0 -> 17539 bytes res/resources.qrc | 1 + src/version.h | 2 +- src/win_updater.cpp | 2 +- 7 files changed, 14 insertions(+), 30 deletions(-) create mode 100644 res/images/update_wizard.png diff --git a/etc/setup/license.rtf b/etc/setup/license.rtf index d8f3e8f0a6fd9a91544958e6f103cd7054d63692..fba20ebd495ea1b3c8fc5b57672b4bbd4c7cea75 100644 GIT binary patch delta 752 zcma))KTiTN7>7N;g~0BBrh`E+0q)9$K@yi+jWNpDr9jJFxNDELcoIVR3YvZbcR!Gm zad3ArP9|FU>!8B+Uf$pP^m*HR%RT09_orh-Ia8_~n!-j@CV`ZQ#$o_L3;R66&57wa zhze6P&F3S%r#h*{6E>vhyOvw^8md+r5oa1}&xNWcwjxZn&AS;r@<0h2TKMpHr;8BjjE zMy&}Rk4GZt`3jW0GJv-2R-mm57AP;y{SQOUo)T)$x;R>;|2T0LbsGBJs+5)<#_e~# zW!OzMtfC&I_DWmgfqqC8x91NSq}P{LIl)6bhPYmtA+yjC{)&9n0t)*riv<-c_3&!qY1cD?|W>h=Qw delta 590 zcma)3Jxjw-6txLetnDDysS1x){3t3(zZ?P%il8W^h>LI$lIEoi+$QzCM28Sub+f*~ zKc$<3{sRAiql0Mz4jQQ2fpa1Qf6w8^P-K zb;hZukTbpS4sF-jc;4D@NO+0^2j zD)i{+vA)2u)=+@sz(-GoahRRa2gwd~R>+A)ra2QMFvLTqQ;Bhu!KP>iPz4K3+u>et zc-}cUJvnM0ld{N3o5gZCPKqYu=mp>-bS+iPN?Y?`7{=dmwFQaAh1A;99h2yYg!=}k zmp*koV$v&$?vOIRog7YZeU(x`@8nXt_N}~B{PR(?ka&{6 m#Isxy+3fp9(%*lYo10!)Olyvah$+QJ(fB{rCGn#%r@jGRSj%w$ 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 0000000000000000000000000000000000000000..0732709c2ded8b26d4e47c1f5ff74acbba2b9b41 GIT binary patch literal 17539 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 e)c=32U;hJX>;p>P0&Y+M0000images/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);