Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated version info: v4.01 RC-1.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-03-28 21:58:01 +02:00
parent 4689e9dd27
commit eeab6155e5
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Changelog.html
View File

@ -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 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 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 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 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>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) <li>Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)

2
res/Icons.qrc
View File

@ -66,6 +66,8 @@
<file>icons/paste_plain.png</file> <file>icons/paste_plain.png</file>
<file>icons/photo.png</file> <file>icons/photo.png</file>
<file>icons/play.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/report.png</file>
<file>icons/resultset_next.png</file> <file>icons/resultset_next.png</file>
<file>icons/script.png</file> <file>icons/script.png</file>

BIN
res/icons/power_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

BIN
res/icons/power_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 718 B

4
src/Config.h
View File

@ -25,8 +25,8 @@
#define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_BUILD 412 #define VER_LAMEXP_BUILD 414
#define VER_LAMEXP_SUFFIX Beta-15 #define VER_LAMEXP_SUFFIX RC-1
/* /*
* Tools versions * Tools versions

7
src/Dialog_Processing.cpp
View File

@ -744,10 +744,13 @@ bool ProcessingDialog::shutdownComputer(void)
qWarning("Initiating shutdown sequence!"); qWarning("Initiating shutdown sequence!");
QProgressDialog progressDialog(text.arg(iTimeout), tr("Cancel Shutdown"), 0, iTimeout + 1, this, flags); 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.setModal(true);
progressDialog.setAutoClose(false); progressDialog.setAutoClose(false);
progressDialog.setAutoReset(false); progressDialog.setAutoReset(false);
progressDialog.setWindowIcon(QIcon(":/icons/lightning.png")); progressDialog.setWindowIcon(QIcon(":/icons/power_off.png"));
progressDialog.setCancelButton(cancelButton);
progressDialog.show(); progressDialog.show();
QApplication::processEvents(); QApplication::processEvents();
@ -777,7 +780,7 @@ bool ProcessingDialog::shutdownComputer(void)
} }
progressDialog.setValue(i+1); progressDialog.setValue(i+1);
progressDialog.setLabelText(text.arg(iTimeout-i)); progressDialog.setLabelText(text.arg(iTimeout-i));
if(iTimeout-i == 3) progressDialog.setCancelButtonText(QString()); if(iTimeout-i == 3) progressDialog.setCancelButton(NULL);
QApplication::processEvents(); QApplication::processEvents();
PlaySound(MAKEINTRESOURCE((i < iTimeout) ? IDR_WAVE_BEEP : IDR_WAVE_BEEP_LONG), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC); PlaySound(MAKEINTRESOURCE((i < iTimeout) ? IDR_WAVE_BEEP : IDR_WAVE_BEEP_LONG), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
} }