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

Bump patch version + minor improvements to previous commit.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-10-29 21:11:51 +02:00
parent 02b7cdc3e1
commit b1098f4177
5 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
etc/Translation/Blank.ts
View File

@ -2623,124 +2623,124 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../gui/ProcessingDialog.ui" line="657"/> <location filename="../../gui/ProcessingDialog.ui" line="660"/>
<source>Abort</source> <source>Abort</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../gui/ProcessingDialog.ui" line="680"/> <location filename="../../gui/ProcessingDialog.ui" line="683"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="146"/> <location filename="../../src/Dialog_Processing.cpp" line="147"/>
<source>Show details for selected job</source> <source>Show details for selected job</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="147"/> <location filename="../../src/Dialog_Processing.cpp" line="148"/>
<source>Browse Output File Location</source> <source>Browse Output File Location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="165"/> <location filename="../../src/Dialog_Processing.cpp" line="166"/>
<source>Encoding Files</source> <source>Encoding Files</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="165"/> <location filename="../../src/Dialog_Processing.cpp" line="166"/>
<source>Your files are being encoded, please be patient...</source> <source>Your files are being encoded, please be patient...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="319"/> <location filename="../../src/Dialog_Processing.cpp" line="320"/>
<source>Encoding files, please wait...</source> <source>Encoding files, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="363"/> <location filename="../../src/Dialog_Processing.cpp" line="364"/>
<source>Multi-threading enabled: Running %1 instances in parallel!</source> <source>Multi-threading enabled: Running %1 instances in parallel!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="377"/> <location filename="../../src/Dialog_Processing.cpp" line="378"/>
<source>Aborted! Waiting for running jobs to terminate...</source> <source>Aborted! Waiting for running jobs to terminate...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="392"/> <location filename="../../src/Dialog_Processing.cpp" line="393"/>
<source>Encoding: %1 files of %2 completed so far, please wait...</source> <source>Encoding: %1 files of %2 completed so far, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="420"/> <location filename="../../src/Dialog_Processing.cpp" line="421"/>
<source>Creating the playlist file, please wait...</source> <source>Creating the playlist file, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="430"/> <location filename="../../src/Dialog_Processing.cpp" line="431"/>
<source>Process was aborted by the user after %1 file(s)!</source> <source>Process was aborted by the user after %1 file(s)!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="430"/> <location filename="../../src/Dialog_Processing.cpp" line="431"/>
<source>Process was aborted prematurely by the user!</source> <source>Process was aborted prematurely by the user!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="431"/> <location filename="../../src/Dialog_Processing.cpp" line="432"/>
<source>LameXP - Aborted</source> <source>LameXP - Aborted</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="431"/> <location filename="../../src/Dialog_Processing.cpp" line="432"/>
<source>Process was aborted by the user.</source> <source>Process was aborted by the user.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="443"/> <location filename="../../src/Dialog_Processing.cpp" line="444"/>
<source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source> <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="444"/> <location filename="../../src/Dialog_Processing.cpp" line="445"/>
<source>LameXP - Error</source> <source>LameXP - Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="444"/> <location filename="../../src/Dialog_Processing.cpp" line="445"/>
<source>At least one file has failed!</source> <source>At least one file has failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="454"/>
<location filename="../../src/Dialog_Processing.cpp" line="455"/> <location filename="../../src/Dialog_Processing.cpp" line="455"/>
<location filename="../../src/Dialog_Processing.cpp" line="456"/>
<source>All files completed successfully.</source> <source>All files completed successfully.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="455"/> <location filename="../../src/Dialog_Processing.cpp" line="456"/>
<source>LameXP - Done</source> <source>LameXP - Done</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="843"/> <location filename="../../src/Dialog_Processing.cpp" line="844"/>
<source>Playlist creation failed</source> <source>Playlist creation failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="843"/> <location filename="../../src/Dialog_Processing.cpp" line="844"/>
<source>The playlist file could not be created:</source> <source>The playlist file could not be created:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="910"/> <location filename="../../src/Dialog_Processing.cpp" line="914"/>
<source>Warning: Computer will shutdown in %1 seconds...</source> <source>Warning: Computer will shutdown in %1 seconds...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="914"/> <location filename="../../src/Dialog_Processing.cpp" line="918"/>
<location filename="../../src/Dialog_Processing.cpp" line="915"/> <location filename="../../src/Dialog_Processing.cpp" line="919"/>
<source>Cancel Shutdown</source> <source>Cancel Shutdown</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

50
etc/Translation/LameXP_PL.ts
View File

@ -2623,124 +2623,124 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../gui/ProcessingDialog.ui" line="657"/> <location filename="../../gui/ProcessingDialog.ui" line="660"/>
<source>Abort</source> <source>Abort</source>
<translation type="unfinished">Przerwij</translation> <translation type="unfinished">Przerwij</translation>
</message> </message>
<message> <message>
<location filename="../../gui/ProcessingDialog.ui" line="680"/> <location filename="../../gui/ProcessingDialog.ui" line="683"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished">Powrót</translation> <translation type="unfinished">Powrót</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="146"/> <location filename="../../src/Dialog_Processing.cpp" line="147"/>
<source>Show details for selected job</source> <source>Show details for selected job</source>
<translation type="unfinished">Pokaż szczegóły wybranego zadania</translation> <translation type="unfinished">Pokaż szczegóły wybranego zadania</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="147"/> <location filename="../../src/Dialog_Processing.cpp" line="148"/>
<source>Browse Output File Location</source> <source>Browse Output File Location</source>
<translation type="unfinished">Wybierz lokalizację dla plików wyjściowych</translation> <translation type="unfinished">Wybierz lokalizację dla plików wyjściowych</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="165"/> <location filename="../../src/Dialog_Processing.cpp" line="166"/>
<source>Encoding Files</source> <source>Encoding Files</source>
<translation type="unfinished">Kompresowanie plików</translation> <translation type="unfinished">Kompresowanie plików</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="165"/> <location filename="../../src/Dialog_Processing.cpp" line="166"/>
<source>Your files are being encoded, please be patient...</source> <source>Your files are being encoded, please be patient...</source>
<translation type="unfinished">Twoje pliki są właśnie kompresowane, prosze być cierpliwy...</translation> <translation type="unfinished">Twoje pliki są właśnie kompresowane, prosze być cierpliwy...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="319"/> <location filename="../../src/Dialog_Processing.cpp" line="320"/>
<source>Encoding files, please wait...</source> <source>Encoding files, please wait...</source>
<translation type="unfinished">Kompresowanie plików, prosze czekać...</translation> <translation type="unfinished">Kompresowanie plików, prosze czekać...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="363"/> <location filename="../../src/Dialog_Processing.cpp" line="364"/>
<source>Multi-threading enabled: Running %1 instances in parallel!</source> <source>Multi-threading enabled: Running %1 instances in parallel!</source>
<translation type="unfinished">Wielowątkowosć włączona: Równolegle wykonywanych jest %1 kodowań!</translation> <translation type="unfinished">Wielowątkowosć włączona: Równolegle wykonywanych jest %1 kodowań!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="377"/> <location filename="../../src/Dialog_Processing.cpp" line="378"/>
<source>Aborted! Waiting for running jobs to terminate...</source> <source>Aborted! Waiting for running jobs to terminate...</source>
<translation type="unfinished">Przerwano! Czekanie na wyłączenie procesu...</translation> <translation type="unfinished">Przerwano! Czekanie na wyłączenie procesu...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="392"/> <location filename="../../src/Dialog_Processing.cpp" line="393"/>
<source>Encoding: %1 files of %2 completed so far, please wait...</source> <source>Encoding: %1 files of %2 completed so far, please wait...</source>
<translation type="unfinished">Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików...</translation> <translation type="unfinished">Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="420"/> <location filename="../../src/Dialog_Processing.cpp" line="421"/>
<source>Creating the playlist file, please wait...</source> <source>Creating the playlist file, please wait...</source>
<translation type="unfinished">Tworzenie pliku playlisty, prosze czekać...</translation> <translation type="unfinished">Tworzenie pliku playlisty, prosze czekać...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="430"/> <location filename="../../src/Dialog_Processing.cpp" line="431"/>
<source>Process was aborted by the user after %1 file(s)!</source> <source>Process was aborted by the user after %1 file(s)!</source>
<translation type="unfinished">Proces został przerwany przez użytkownika po wykonaniu %1 plików!</translation> <translation type="unfinished">Proces został przerwany przez użytkownika po wykonaniu %1 plików!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="430"/> <location filename="../../src/Dialog_Processing.cpp" line="431"/>
<source>Process was aborted prematurely by the user!</source> <source>Process was aborted prematurely by the user!</source>
<translation type="unfinished">Proces został przedwcześnie zakończony przez użytkownika!</translation> <translation type="unfinished">Proces został przedwcześnie zakończony przez użytkownika!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="431"/> <location filename="../../src/Dialog_Processing.cpp" line="432"/>
<source>LameXP - Aborted</source> <source>LameXP - Aborted</source>
<translation type="unfinished">LameXP - Przerwano</translation> <translation type="unfinished">LameXP - Przerwano</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="431"/> <location filename="../../src/Dialog_Processing.cpp" line="432"/>
<source>Process was aborted by the user.</source> <source>Process was aborted by the user.</source>
<translation type="unfinished">Proces został przerwany przez użytkownika.</translation> <translation type="unfinished">Proces został przerwany przez użytkownika.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="443"/> <location filename="../../src/Dialog_Processing.cpp" line="444"/>
<source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source> <source>Error: %1 of %2 files failed. Double-click failed items for detailed information!</source>
<translation type="unfinished">Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły!</translation> <translation type="unfinished">Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="444"/> <location filename="../../src/Dialog_Processing.cpp" line="445"/>
<source>LameXP - Error</source> <source>LameXP - Error</source>
<translation type="unfinished">LameXP - Błąd</translation> <translation type="unfinished">LameXP - Błąd</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="444"/> <location filename="../../src/Dialog_Processing.cpp" line="445"/>
<source>At least one file has failed!</source> <source>At least one file has failed!</source>
<translation type="unfinished">Przynajmniej jeden plik nie został skompresowany!</translation> <translation type="unfinished">Przynajmniej jeden plik nie został skompresowany!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="454"/>
<location filename="../../src/Dialog_Processing.cpp" line="455"/> <location filename="../../src/Dialog_Processing.cpp" line="455"/>
<location filename="../../src/Dialog_Processing.cpp" line="456"/>
<source>All files completed successfully.</source> <source>All files completed successfully.</source>
<translation type="unfinished">Kompresja wszystkich plików zakończona powodzeniem.</translation> <translation type="unfinished">Kompresja wszystkich plików zakończona powodzeniem.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="455"/> <location filename="../../src/Dialog_Processing.cpp" line="456"/>
<source>LameXP - Done</source> <source>LameXP - Done</source>
<translation type="unfinished">LameXP - Zrobione</translation> <translation type="unfinished">LameXP - Zrobione</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="843"/> <location filename="../../src/Dialog_Processing.cpp" line="844"/>
<source>Playlist creation failed</source> <source>Playlist creation failed</source>
<translation type="unfinished">Tworzenie playlisty zakończone niepowodzeniem</translation> <translation type="unfinished">Tworzenie playlisty zakończone niepowodzeniem</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="843"/> <location filename="../../src/Dialog_Processing.cpp" line="844"/>
<source>The playlist file could not be created:</source> <source>The playlist file could not be created:</source>
<translation type="unfinished">Playlista nie mogła zostać utworzona:</translation> <translation type="unfinished">Playlista nie mogła zostać utworzona:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="910"/> <location filename="../../src/Dialog_Processing.cpp" line="914"/>
<source>Warning: Computer will shutdown in %1 seconds...</source> <source>Warning: Computer will shutdown in %1 seconds...</source>
<translation type="unfinished">Ostrzeżenie: Komputer zostanie zamknięty za %1 sekund/y...</translation> <translation type="unfinished">Ostrzeżenie: Komputer zostanie zamknięty za %1 sekund/y...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Processing.cpp" line="914"/> <location filename="../../src/Dialog_Processing.cpp" line="918"/>
<location filename="../../src/Dialog_Processing.cpp" line="915"/> <location filename="../../src/Dialog_Processing.cpp" line="919"/>
<source>Cancel Shutdown</source> <source>Cancel Shutdown</source>
<translation type="unfinished">Anuluj wyłączenie komputera</translation> <translation type="unfinished">Anuluj wyłączenie komputera</translation>
</message> </message>

7
gui/ProcessingDialog.ui
View File

@ -400,7 +400,7 @@
<string notr="true">0%</string> <string notr="true">0%</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -479,7 +479,7 @@
<string notr="true">0%</string> <string notr="true">0%</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -557,6 +557,9 @@
<property name="text"> <property name="text">
<string notr="true">0%</string> <string notr="true">0%</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

2
src/Config.h
View File

@ -29,7 +29,7 @@
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE RC #define VER_LAMEXP_TYPE RC
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 760 #define VER_LAMEXP_BUILD 760
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

4
src/Dialog_Processing.cpp
View File

@ -87,6 +87,7 @@
} }
#define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); } #define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); }
#define UPDATE_MIN_WIDTH(WIDGET) { if(WIDGET->width() > WIDGET->minimumWidth()) WIDGET->setMinimumWidth(WIDGET->width()); }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Constructor // Constructor
@ -880,12 +881,14 @@ void ProcessingDialog::cpuUsageHasChanged(const double val)
{ {
this->label_cpu->setText(QString().sprintf(" %d%%", qRound(val * 100.0))); this->label_cpu->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
UPDATE_MIN_WIDTH(label_cpu);
} }
void ProcessingDialog::ramUsageHasChanged(const double val) void ProcessingDialog::ramUsageHasChanged(const double val)
{ {
this->label_ram->setText(QString().sprintf(" %d%%", qRound(val * 100.0))); this->label_ram->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
UPDATE_MIN_WIDTH(label_ram);
} }
void ProcessingDialog::diskUsageHasChanged(const quint64 val) void ProcessingDialog::diskUsageHasChanged(const quint64 val)
@ -901,6 +904,7 @@ void ProcessingDialog::diskUsageHasChanged(const quint64 val)
} }
this->label_disk->setText(QString().sprintf(" %3.1f %s", space, postfixStr[postfix])); this->label_disk->setText(QString().sprintf(" %3.1f %s", space, postfixStr[postfix]));
UPDATE_MIN_WIDTH(label_disk);
} }
bool ProcessingDialog::shutdownComputer(void) bool ProcessingDialog::shutdownComputer(void)