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; }
  • Updated LAME encoder to v3.99.0.15 (2011-03-22), compiled with ICL 12.0.2
  • Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
  • Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0 -
  • Updated SoX to v14.3.2 (2010-02-27), compiled with 12.0.2 +
  • Updated SoX to v14.3.2 (2010-02-27), compiled with ICL 12.0.2
  • Updated MediaInfo to v0.7.43 (2011-03-20), compiled with ICL 12.0.2 and MSVC 9.0
  • Updated language files (big thank-you to all contributors !!!)
  • 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 @@ icons/paste_plain.png icons/photo.png icons/play.png + icons/power_off.png + icons/power_on.png icons/report.png icons/resultset_next.png icons/script.png diff --git a/res/icons/power_off.png b/res/icons/power_off.png new file mode 100644 index 00000000..27661dc1 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 index 00000000..5e415228 Binary files /dev/null and b/res/icons/power_on.png differ 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); }