From eeab6155e5c91ea20ca79640eb64cb262cfa436b Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Mon, 28 Mar 2011 21:58:01 +0200
Subject: [PATCH] Updated version info: v4.01 RC-1.

---
 doc/Changelog.html        |   2 +-
 res/Icons.qrc             |   2 ++
 res/icons/power_off.png   | Bin 0 -> 715 bytes
 res/icons/power_on.png    | Bin 0 -> 718 bytes
 src/Config.h              |   4 ++--
 src/Dialog_Processing.cpp |   7 +++++--
 6 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 res/icons/power_off.png
 create mode 100644 res/icons/power_on.png

diff --git a/doc/Changelog.html b/doc/Changelog.html
index cc9e9bb5..bc9f22f2 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -26,7 +26,7 @@ a:visited { color: #0000EE; }
 <li>Updated LAME encoder to v3.99.0.15 (2011-03-22), compiled with ICL 12.0.2
 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
 <li>Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0
-<li>Updated SoX to v14.3.2 (2010-02-27), compiled with 12.0.2
+<li>Updated SoX to v14.3.2 (2010-02-27), compiled with ICL 12.0.2
 <li>Updated MediaInfo to v0.7.43 (2011-03-20), compiled with ICL 12.0.2 and MSVC 9.0
 <li>Updated language files (big thank-you to all contributors !!!)
 <li>Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)
diff --git a/res/Icons.qrc b/res/Icons.qrc
index 05275495..99124e69 100644
--- a/res/Icons.qrc
+++ b/res/Icons.qrc
@@ -66,6 +66,8 @@
     <file>icons/paste_plain.png</file>
     <file>icons/photo.png</file>
     <file>icons/play.png</file>
+    <file>icons/power_off.png</file>
+    <file>icons/power_on.png</file>
     <file>icons/report.png</file>
     <file>icons/resultset_next.png</file>
     <file>icons/script.png</file>
diff --git a/res/icons/power_off.png b/res/icons/power_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..27661dc1a1145c1fa2d4dcce95d462a2216a9d86
GIT binary patch
literal 715
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z25un`X1sK_?hjB<p~N+!Bsf2<q&%@GmBBYLxhOw3H6=4q!7Z~WwLHHlyI8?DV)sNX
z6`)!%kXq-W)Wnj^{5*w_%-mE4LqmN7Q+)&TySqAXGcYg;2Ka=y{{R1fnga8&x}5V9
z8ouAZxkH2Hu&vC6P_vuq-kUYpE+u;$a#p!lowQAZb%ze;L0j2l9vWxEEG{Lu+%5{g
zQyj5Vo8zF3^rcvbTX{iSfNBi*_Ss0E3^u!#9dM^C_Fi@JHbefscCyzC!tU0jOqFAp
zt<672o?(uTz#>J4MLPUT6&cnmGprA@-=xB@U59grspw8shFw;Yd(;^AYO@{EW;+~d
zf4Cw4h@1M6^nhdP49AT5PiQip&|*5_Aa_!O;gk;RDP6Wxef6hZRnD05pD`6U>mYYN
z*72f;`jwV~Ytc5>V(o91#oo#exLuWWw><9dr22b1)<0~^f7n*=<oN!lYv;dSH~-z9
z^&d~}|Md9&k0<wmp)v8qCQ#g{lmz(&GXUd*LswT%&&0&kbUhU80)od7@B|2gpSi39
zs=w^%;us<!$$GF|sVR}6_2Kn<%A3sPoo=1-m%TE7iPI*l@AZoF*c)D6{Tr8_pUTCc
z@bg;L6uDXFIT?=e-<tF&BB-`p#ADmib!~@NXkVR{_|NxO**Uw<(?ez^Z(h1i_D#b5
zS9x<MyZ_xG(^kLmeSgf?j(I8b<IMHWNqt-TsYK<sO_0dZvVdui+5hg6@qAS+@Q(jx
z#;dD!osa#k=W4Ar{H?S1_O`zwTr(v-t}LD1XzS6w`Vo`Cw&=-RD+PjDA6?^MI6Zau
qs*?CqIt&axdT*a>zTGX%@c-Q!!@M;d2KhkmF?hQAxvX<aXaWF(0x{YE

literal 0
HcmV?d00001

diff --git a/res/icons/power_on.png b/res/icons/power_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e415228e1f435882a109d143ab533b68646d7dc
GIT binary patch
literal 718
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z25un`X1sK_?hjB<p~N+!Bsf2<q&%@GmBBYLxhOw3H6=4q!7Z~WwLHHlyI8?DV)sNX
z6`)!%kXq-W)Wnj^{5*w_%-mE4LqmN7Q+)&TySqAXGcYiU1o(uw{{R1<VXCV6?g*zt
zNyU%*8F%XQ9kP}=<DqdSm~o4)+8KYL{kA68Vi>pSG4C+o+ixXu*g^KBhw?c;y{i%W
zS0kBs8t@*lQatCQb0v&%iyqr{Bi=ohGRNGsE(9B1i88qs%eK{sZ?~oHg)q~ru?!n@
z7`Es#Y}aGhsmHL-fZ>1v!(l^)qlOHpj2X@tGoA(_6Q+HJOoxq`&zLfwF=N?gz;WE1
zbGs?e4s-sk7W_Lb`Onz#pSKs-YAJBsR^YsY@JR=egZ3ilofR(mDxLN*ycB74E!yNt
zjQx=W`*X?mH&X*H6a?HU&cD==|EQ<nPItkh-umlP>mSXS|6=3(H=EW!+q?e#{{62{
z?f-P<{@17Xe>}ba^C>VuCiiYg1csnWNswPK129TBbanOgOiWBo*F(WBAb1P`Pk<o!
znaet$`pcd!jv*3~x(D0C4mmKe9M~EzB4YhbS?lDb?j{-8mWI14-u(aH{vercM#Np)
z*W3Kd!wiJqniQpMyVI4B^>L5qrKm|;Z`d?sO#Wi|?`zE_DK<0fC+$K(G4E4qncI1P
zO`6zal8`8W-Lft-<CuNglJhRFgkpns?O$zkMEer2cgEyPi`~y}o|GsU9$A<DVxo+u
z!AWkJDL1FjTU$G^$}f%oweBb1|8c#u<C&FAKWR>Anzz%pok8cwswJ-_9`AU$*wUx<
sb*sqCGf$jnMBcO06z$(W&EO;ZoB4X_3;)Hh0eX+Y)78&qol`;+0Kv2@S^xk5

literal 0
HcmV?d00001

diff --git a/src/Config.h b/src/Config.h
index e1d047b2..7e1778d6 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,8 +25,8 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				412
-#define VER_LAMEXP_SUFFIX				Beta-15
+#define VER_LAMEXP_BUILD				414
+#define VER_LAMEXP_SUFFIX				RC-1
 
 /*
  * Tools versions
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index d0fff633..dc177005 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -744,10 +744,13 @@ bool ProcessingDialog::shutdownComputer(void)
 	qWarning("Initiating shutdown sequence!");
 	
 	QProgressDialog progressDialog(text.arg(iTimeout), tr("Cancel Shutdown"), 0, iTimeout + 1, this, flags);
+	QPushButton *cancelButton = new QPushButton(tr("Cancel Shutdown"), &progressDialog);
+	cancelButton->setIcon(QIcon(":/icons/power_on.png"));
 	progressDialog.setModal(true);
 	progressDialog.setAutoClose(false);
 	progressDialog.setAutoReset(false);
-	progressDialog.setWindowIcon(QIcon(":/icons/lightning.png"));
+	progressDialog.setWindowIcon(QIcon(":/icons/power_off.png"));
+	progressDialog.setCancelButton(cancelButton);
 	progressDialog.show();
 	
 	QApplication::processEvents();
@@ -777,7 +780,7 @@ bool ProcessingDialog::shutdownComputer(void)
 		}
 		progressDialog.setValue(i+1);
 		progressDialog.setLabelText(text.arg(iTimeout-i));
-		if(iTimeout-i == 3) progressDialog.setCancelButtonText(QString());
+		if(iTimeout-i == 3) progressDialog.setCancelButton(NULL);
 		QApplication::processEvents();
 		PlaySound(MAKEINTRESOURCE((i < iTimeout) ? IDR_WAVE_BEEP : IDR_WAVE_BEEP_LONG), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
 	}
-- 
2.11.0