Updated version info: v4.01 RC-1.

diff --git a/doc/Changelog.html b/doc/Changelog.html
index cc9e9bb..bc9f22f 100644 (file)
--- 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 0527549..99124e6 100644 (file)
--- 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 (file)
index 0000000..27661dc
Binary files /dev/null and b/res/icons/power_off.png differ

diff --git a/res/icons/power_on.png b/res/icons/power_on.png
new file mode 100644 (file)
index 0000000..5e41522
Binary files /dev/null and b/res/icons/power_on.png differ

diff --git a/src/Config.h b/src/Config.h
index e1d047b..7e1778d 100644 (file)
--- 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 d0fff63..dc17700 100644 (file)
--- 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);
        }