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

Some improvement of the previous commit.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-03-29 03:22:24 +02:00
parent 9b41e9c6a9
commit 78c73d6d6e
5 changed files with 97 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
etc/Translation/Blank.ts
View File

@ -1577,7 +1577,7 @@
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="514"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3361"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3382"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
@ -1742,7 +1742,7 @@
<location filename="../../src/Dialog_MainWindow.cpp" line="1151"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="1228"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="1753"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3304"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3325"/>
<source>Discard</source>
<translation type="unfinished"></translation>
</message>
@ -2258,139 +2258,139 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>QAAC (Apple)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>FHG AAC (Winamp)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>Nero AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>Not available!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2821"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2842"/>
<source>Current AAC Encoder: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2927"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2930"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2933"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2939"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2948"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2951"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2954"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2960"/>
<source>Quality Level %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2936"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2956"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2976"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2957"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2977"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2997"/>
<source>Compression %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2942"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2962"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2985"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2963"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2983"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3006"/>
<source>Uncompressed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3009"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3030"/>
<source>Best Quality (Very Slow)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3012"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3033"/>
<source>High Quality (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3015"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3036"/>
<source>Average Quality (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3018"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3039"/>
<source>Low Quality (Fast)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3021"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3042"/>
<source>Poor Quality (Very Fast)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3293"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3314"/>
<source>File name without extension</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3294"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3315"/>
<source>Track number with leading zero</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3295"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3316"/>
<source>Track title</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3296"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3317"/>
<source>Artist name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3297"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3318"/>
<source>Album name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3298"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3319"/>
<source>Year with (at least) four digits</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3299"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3320"/>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3301"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3322"/>
<source>Characters forbidden in file names:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3304"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3325"/>
<source>Rename Macros</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3317"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3338"/>
<source>%1 Instance(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3361"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3382"/>
<source>Cannot write to the selected directory. Please choose another directory!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3429"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3450"/>
<source>Already Running</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3429"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3450"/>
<source>LameXP is already running, please use the running instance!</source>
<translation type="unfinished"></translation>
</message>

70
etc/Translation/LameXP_PL.ts
View File

@ -1577,7 +1577,7 @@
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="514"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3361"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3382"/>
<source>Access Denied</source>
<translation type="unfinished">Dostęp zablokowany</translation>
</message>
@ -1727,7 +1727,7 @@
<location filename="../../src/Dialog_MainWindow.cpp" line="1151"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="1228"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="1753"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3304"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3325"/>
<source>Discard</source>
<translation type="unfinished">Zamknij</translation>
</message>
@ -2258,139 +2258,139 @@
<translation type="unfinished">Dysk tylko do odczytu lub brak praw dostępu!</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>QAAC (Apple)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>FHG AAC (Winamp)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>Nero AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2819"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2840"/>
<source>Not available!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2821"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2842"/>
<source>Current AAC Encoder: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2927"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2930"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2933"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2939"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2948"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2951"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2954"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2960"/>
<source>Quality Level %1</source>
<translation type="unfinished">Poziom jakości %1</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2936"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2956"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2976"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2957"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2977"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2997"/>
<source>Compression %1</source>
<translation type="unfinished">Kompresja %1</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="2942"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2962"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2985"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2963"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="2983"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3006"/>
<source>Uncompressed</source>
<translation type="unfinished">Nieskompresowany</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3009"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3030"/>
<source>Best Quality (Very Slow)</source>
<translation type="unfinished">Najlepsza jakość (Bardzo wolno)</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3012"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3033"/>
<source>High Quality (Recommended)</source>
<translation type="unfinished">Wysoka jakość (Zalecane)</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3015"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3036"/>
<source>Average Quality (Default)</source>
<translation type="unfinished">Średnia jakość (Domyślnie)</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3018"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3039"/>
<source>Low Quality (Fast)</source>
<translation type="unfinished">Niska jakość (Szybko)</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3021"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3042"/>
<source>Poor Quality (Very Fast)</source>
<translation type="unfinished">Najniższa jakość (Bardzo szybko)</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3293"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3314"/>
<source>File name without extension</source>
<translation type="unfinished">Nazwa pliku bez rozszerzenia</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3294"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3315"/>
<source>Track number with leading zero</source>
<translation type="unfinished">Numer ścieżki z zerem na początku</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3295"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3316"/>
<source>Track title</source>
<translation type="unfinished">Nazwa ścieżki</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3296"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3317"/>
<source>Artist name</source>
<translation type="unfinished">Nazwa Artysty</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3297"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3318"/>
<source>Album name</source>
<translation type="unfinished">Nazwa Albumu</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3298"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3319"/>
<source>Year with (at least) four digits</source>
<translation type="unfinished">Rok z (przynajmniej) czterema cyframi</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3299"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3320"/>
<source>Comment</source>
<translation type="unfinished">Komentarz</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3301"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3322"/>
<source>Characters forbidden in file names:</source>
<translation type="unfinished">Zabronione znaki w nazwach plików:</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3304"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3325"/>
<source>Rename Macros</source>
<translation type="unfinished">Zmień nazwy makr</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3317"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3338"/>
<source>%1 Instance(s)</source>
<translation type="unfinished">%1 wątek/ki</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3361"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3382"/>
<source>Cannot write to the selected directory. Please choose another directory!</source>
<translation type="unfinished">Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3429"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3450"/>
<source>Already Running</source>
<translation type="unfinished">Już działa</translation>
</message>
<message>
<location filename="../../src/Dialog_MainWindow.cpp" line="3429"/>
<location filename="../../src/Dialog_MainWindow.cpp" line="3450"/>
<source>LameXP is already running, please use the running instance!</source>
<translation type="unfinished">LameXP już działa, przejdź do działającego programu!</translation>
</message>

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 9
#define VER_LAMEXP_BUILD 929
#define VER_LAMEXP_BUILD 930
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

27
src/Dialog_MainWindow.cpp
View File

@ -147,7 +147,6 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
connect(m_findFileContextAction, SIGNAL(triggered(bool)), this, SLOT(findFileContextActionTriggered()));
connect(m_exportCsvContextAction, SIGNAL(triggered(bool)), this, SLOT(exportCsvContextActionTriggered()));
connect(m_importCsvContextAction, SIGNAL(triggered(bool)), this, SLOT(importCsvContextActionTriggered()));
//Setup "Output" tab
m_fileSystemModel = new QFileSystemModelEx();
@ -179,6 +178,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
connect(prependRelativePathCheckBox, SIGNAL(clicked()), this, SLOT(prependRelativePathChanged()));
connect(outputFolderEdit, SIGNAL(editingFinished()), this, SLOT(outputFolderEditFinished()));
connect(m_fileSystemModel, SIGNAL(directoryLoaded(QString)), this, SLOT(outputFolderDirectoryLoaded(QString)));
connect(m_fileSystemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(outputFolderRowsInserted(QModelIndex,int,int)));
m_outputFolderContextMenu = new QMenu();
m_showFolderContextAction = m_outputFolderContextMenu->addAction(QIcon(":/icons/zoom.png"), "N/A");
m_outputFolderFavoritesMenu = new QMenu();
@ -2670,12 +2670,23 @@ void MainWindow::initOutputFolderModel(void)
* Center current folder in view
*/
void MainWindow::centerOutputFolderModel(void)
{
if(outputFolderView->isVisible())
{
centerOutputFolderModelAsync();
QTimer::singleShot(125, this, SLOT(centerOutputFolderModelAsync()));
}
}
/*
* Center current folder in view (do NOT call this one directly!)
*/
void MainWindow::centerOutputFolderModelAsync(void)
{
if(outputFolderView->isVisible())
{
m_outputFolderViewCentering = true;
const QModelIndex index = outputFolderView->currentIndex();
QApplication::processEvents();
outputFolderView->scrollTo(index, QAbstractItemView::PositionAtCenter);
outputFolderView->setFocus();
}
@ -2686,7 +2697,17 @@ void MainWindow::centerOutputFolderModel(void)
*/
void MainWindow::outputFolderDirectoryLoaded(const QString &path)
{
//We need to center again, because the focus on the current item gets lost when a dir is loaded asynchronously!
if(m_outputFolderViewCentering)
{
QTimer::singleShot(125, this, SLOT(centerOutputFolderModel()));
}
}
/*
* File system model inserted new items
*/
void MainWindow::outputFolderRowsInserted(const QModelIndex &parent, int start, int end)
{
if(m_outputFolderViewCentering)
{
QTimer::singleShot(125, this, SLOT(centerOutputFolderModel()));

2
src/Dialog_MainWindow.h
View File

@ -63,6 +63,7 @@ private slots:
void bitrateManagementMinChanged(int value);
void browseCustomTempFolderButtonClicked(void);
void centerOutputFolderModel(void);
void centerOutputFolderModelAsync(void);
void channelModeChanged(int value);
void checkForBetaUpdatesActionTriggered(bool checked);
void checkUpdatesActionActivated(void);
@ -108,6 +109,7 @@ private slots:
void outputFolderDirectoryLoaded(const QString &path);
void outputFolderEditFinished(void);
void outputFolderItemExpanded(const QModelIndex &item);
void outputFolderRowsInserted(const QModelIndex &parent, int start, int end);
void outputFolderViewClicked(const QModelIndex &index);
void outputFolderViewMoved(const QModelIndex &index);
void playlistEnabledChanged(void);