diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat index eaa648b6..73fb893c 100644 --- a/etc/Deployment/_deploy.bat +++ b/etc/Deployment/_deploy.bat @@ -130,6 +130,7 @@ if "%LAMEXP_REDIST%"=="1" ( ) copy "%~dp0\..\..\ReadMe.txt" "%TMP_PATH%" copy "%~dp0\..\..\License.txt" "%TMP_PATH%" +copy "%~dp0\..\..\Copying.txt" "%TMP_PATH%" copy "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%" copy "%~dp0\..\..\doc\Manual.html" "%TMP_PATH%" diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 2b110d2a..f630db2e 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -510,6 +510,7 @@ Section "Uninstall" Delete /REBOOTOK "$INSTDIR\Translate.html" Delete /REBOOTOK "$INSTDIR\FAQ.html" Delete /REBOOTOK "$INSTDIR\Howto.html" + Delete /REBOOTOK "$INSTDIR\Copying.txt" Delete /REBOOTOK "$INSTDIR\License.txt" Delete /REBOOTOK "$INSTDIR\Contributors.txt" Delete /REBOOTOK "$INSTDIR\ReadMe.txt" diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index e2c2c6ef..8541b7a9 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -1542,7 +1542,7 @@ - + Access Denied @@ -1698,7 +1698,7 @@ - + Discard @@ -2100,140 +2100,140 @@ - - + + New Folder - + Enter the name of the new folder: - + Failed to create folder - + The new folder could not be created: - + Drive is read-only or insufficient access rights! - - - - + + + + Quality Level %1 - - - + + + Compression %1 - - - + + + Uncompressed - + Best Quality (Very Slow) - + High Quality (Recommended) - + Average Quality (Default) - + Low Quality (Fast) - + Poor Quality (Very Fast) - + File name without extension - + Track number with leading zero - + Track title - + Artist name - + Album name - + Year with (at least) four digits - + Comment - + Characters forbidden in file names: - + Rename Macros - + %1 Instance(s) - + Cannot write to the selected directory. Please choose another directory! - + Already Running - + LameXP is already running, please use the running instance! diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 4050160c..d18c885e 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -1542,7 +1542,7 @@ - + Access Denied Dostęp zablokowany @@ -1693,7 +1693,7 @@ - + Discard Zamknij @@ -2100,140 +2100,140 @@ Dodaj folder - - + + New Folder Nowy folder - + Enter the name of the new folder: Wprowadź nazwę nowego folderu: - + Failed to create folder Utworzenie folderu zakończone niepowodzeniem - + The new folder could not be created: Nowy folder nie mógł zostać stworzony: - + Drive is read-only or insufficient access rights! Dysk tylko do odczytu lub brak praw dostępu! - - - - + + + + Quality Level %1 Poziom jakości %1 - - - + + + Compression %1 Kompresja %1 - - - + + + Uncompressed Nieskompresowany - + Best Quality (Very Slow) Najlepsza jakość (Bardzo wolno) - + High Quality (Recommended) Wysoka jakość (Zalecane) - + Average Quality (Default) Średnia jakość (Domyślnie) - + Low Quality (Fast) Niska jakość (Szybko) - + Poor Quality (Very Fast) Najniższa jakość (Bardzo szybko) - + File name without extension Nazwa pliku bez rozszerzenia - + Track number with leading zero Numer ścieżki z zerem na początku - + Track title Nazwa ścieżki - + Artist name Nazwa Artysty - + Album name Nazwa Albumu - + Year with (at least) four digits Rok z (przynajmniej) czterema cyframi - + Comment Komentarz - + Characters forbidden in file names: Zabronione znaki w nazwach plików: - + Rename Macros Zmień nazwy makr - + %1 Instance(s) %1 wątek/ki - + Cannot write to the selected directory. Please choose another directory! Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację! - + Already Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego programu! diff --git a/src/Config.h b/src/Config.h index 80d61762..08a4ba06 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 10 -#define VER_LAMEXP_BUILD 812 +#define VER_LAMEXP_BUILD 813 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 5701755d..d20bd26c 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -1950,6 +1950,8 @@ void MainWindow::showDetailsButtonClicked(void) } LAMEXP_DELETE(metaInfoDialog); + QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); + sourceFilesScrollbarMoved(0); } /* diff --git a/src/Global.cpp b/src/Global.cpp index 758a2f60..543a0db2 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -781,7 +781,7 @@ bool lamexp_init_qt(int argc, char* argv[]) } //Check Qt version - qDebug("Using Qt v%s (%s), %s, built on %s", qVersion(), (qSharedBuild() ? "DLL" : "Static"), QLibraryInfo::buildKey().toLatin1().constData(), QLibraryInfo::buildDate().toString(Qt::ISODate).toLatin1().constData()); + qDebug("Using Qt v%s [%s], %s, %s", qVersion(), QLibraryInfo::buildDate().toString(Qt::ISODate).toLatin1().constData(), (qSharedBuild() ? "DLL" : "Static"), QLibraryInfo::buildKey().toLatin1().constData()); qDebug("Compiled with Qt v%s [%s], %s\n", QT_VERSION_STR, QT_PACKAGEDATE_STR, QT_BUILD_KEY); if(_stricmp(qVersion(), QT_VERSION_STR)) {