OSDN Git Service

Moved more functions into MUtils library, especially all the Qt initialization code...
[lamexp/LameXP.git] / src / Dialog_MainWindow.cpp
index 290a538..d687204 100644 (file)
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 #include "Dialog_MainWindow.h"
 
+//UIC includes
+#include "UIC_MainWindow.h"
+
 //LameXP includes
 #include "Global.h"
-#include "Resource.h"
 #include "Dialog_WorkingBanner.h"
 #include "Dialog_MetaInfo.h"
 #include "Dialog_About.h"
 #include "Dialog_CueImport.h"
 #include "Dialog_LogView.h"
 #include "Thread_FileAnalyzer.h"
-#include "Thread_FileAnalyzer_ST.h"
 #include "Thread_MessageHandler.h"
 #include "Model_MetaInfo.h"
 #include "Model_Settings.h"
 #include "Model_FileList.h"
 #include "Model_FileSystem.h"
 #include "WinSevenTaskbar.h"
+#include "Registry_Encoder.h"
 #include "Registry_Decoder.h"
+#include "Encoder_Abstract.h"
 #include "ShellIntegration.h"
 #include "CustomEventFilter.h"
 
+//Mutils includes
+#include <MUtils/Global.h>
+#include <MUtils/OSSupport.h>
+#include <MUtils/GUI.h>
+#include <MUtils/Version.h>
+
 //Qt includes
 #include <QMessageBox>
 #include <QTimer>
 #include <QResource>
 #include <QScrollBar>
 
-//System includes
-#include <MMSystem.h>
-#include <ShellAPI.h>
-
 ////////////////////////////////////////////////////////////
 // Helper macros
 ////////////////////////////////////////////////////////////
 
+#define BANNER_VISIBLE ((m_banner != NULL) && m_banner->isVisible())
+
+#define INIT_BANNER() do \
+{ \
+       if(m_banner == NULL) \
+       { \
+               m_banner = new WorkingBanner(this); \
+       } \
+} \
+while(0)
+
+#define SHOW_BANNER(TXT) do \
+{ \
+       INIT_BANNER(); \
+       m_banner->show((TXT)); \
+} \
+while(0)
+
+#define SHOW_BANNER_ARG(TXT, ARG) do \
+{ \
+       INIT_BANNER(); \
+       m_banner->show((TXT), (ARG)); \
+} \
+while(0)
+
+
+#define SHOW_BANNER_CONDITIONALLY(FLAG, TEST, TXT) do \
+{ \
+       if((!(FLAG)) && ((TEST))) \
+       { \
+               INIT_BANNER(); \
+               m_banner->show((TXT)); \
+               FLAG = true; \
+       } \
+} \
+while(0)
+
 #define ABORT_IF_BUSY do \
 { \
-       if(m_banner->isVisible() || m_delayedFileTimer->isActive()) \
+       if(BANNER_VISIBLE || m_delayedFileTimer->isActive() || (QApplication::activeModalWidget() != NULL)) \
        { \
-               MessageBeep(MB_ICONEXCLAMATION); \
+               lamexp_beep(lamexp_beep_warning); \
                return; \
        } \
 } \
@@ -116,7 +159,7 @@ while(0)
 { \
        QItemSelectionModel *_tmp = (VIEW)->selectionModel(); \
        (VIEW)->setModel(MODEL); \
-       LAMEXP_DELETE(_tmp); \
+       MUTILS_DELETE(_tmp); \
 } \
 while(0)
 
@@ -139,65 +182,106 @@ while(0)
 } \
 while(0)
 
+#define MAKE_TRANSPARENT(WIDGET, FLAG) do \
+{ \
+       QPalette _p = (WIDGET)->palette(); \
+       _p.setColor(QPalette::Background, Qt::transparent); \
+       (WIDGET)->setPalette(FLAG ? _p : QPalette()); \
+} \
+while(0)
+
+#define WITH_BLOCKED_SIGNALS(WIDGET, CMD, ...) do \
+{ \
+       const bool _flag = (WIDGET)->blockSignals(true); \
+       (WIDGET)->CMD(__VA_ARGS__); \
+       if(!(_flag)) { (WIDGET)->blockSignals(false); } \
+} \
+while(0)
+
+#define PLAY_SOUND_OPTIONAL(NAME, ASYNC) do \
+{ \
+       if(m_settings->soundsEnabled()) lamexp_play_sound((NAME), (ASYNC)); \
+} \
+while(0)
+
+#define SHOW_CORNER_WIDGET(FLAG) do \
+{ \
+       if(QWidget *cornerWidget = ui->menubar->cornerWidget()) \
+       { \
+               cornerWidget->setVisible((FLAG)); \
+       } \
+} \
+while(0)
+
 #define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "&minus;"))
 #define FSLINK(PATH) QString("<a href=\"file:///%1\">%2</a>").arg(PATH).arg(QString(PATH).replace("-", "&minus;"))
-#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP))
 #define CENTER_CURRENT_OUTPUT_FOLDER_DELAYED QTimer::singleShot(125, this, SLOT(centerOutputFolderModel()))
 
-static const DWORD IDM_ABOUTBOX = 0xEFF0;
+static const unsigned int IDM_ABOUTBOX = 0xEFF0;
+static const char *g_hydrogen_audio_url = "http://wiki.hydrogenaud.io/index.php?title=Main_Page";
 
 ////////////////////////////////////////////////////////////
 // Constructor
 ////////////////////////////////////////////////////////////
 
-MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, SettingsModel *settingsModel, QWidget *parent)
+MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *metaInfo, SettingsModel *settingsModel, QWidget *parent)
 :
        QMainWindow(parent),
+       ui(new Ui::MainWindow),
        m_fileListModel(fileListModel),
        m_metaData(metaInfo),
        m_settings(settingsModel),
+       m_windowIcon(NULL),
        m_fileSystemModel(NULL),
-       m_neroEncoderAvailable(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe")),
-       m_fhgEncoderAvailable(lamexp_check_tool("fhgaacenc.exe") && lamexp_check_tool("enc_fhgaac.dll") && lamexp_check_tool("nsutil.dll") && lamexp_check_tool("libmp4v2.dll")),
-       m_qaacEncoderAvailable(lamexp_check_tool("qaac.exe") && lamexp_check_tool("libsoxrate.dll")),
+       m_banner(NULL),
        m_accepted(false),
        m_firstTimeShown(true),
        m_outputFolderViewCentering(false),
        m_outputFolderViewInitCounter(0)
 {
        //Init the dialog, from the .ui file
-       setupUi(this);
+       ui->setupUi(this);
        setWindowFlags(windowFlags() ^ Qt::WindowMaximizeButtonHint);
-       
+
+       //Create window icon
+       m_windowIcon = lamexp_set_window_icon(this, lamexp_app_icon(), true);
+
        //Register meta types
        qRegisterMetaType<AudioFileModel>("AudioFileModel");
 
        //Enabled main buttons
-       connect(buttonAbout, SIGNAL(clicked()), this, SLOT(aboutButtonClicked()));
-       connect(buttonStart, SIGNAL(clicked()), this, SLOT(encodeButtonClicked()));
-       connect(buttonQuit, SIGNAL(clicked()), this, SLOT(closeButtonClicked()));
+       connect(ui->buttonAbout, SIGNAL(clicked()), this, SLOT(aboutButtonClicked()));
+       connect(ui->buttonStart, SIGNAL(clicked()), this, SLOT(encodeButtonClicked()));
+       connect(ui->buttonQuit,  SIGNAL(clicked()), this, SLOT(closeButtonClicked()));
 
        //Setup tab widget
-       tabWidget->setCurrentIndex(0);
-       connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabPageChanged(int)));
+       ui->tabWidget->setCurrentIndex(0);
+       connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabPageChanged(int)));
 
        //Add system menu
-       if(HMENU hMenu = ::GetSystemMenu(winId(), FALSE))
-       {
-               AppendMenuW(hMenu, MF_SEPARATOR, 0, 0);
-               AppendMenuW(hMenu, MF_STRING, IDM_ABOUTBOX, L"About...");
-       }
+       lamexp_append_sysmenu(this, IDM_ABOUTBOX, "About...");
+
+       //Setup corner widget
+       QLabel *cornerWidget = new QLabel(ui->menubar);
+       m_evenFilterCornerWidget = new CustomEventFilter;
+       cornerWidget->setText("N/A");
+       cornerWidget->setFixedHeight(ui->menubar->height());
+       cornerWidget->setCursor(QCursor(Qt::PointingHandCursor));
+       cornerWidget->hide();
+       cornerWidget->installEventFilter(m_evenFilterCornerWidget);
+       connect(m_evenFilterCornerWidget, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(cornerWidgetEventOccurred(QWidget*, QEvent*)));
+       ui->menubar->setCornerWidget(cornerWidget);
 
        //--------------------------------
        // Setup "Source" tab
        //--------------------------------
 
-       sourceFileView->setModel(m_fileListModel);
-       sourceFileView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       sourceFileView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       sourceFileView->setContextMenuPolicy(Qt::CustomContextMenu);
-       sourceFileView->viewport()->installEventFilter(this);
-       m_dropNoteLabel = new QLabel(sourceFileView);
+       ui->sourceFileView->setModel(m_fileListModel);
+       ui->sourceFileView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       ui->sourceFileView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       ui->sourceFileView->setContextMenuPolicy(Qt::CustomContextMenu);
+       ui->sourceFileView->viewport()->installEventFilter(this);
+       m_dropNoteLabel = new QLabel(ui->sourceFileView);
        m_dropNoteLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
        SET_FONT_BOLD(m_dropNoteLabel, true);
        SET_TEXT_COLOR(m_dropNoteLabel, Qt::darkGray);
@@ -209,68 +293,73 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        m_exportCsvContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/table_save.png"), "N/A");
        m_importCsvContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/folder_table.png"), "N/A");
        SET_FONT_BOLD(m_showDetailsContextAction, true);
-       connect(buttonAddFiles, SIGNAL(clicked()), this, SLOT(addFilesButtonClicked()));
-       connect(buttonRemoveFile, SIGNAL(clicked()), this, SLOT(removeFileButtonClicked()));
-       connect(buttonClearFiles, SIGNAL(clicked()), this, SLOT(clearFilesButtonClicked()));
-       connect(buttonFileUp, SIGNAL(clicked()), this, SLOT(fileUpButtonClicked()));
-       connect(buttonFileDown, SIGNAL(clicked()), this, SLOT(fileDownButtonClicked()));
-       connect(buttonShowDetails, SIGNAL(clicked()), this, SLOT(showDetailsButtonClicked()));
-       connect(m_fileListModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(sourceModelChanged()));
-       connect(m_fileListModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(sourceModelChanged()));
-       connect(m_fileListModel, SIGNAL(modelReset()), this, SLOT(sourceModelChanged()));
-       connect(sourceFileView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(sourceFilesContextMenu(QPoint)));
-       connect(sourceFileView->verticalScrollBar(), SIGNAL(sliderMoved(int)), this, SLOT(sourceFilesScrollbarMoved(int)));
-       connect(sourceFileView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(sourceFilesScrollbarMoved(int)));
-       connect(m_showDetailsContextAction, SIGNAL(triggered(bool)), this, SLOT(showDetailsButtonClicked()));
-       connect(m_previewContextAction, SIGNAL(triggered(bool)), this, SLOT(previewContextActionTriggered()));
-       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()));
+
+       connect(ui->buttonAddFiles,                      SIGNAL(clicked()),                          this, SLOT(addFilesButtonClicked()));
+       connect(ui->buttonRemoveFile,                    SIGNAL(clicked()),                          this, SLOT(removeFileButtonClicked()));
+       connect(ui->buttonClearFiles,                    SIGNAL(clicked()),                          this, SLOT(clearFilesButtonClicked()));
+       connect(ui->buttonFileUp,                        SIGNAL(clicked()),                          this, SLOT(fileUpButtonClicked()));
+       connect(ui->buttonFileDown,                      SIGNAL(clicked()),                          this, SLOT(fileDownButtonClicked()));
+       connect(ui->buttonShowDetails,                   SIGNAL(clicked()),                          this, SLOT(showDetailsButtonClicked()));
+       connect(m_fileListModel,                         SIGNAL(rowsInserted(QModelIndex,int,int)),  this, SLOT(sourceModelChanged()));
+       connect(m_fileListModel,                         SIGNAL(rowsRemoved(QModelIndex,int,int)),   this, SLOT(sourceModelChanged()));
+       connect(m_fileListModel,                         SIGNAL(modelReset()),                       this, SLOT(sourceModelChanged()));
+       connect(ui->sourceFileView,                      SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(sourceFilesContextMenu(QPoint)));
+       connect(ui->sourceFileView->verticalScrollBar(), SIGNAL(sliderMoved(int)),                   this, SLOT(sourceFilesScrollbarMoved(int)));
+       connect(ui->sourceFileView->verticalScrollBar(), SIGNAL(valueChanged(int)),                  this, SLOT(sourceFilesScrollbarMoved(int)));
+       connect(m_showDetailsContextAction,              SIGNAL(triggered(bool)),                    this, SLOT(showDetailsButtonClicked()));
+       connect(m_previewContextAction,                  SIGNAL(triggered(bool)),                    this, SLOT(previewContextActionTriggered()));
+       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
        //--------------------------------
 
-       outputFolderView->setHeaderHidden(true);
-       outputFolderView->setAnimated(false);
-       outputFolderView->setMouseTracking(false);
-       outputFolderView->setContextMenuPolicy(Qt::CustomContextMenu);
-       outputFolderView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+       ui->outputFolderView->setHeaderHidden(true);
+       ui->outputFolderView->setAnimated(false);
+       ui->outputFolderView->setMouseTracking(false);
+       ui->outputFolderView->setContextMenuPolicy(Qt::CustomContextMenu);
+       ui->outputFolderView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
        m_evenFilterOutputFolderMouse = new CustomEventFilter;
-       outputFoldersEditorLabel->installEventFilter(m_evenFilterOutputFolderMouse);
-       outputFoldersFovoritesLabel->installEventFilter(m_evenFilterOutputFolderMouse);
-       outputFolderLabel->installEventFilter(m_evenFilterOutputFolderMouse);
+       ui->outputFoldersGoUpLabel->installEventFilter(m_evenFilterOutputFolderMouse);
+       ui->outputFoldersEditorLabel->installEventFilter(m_evenFilterOutputFolderMouse);
+       ui->outputFoldersFovoritesLabel->installEventFilter(m_evenFilterOutputFolderMouse);
+       ui->outputFolderLabel->installEventFilter(m_evenFilterOutputFolderMouse);
 
        m_evenFilterOutputFolderView = new CustomEventFilter;
-       outputFolderView->installEventFilter(m_evenFilterOutputFolderView);
+       ui->outputFolderView->installEventFilter(m_evenFilterOutputFolderView);
 
-       SET_CHECKBOX_STATE(saveToSourceFolderCheckBox, m_settings->outputToSourceDir());
-       prependRelativePathCheckBox->setChecked(m_settings->prependRelativeSourcePath());
+       SET_CHECKBOX_STATE(ui->saveToSourceFolderCheckBox, m_settings->outputToSourceDir());
+       ui->prependRelativePathCheckBox->setChecked(m_settings->prependRelativeSourcePath());
        
-       connect(outputFolderView, SIGNAL(clicked(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
-       connect(outputFolderView, SIGNAL(activated(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
-       connect(outputFolderView, SIGNAL(pressed(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
-       connect(outputFolderView, SIGNAL(entered(QModelIndex)), this, SLOT(outputFolderViewMoved(QModelIndex)));
-       connect(outputFolderView, SIGNAL(expanded(QModelIndex)), this, SLOT(outputFolderItemExpanded(QModelIndex)));
-       connect(buttonMakeFolder, SIGNAL(clicked()), this, SLOT(makeFolderButtonClicked()));
-       connect(buttonGotoHome, SIGNAL(clicked()), SLOT(gotoHomeFolderButtonClicked()));
-       connect(buttonGotoDesktop, SIGNAL(clicked()), this, SLOT(gotoDesktopButtonClicked()));
-       connect(buttonGotoMusic, SIGNAL(clicked()), this, SLOT(gotoMusicFolderButtonClicked()));
-       connect(saveToSourceFolderCheckBox, SIGNAL(clicked()), this, SLOT(saveToSourceFolderChanged()));
-       connect(prependRelativePathCheckBox, SIGNAL(clicked()), this, SLOT(prependRelativePathChanged()));
-       connect(outputFolderEdit, SIGNAL(editingFinished()), this, SLOT(outputFolderEditFinished()));
+       connect(ui->outputFolderView, SIGNAL(clicked(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
+       connect(ui->outputFolderView, SIGNAL(activated(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
+       connect(ui->outputFolderView, SIGNAL(pressed(QModelIndex)), this, SLOT(outputFolderViewClicked(QModelIndex)));
+       connect(ui->outputFolderView, SIGNAL(entered(QModelIndex)), this, SLOT(outputFolderViewMoved(QModelIndex)));
+       connect(ui->outputFolderView, SIGNAL(expanded(QModelIndex)), this, SLOT(outputFolderItemExpanded(QModelIndex)));
+       connect(ui->buttonMakeFolder, SIGNAL(clicked()), this, SLOT(makeFolderButtonClicked()));
+       connect(ui->buttonGotoHome, SIGNAL(clicked()), SLOT(gotoHomeFolderButtonClicked()));
+       connect(ui->buttonGotoDesktop, SIGNAL(clicked()), this, SLOT(gotoDesktopButtonClicked()));
+       connect(ui->buttonGotoMusic, SIGNAL(clicked()), this, SLOT(gotoMusicFolderButtonClicked()));
+       connect(ui->saveToSourceFolderCheckBox, SIGNAL(clicked()), this, SLOT(saveToSourceFolderChanged()));
+       connect(ui->prependRelativePathCheckBox, SIGNAL(clicked()), this, SLOT(prependRelativePathChanged()));
+       connect(ui->outputFolderEdit, SIGNAL(editingFinished()), this, SLOT(outputFolderEditFinished()));
        connect(m_evenFilterOutputFolderMouse, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(outputFolderMouseEventOccurred(QWidget*, QEvent*)));
        connect(m_evenFilterOutputFolderView, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(outputFolderViewEventOccurred(QWidget*, QEvent*)));
 
        if(m_outputFolderContextMenu = new QMenu())
        {
                m_showFolderContextAction = m_outputFolderContextMenu->addAction(QIcon(":/icons/zoom.png"), "N/A");
+               m_goUpFolderContextAction = m_outputFolderContextMenu->addAction(QIcon(":/icons/folder_up.png"), "N/A");
+               m_outputFolderContextMenu->addSeparator();
                m_refreshFolderContextAction = m_outputFolderContextMenu->addAction(QIcon(":/icons/arrow_refresh.png"), "N/A");
                m_outputFolderContextMenu->setDefaultAction(m_showFolderContextAction);
-               connect(outputFolderView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(outputFolderContextMenu(QPoint)));
+               connect(ui->outputFolderView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(outputFolderContextMenu(QPoint)));
                connect(m_showFolderContextAction, SIGNAL(triggered(bool)), this, SLOT(showFolderContextActionTriggered()));
                connect(m_refreshFolderContextAction, SIGNAL(triggered(bool)), this, SLOT(refreshFolderContextActionTriggered()));
+               connect(m_goUpFolderContextAction, SIGNAL(triggered(bool)), this, SLOT(goUpFolderContextActionTriggered()));
        }
 
        if(m_outputFolderFavoritesMenu = new QMenu())
@@ -280,8 +369,8 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
                connect(m_addFavoriteFolderAction, SIGNAL(triggered(bool)), this, SLOT(addFavoriteFolderActionTriggered()));
        }
 
-       outputFolderEdit->setVisible(false);
-       if(m_outputFolderNoteBox = new QLabel(outputFolderView))
+       ui->outputFolderEdit->setVisible(false);
+       if(m_outputFolderNoteBox = new QLabel(ui->outputFolderView))
        {
                m_outputFolderNoteBox->setAutoFillBackground(true);
                m_outputFolderNoteBox->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -298,60 +387,61 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        // Setup "Meta Data" tab
        //--------------------------------
 
-       m_metaInfoModel = new MetaInfoModel(m_metaData, 6);
+       m_metaInfoModel = new MetaInfoModel(m_metaData);
        m_metaInfoModel->clearData();
        m_metaInfoModel->setData(m_metaInfoModel->index(4, 1), m_settings->metaInfoPosition());
-       metaDataView->setModel(m_metaInfoModel);
-       metaDataView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       metaDataView->verticalHeader()->hide();
-       metaDataView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       SET_CHECKBOX_STATE(writeMetaDataCheckBox, m_settings->writeMetaTags());
-       generatePlaylistCheckBox->setChecked(m_settings->createPlaylist());
-       connect(buttonEditMeta, SIGNAL(clicked()), this, SLOT(editMetaButtonClicked()));
-       connect(buttonClearMeta, SIGNAL(clicked()), this, SLOT(clearMetaButtonClicked()));
-       connect(writeMetaDataCheckBox, SIGNAL(clicked()), this, SLOT(metaTagsEnabledChanged()));
-       connect(generatePlaylistCheckBox, SIGNAL(clicked()), this, SLOT(playlistEnabledChanged()));
+       ui->metaDataView->setModel(m_metaInfoModel);
+       ui->metaDataView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       ui->metaDataView->verticalHeader()->hide();
+       ui->metaDataView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       SET_CHECKBOX_STATE(ui->writeMetaDataCheckBox, m_settings->writeMetaTags());
+       ui->generatePlaylistCheckBox->setChecked(m_settings->createPlaylist());
+       connect(ui->buttonEditMeta, SIGNAL(clicked()), this, SLOT(editMetaButtonClicked()));
+       connect(ui->buttonClearMeta, SIGNAL(clicked()), this, SLOT(clearMetaButtonClicked()));
+       connect(ui->writeMetaDataCheckBox, SIGNAL(clicked()), this, SLOT(metaTagsEnabledChanged()));
+       connect(ui->generatePlaylistCheckBox, SIGNAL(clicked()), this, SLOT(playlistEnabledChanged()));
 
        //--------------------------------
        //Setup "Compression" tab
        //--------------------------------
 
        m_encoderButtonGroup = new QButtonGroup(this);
-       m_encoderButtonGroup->addButton(radioButtonEncoderMP3, SettingsModel::MP3Encoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderVorbis, SettingsModel::VorbisEncoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderAAC, SettingsModel::AACEncoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderAC3, SettingsModel::AC3Encoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderFLAC, SettingsModel::FLACEncoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderOpus, SettingsModel::OpusEncoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderDCA, SettingsModel::DCAEncoder);
-       m_encoderButtonGroup->addButton(radioButtonEncoderPCM, SettingsModel::PCMEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderMP3, SettingsModel::MP3Encoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderVorbis, SettingsModel::VorbisEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderAAC, SettingsModel::AACEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderAC3, SettingsModel::AC3Encoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderFLAC, SettingsModel::FLACEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderAPE, SettingsModel::MACEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderOpus, SettingsModel::OpusEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderDCA, SettingsModel::DCAEncoder);
+       m_encoderButtonGroup->addButton(ui->radioButtonEncoderPCM, SettingsModel::PCMEncoder);
+
+       const int aacEncoder = EncoderRegistry::getAacEncoder();
+       ui->radioButtonEncoderAAC->setEnabled(aacEncoder > SettingsModel::AAC_ENCODER_NONE);
 
        m_modeButtonGroup = new QButtonGroup(this);
-       m_modeButtonGroup->addButton(radioButtonModeQuality, SettingsModel::VBRMode);
-       m_modeButtonGroup->addButton(radioButtonModeAverageBitrate, SettingsModel::ABRMode);
-       m_modeButtonGroup->addButton(radioButtonConstBitrate, SettingsModel::CBRMode);
-
-       radioButtonEncoderAAC->setEnabled(m_neroEncoderAvailable || m_fhgEncoderAvailable || m_qaacEncoderAvailable);
-       radioButtonEncoderMP3->setChecked(m_settings->compressionEncoder() == SettingsModel::MP3Encoder);
-       radioButtonEncoderVorbis->setChecked(m_settings->compressionEncoder() == SettingsModel::VorbisEncoder);
-       radioButtonEncoderAAC->setChecked((m_settings->compressionEncoder() == SettingsModel::AACEncoder) && (m_neroEncoderAvailable || m_fhgEncoderAvailable || m_qaacEncoderAvailable));
-       radioButtonEncoderAC3->setChecked(m_settings->compressionEncoder() == SettingsModel::AC3Encoder);
-       radioButtonEncoderFLAC->setChecked(m_settings->compressionEncoder() == SettingsModel::FLACEncoder);
-       radioButtonEncoderOpus->setChecked(m_settings->compressionEncoder() == SettingsModel::OpusEncoder);
-       radioButtonEncoderDCA->setChecked(m_settings->compressionEncoder() == SettingsModel::DCAEncoder);
-       radioButtonEncoderPCM->setChecked(m_settings->compressionEncoder() == SettingsModel::PCMEncoder);
-       radioButtonModeQuality->setChecked(m_settings->compressionRCMode() == SettingsModel::VBRMode);
-       radioButtonModeAverageBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::ABRMode);
-       radioButtonConstBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::CBRMode);
-       sliderBitrate->setValue(m_settings->compressionBitrate());
-       
+       m_modeButtonGroup->addButton(ui->radioButtonModeQuality, SettingsModel::VBRMode);
+       m_modeButtonGroup->addButton(ui->radioButtonModeAverageBitrate, SettingsModel::ABRMode);
+       m_modeButtonGroup->addButton(ui->radioButtonConstBitrate, SettingsModel::CBRMode);
+
+       ui->radioButtonEncoderMP3->setChecked(true);
+       foreach(QAbstractButton *currentButton, m_encoderButtonGroup->buttons())
+       {
+               if(currentButton->isEnabled() && (m_encoderButtonGroup->id(currentButton) == m_settings->compressionEncoder()))
+               {
+                       currentButton->setChecked(true);
+                       break;
+               }
+       }
+
        m_evenFilterCompressionTab = new CustomEventFilter();
-       labelCompressionHelp->installEventFilter(m_evenFilterCompressionTab);
+       ui->labelCompressionHelp->installEventFilter(m_evenFilterCompressionTab);
+       ui->labelResetEncoders ->installEventFilter(m_evenFilterCompressionTab);
 
        connect(m_encoderButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(updateEncoder(int)));
        connect(m_modeButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(updateRCMode(int)));
        connect(m_evenFilterCompressionTab, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(compressionTabEventOccurred(QWidget*, QEvent*)));
-       connect(sliderBitrate, SIGNAL(valueChanged(int)), this, SLOT(updateBitrate(int)));
+       connect(ui->sliderBitrate, SIGNAL(valueChanged(int)), this, SLOT(updateBitrate(int)));
 
        updateEncoder(m_encoderButtonGroup->checkedId());
 
@@ -359,102 +449,100 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        //Setup "Advanced Options" tab
        //--------------------------------
 
-       sliderLameAlgoQuality->setValue(m_settings->lameAlgoQuality());
-       if(m_settings->maximumInstances() > 0) sliderMaxInstances->setValue(m_settings->maximumInstances());
+       ui->sliderLameAlgoQuality->setValue(m_settings->lameAlgoQuality());
+       if(m_settings->maximumInstances() > 0) ui->sliderMaxInstances->setValue(m_settings->maximumInstances());
 
-       spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRate());
-       spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRate());
-       spinBoxNormalizationFilter->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolume()) / 100.0);
-       spinBoxToneAdjustBass->setValue(static_cast<double>(m_settings->toneAdjustBass()) / 100.0);
-       spinBoxToneAdjustTreble->setValue(static_cast<double>(m_settings->toneAdjustTreble()) / 100.0);
-       spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSize());
-       spinBoxOpusComplexity->setValue(m_settings->opusComplexity());
+       ui->spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRate());
+       ui->spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRate());
+       ui->spinBoxNormalizationFilter->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolume()) / 100.0);
+       ui->spinBoxToneAdjustBass->setValue(static_cast<double>(m_settings->toneAdjustBass()) / 100.0);
+       ui->spinBoxToneAdjustTreble->setValue(static_cast<double>(m_settings->toneAdjustTreble()) / 100.0);
+       ui->spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSize());
+       ui->spinBoxOpusComplexity->setValue(m_settings->opusComplexity());
        
-       comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelMode());
-       comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRate());
-       comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfile());
-       comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingMode());
-       comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompression());
-       comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationMode());
-       comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeFor());
-       comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesize());
+       ui->comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelMode());
+       ui->comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRate());
+       ui->comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfile());
+       ui->comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingMode());
+       ui->comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompression());
+       ui->comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEQMode());
+       ui->comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesize());
        
-       SET_CHECKBOX_STATE(checkBoxBitrateManagement, m_settings->bitrateManagementEnabled());
-       SET_CHECKBOX_STATE(checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2Pass());
-       SET_CHECKBOX_STATE(checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocation());
-       SET_CHECKBOX_STATE(checkBoxNormalizationFilter, m_settings->normalizationFilterEnabled());
-       SET_CHECKBOX_STATE(checkBoxAutoDetectInstances, (m_settings->maximumInstances() < 1));
-       SET_CHECKBOX_STATE(checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabled());
-       SET_CHECKBOX_STATE(checkBoxRenameOutput, m_settings->renameOutputFilesEnabled());
-       SET_CHECKBOX_STATE(checkBoxForceStereoDownmix, m_settings->forceStereoDownmix());
-       SET_CHECKBOX_STATE(checkBoxOpusExpAnalysis, m_settings->opusExpAnalysis());
-       checkBoxNeroAAC2PassMode->setEnabled(!(m_fhgEncoderAvailable || m_qaacEncoderAvailable));
+       SET_CHECKBOX_STATE(ui->checkBoxBitrateManagement, m_settings->bitrateManagementEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2Pass());
+       SET_CHECKBOX_STATE(ui->checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocation());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilter, m_settings->normalizationFilterEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxAutoDetectInstances, (m_settings->maximumInstances() < 1));
+       SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxRenameOutput, m_settings->renameOutputFilesEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxForceStereoDownmix, m_settings->forceStereoDownmix());
+       SET_CHECKBOX_STATE(ui->checkBoxOpusDisableResample, m_settings->opusDisableResample());
+       ui->checkBoxNeroAAC2PassMode->setEnabled(aacEncoder == SettingsModel::AAC_ENCODER_NERO);
        
-       lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
-       lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEnc());
-       lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEnc());
-       lineEditCustomParamFLAC->setText(m_settings->customParametersFLAC());
-       lineEditCustomParamAften->setText(m_settings->customParametersAften());
-       lineEditCustomParamOpus->setText(m_settings->customParametersOpus());
-       lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPath()));
-       lineEditRenamePattern->setText(m_settings->renameOutputFilesPattern());
+       ui->lineEditCustomParamLAME   ->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::MP3Encoder));
+       ui->lineEditCustomParamOggEnc ->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::VorbisEncoder));
+       ui->lineEditCustomParamNeroAAC->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::AACEncoder));
+       ui->lineEditCustomParamFLAC   ->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::FLACEncoder));
+       ui->lineEditCustomParamAften  ->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::AC3Encoder));
+       ui->lineEditCustomParamOpus   ->setText(EncoderRegistry::loadEncoderCustomParams(m_settings, SettingsModel::OpusEncoder));
+       ui->lineEditCustomTempFolder  ->setText(QDir::toNativeSeparators(m_settings->customTempPath()));
+       ui->lineEditRenamePattern     ->setText(m_settings->renameOutputFilesPattern());
        
        m_evenFilterCustumParamsHelp = new CustomEventFilter();
-       helpCustomParamLAME->installEventFilter(m_evenFilterCustumParamsHelp);
-       helpCustomParamOggEnc->installEventFilter(m_evenFilterCustumParamsHelp);
-       helpCustomParamNeroAAC->installEventFilter(m_evenFilterCustumParamsHelp);
-       helpCustomParamFLAC->installEventFilter(m_evenFilterCustumParamsHelp);
-       helpCustomParamAften->installEventFilter(m_evenFilterCustumParamsHelp);
-       helpCustomParamOpus->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamLAME->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamOggEnc->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamNeroAAC->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamFLAC->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamAften->installEventFilter(m_evenFilterCustumParamsHelp);
+       ui->helpCustomParamOpus->installEventFilter(m_evenFilterCustumParamsHelp);
        
        m_overwriteButtonGroup = new QButtonGroup(this);
-       m_overwriteButtonGroup->addButton(radioButtonOverwriteModeKeepBoth, SettingsModel::Overwrite_KeepBoth);
-       m_overwriteButtonGroup->addButton(radioButtonOverwriteModeSkipFile, SettingsModel::Overwrite_SkipFile);
-       m_overwriteButtonGroup->addButton(radioButtonOverwriteModeReplaces, SettingsModel::Overwrite_Replaces);
-
-       radioButtonOverwriteModeKeepBoth->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_KeepBoth);
-       radioButtonOverwriteModeSkipFile->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_SkipFile);
-       radioButtonOverwriteModeReplaces->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_Replaces);
-
-       connect(sliderLameAlgoQuality, SIGNAL(valueChanged(int)), this, SLOT(updateLameAlgoQuality(int)));
-       connect(checkBoxBitrateManagement, SIGNAL(clicked(bool)), this, SLOT(bitrateManagementEnabledChanged(bool)));
-       connect(spinBoxBitrateManagementMin, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMinChanged(int)));
-       connect(spinBoxBitrateManagementMax, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMaxChanged(int)));
-       connect(comboBoxMP3ChannelMode, SIGNAL(currentIndexChanged(int)), this, SLOT(channelModeChanged(int)));
-       connect(comboBoxSamplingRate, SIGNAL(currentIndexChanged(int)), this, SLOT(samplingRateChanged(int)));
-       connect(checkBoxNeroAAC2PassMode, SIGNAL(clicked(bool)), this, SLOT(neroAAC2PassChanged(bool)));
-       connect(comboBoxAACProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(neroAACProfileChanged(int)));
-       connect(checkBoxNormalizationFilter, SIGNAL(clicked(bool)), this, SLOT(normalizationEnabledChanged(bool)));
-       connect(comboBoxAftenCodingMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenCodingModeChanged(int)));
-       connect(comboBoxAftenDRCMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenDRCModeChanged(int)));
-       connect(spinBoxAftenSearchSize, SIGNAL(valueChanged(int)), this, SLOT(aftenSearchSizeChanged(int)));
-       connect(checkBoxAftenFastAllocation, SIGNAL(clicked(bool)), this, SLOT(aftenFastAllocationChanged(bool)));
-       connect(spinBoxNormalizationFilter, SIGNAL(valueChanged(double)), this, SLOT(normalizationMaxVolumeChanged(double)));
-       connect(comboBoxNormalizationMode, SIGNAL(currentIndexChanged(int)), this, SLOT(normalizationModeChanged(int)));
-       connect(spinBoxToneAdjustBass, SIGNAL(valueChanged(double)), this, SLOT(toneAdjustBassChanged(double)));
-       connect(spinBoxToneAdjustTreble, SIGNAL(valueChanged(double)), this, SLOT(toneAdjustTrebleChanged(double)));
-       connect(buttonToneAdjustReset, SIGNAL(clicked()), this, SLOT(toneAdjustTrebleReset()));
-       connect(lineEditCustomParamLAME, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(lineEditCustomParamOggEnc, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(lineEditCustomParamNeroAAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(lineEditCustomParamFLAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(lineEditCustomParamAften, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(lineEditCustomParamOpus, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
-       connect(sliderMaxInstances, SIGNAL(valueChanged(int)), this, SLOT(updateMaximumInstances(int)));
-       connect(checkBoxAutoDetectInstances, SIGNAL(clicked(bool)), this, SLOT(autoDetectInstancesChanged(bool)));
-       connect(buttonBrowseCustomTempFolder, SIGNAL(clicked()), this, SLOT(browseCustomTempFolderButtonClicked()));
-       connect(lineEditCustomTempFolder, SIGNAL(textChanged(QString)), this, SLOT(customTempFolderChanged(QString)));
-       connect(checkBoxUseSystemTempFolder, SIGNAL(clicked(bool)), this, SLOT(useCustomTempFolderChanged(bool)));
-       connect(buttonResetAdvancedOptions, SIGNAL(clicked()), this, SLOT(resetAdvancedOptionsButtonClicked()));
-       connect(checkBoxRenameOutput, SIGNAL(clicked(bool)), this, SLOT(renameOutputEnabledChanged(bool)));
-       connect(lineEditRenamePattern, SIGNAL(editingFinished()), this, SLOT(renameOutputPatternChanged()));
-       connect(lineEditRenamePattern, SIGNAL(textChanged(QString)), this, SLOT(renameOutputPatternChanged(QString)));
-       connect(labelShowRenameMacros, SIGNAL(linkActivated(QString)), this, SLOT(showRenameMacros(QString)));
-       connect(checkBoxForceStereoDownmix, SIGNAL(clicked(bool)), this, SLOT(forceStereoDownmixEnabledChanged(bool)));
-       connect(comboBoxOpusOptimize, SIGNAL(currentIndexChanged(int)), SLOT(opusSettingsChanged()));
-       connect(comboBoxOpusFramesize, SIGNAL(currentIndexChanged(int)), this, SLOT(opusSettingsChanged()));
-       connect(spinBoxOpusComplexity, SIGNAL(valueChanged(int)), this, SLOT(opusSettingsChanged()));
-       connect(checkBoxOpusExpAnalysis, SIGNAL(clicked(bool)), this, SLOT(opusSettingsChanged()));
+       m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeKeepBoth, SettingsModel::Overwrite_KeepBoth);
+       m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeSkipFile, SettingsModel::Overwrite_SkipFile);
+       m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeReplaces, SettingsModel::Overwrite_Replaces);
+
+       ui->radioButtonOverwriteModeKeepBoth->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_KeepBoth);
+       ui->radioButtonOverwriteModeSkipFile->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_SkipFile);
+       ui->radioButtonOverwriteModeReplaces->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_Replaces);
+
+       connect(ui->sliderLameAlgoQuality, SIGNAL(valueChanged(int)), this, SLOT(updateLameAlgoQuality(int)));
+       connect(ui->checkBoxBitrateManagement, SIGNAL(clicked(bool)), this, SLOT(bitrateManagementEnabledChanged(bool)));
+       connect(ui->spinBoxBitrateManagementMin, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMinChanged(int)));
+       connect(ui->spinBoxBitrateManagementMax, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMaxChanged(int)));
+       connect(ui->comboBoxMP3ChannelMode, SIGNAL(currentIndexChanged(int)), this, SLOT(channelModeChanged(int)));
+       connect(ui->comboBoxSamplingRate, SIGNAL(currentIndexChanged(int)), this, SLOT(samplingRateChanged(int)));
+       connect(ui->checkBoxNeroAAC2PassMode, SIGNAL(clicked(bool)), this, SLOT(neroAAC2PassChanged(bool)));
+       connect(ui->comboBoxAACProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(neroAACProfileChanged(int)));
+       connect(ui->checkBoxNormalizationFilter, SIGNAL(clicked(bool)), this, SLOT(normalizationEnabledChanged(bool)));
+       connect(ui->comboBoxAftenCodingMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenCodingModeChanged(int)));
+       connect(ui->comboBoxAftenDRCMode, SIGNAL(currentIndexChanged(int)), this, SLOT(aftenDRCModeChanged(int)));
+       connect(ui->spinBoxAftenSearchSize, SIGNAL(valueChanged(int)), this, SLOT(aftenSearchSizeChanged(int)));
+       connect(ui->checkBoxAftenFastAllocation, SIGNAL(clicked(bool)), this, SLOT(aftenFastAllocationChanged(bool)));
+       connect(ui->spinBoxNormalizationFilter, SIGNAL(valueChanged(double)), this, SLOT(normalizationMaxVolumeChanged(double)));
+       connect(ui->comboBoxNormalizationMode, SIGNAL(currentIndexChanged(int)), this, SLOT(normalizationModeChanged(int)));
+       connect(ui->spinBoxToneAdjustBass, SIGNAL(valueChanged(double)), this, SLOT(toneAdjustBassChanged(double)));
+       connect(ui->spinBoxToneAdjustTreble, SIGNAL(valueChanged(double)), this, SLOT(toneAdjustTrebleChanged(double)));
+       connect(ui->buttonToneAdjustReset, SIGNAL(clicked()), this, SLOT(toneAdjustTrebleReset()));
+       connect(ui->lineEditCustomParamLAME, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->lineEditCustomParamOggEnc, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->lineEditCustomParamNeroAAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->lineEditCustomParamFLAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->lineEditCustomParamAften, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->lineEditCustomParamOpus, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+       connect(ui->sliderMaxInstances, SIGNAL(valueChanged(int)), this, SLOT(updateMaximumInstances(int)));
+       connect(ui->checkBoxAutoDetectInstances, SIGNAL(clicked(bool)), this, SLOT(autoDetectInstancesChanged(bool)));
+       connect(ui->buttonBrowseCustomTempFolder, SIGNAL(clicked()), this, SLOT(browseCustomTempFolderButtonClicked()));
+       connect(ui->lineEditCustomTempFolder, SIGNAL(textChanged(QString)), this, SLOT(customTempFolderChanged(QString)));
+       connect(ui->checkBoxUseSystemTempFolder, SIGNAL(clicked(bool)), this, SLOT(useCustomTempFolderChanged(bool)));
+       connect(ui->buttonResetAdvancedOptions, SIGNAL(clicked()), this, SLOT(resetAdvancedOptionsButtonClicked()));
+       connect(ui->checkBoxRenameOutput, SIGNAL(clicked(bool)), this, SLOT(renameOutputEnabledChanged(bool)));
+       connect(ui->lineEditRenamePattern, SIGNAL(editingFinished()), this, SLOT(renameOutputPatternChanged()));
+       connect(ui->lineEditRenamePattern, SIGNAL(textChanged(QString)), this, SLOT(renameOutputPatternChanged(QString)));
+       connect(ui->labelShowRenameMacros, SIGNAL(linkActivated(QString)), this, SLOT(showRenameMacros(QString)));
+       connect(ui->checkBoxForceStereoDownmix, SIGNAL(clicked(bool)), this, SLOT(forceStereoDownmixEnabledChanged(bool)));
+       connect(ui->comboBoxOpusFramesize, SIGNAL(currentIndexChanged(int)), this, SLOT(opusSettingsChanged()));
+       connect(ui->spinBoxOpusComplexity, SIGNAL(valueChanged(int)), this, SLOT(opusSettingsChanged()));
+       connect(ui->checkBoxOpusDisableResample, SIGNAL(clicked(bool)), SLOT(opusSettingsChanged()));
        connect(m_overwriteButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(overwriteModeChanged(int)));
        connect(m_evenFilterCustumParamsHelp, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(customParamsHelpRequested(QWidget*, QEvent*)));
 
@@ -462,10 +550,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        // Force initial GUI update
        //--------------------------------
 
-       updateLameAlgoQuality(sliderLameAlgoQuality->value());
-       updateMaximumInstances(sliderMaxInstances->value());
-       toneAdjustTrebleChanged(spinBoxToneAdjustTreble->value());
-       toneAdjustBassChanged(spinBoxToneAdjustBass->value());
+       updateLameAlgoQuality(ui->sliderLameAlgoQuality->value());
+       updateMaximumInstances(ui->sliderMaxInstances->value());
+       toneAdjustTrebleChanged(ui->spinBoxToneAdjustTreble->value());
+       toneAdjustBassChanged(ui->spinBoxToneAdjustBass->value());
        customParamsChanged();
        
        //--------------------------------
@@ -473,41 +561,41 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        //--------------------------------
 
        //Activate file menu actions
-       actionOpenFolder->setData(QVariant::fromValue<bool>(false));
-       actionOpenFolderRecursively->setData(QVariant::fromValue<bool>(true));
-       connect(actionOpenFolder, SIGNAL(triggered()), this, SLOT(openFolderActionActivated()));
-       connect(actionOpenFolderRecursively, SIGNAL(triggered()), this, SLOT(openFolderActionActivated()));
+       ui->actionOpenFolder->setData(QVariant::fromValue<bool>(false));
+       ui->actionOpenFolderRecursively->setData(QVariant::fromValue<bool>(true));
+       connect(ui->actionOpenFolder, SIGNAL(triggered()), this, SLOT(openFolderActionActivated()));
+       connect(ui->actionOpenFolderRecursively, SIGNAL(triggered()), this, SLOT(openFolderActionActivated()));
 
        //Activate view menu actions
        m_tabActionGroup = new QActionGroup(this);
-       m_tabActionGroup->addAction(actionSourceFiles);
-       m_tabActionGroup->addAction(actionOutputDirectory);
-       m_tabActionGroup->addAction(actionCompression);
-       m_tabActionGroup->addAction(actionMetaData);
-       m_tabActionGroup->addAction(actionAdvancedOptions);
-       actionSourceFiles->setData(0);
-       actionOutputDirectory->setData(1);
-       actionMetaData->setData(2);
-       actionCompression->setData(3);
-       actionAdvancedOptions->setData(4);
-       actionSourceFiles->setChecked(true);
+       m_tabActionGroup->addAction(ui->actionSourceFiles);
+       m_tabActionGroup->addAction(ui->actionOutputDirectory);
+       m_tabActionGroup->addAction(ui->actionCompression);
+       m_tabActionGroup->addAction(ui->actionMetaData);
+       m_tabActionGroup->addAction(ui->actionAdvancedOptions);
+       ui->actionSourceFiles->setData(0);
+       ui->actionOutputDirectory->setData(1);
+       ui->actionMetaData->setData(2);
+       ui->actionCompression->setData(3);
+       ui->actionAdvancedOptions->setData(4);
+       ui->actionSourceFiles->setChecked(true);
        connect(m_tabActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(tabActionActivated(QAction*)));
 
        //Activate style menu actions
        m_styleActionGroup = new QActionGroup(this);
-       m_styleActionGroup->addAction(actionStylePlastique);
-       m_styleActionGroup->addAction(actionStyleCleanlooks);
-       m_styleActionGroup->addAction(actionStyleWindowsVista);
-       m_styleActionGroup->addAction(actionStyleWindowsXP);
-       m_styleActionGroup->addAction(actionStyleWindowsClassic);
-       actionStylePlastique->setData(0);
-       actionStyleCleanlooks->setData(1);
-       actionStyleWindowsVista->setData(2);
-       actionStyleWindowsXP->setData(3);
-       actionStyleWindowsClassic->setData(4);
-       actionStylePlastique->setChecked(true);
-       actionStyleWindowsXP->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_XP && lamexp_themes_enabled());
-       actionStyleWindowsVista->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_VISTA && lamexp_themes_enabled());
+       m_styleActionGroup->addAction(ui->actionStylePlastique);
+       m_styleActionGroup->addAction(ui->actionStyleCleanlooks);
+       m_styleActionGroup->addAction(ui->actionStyleWindowsVista);
+       m_styleActionGroup->addAction(ui->actionStyleWindowsXP);
+       m_styleActionGroup->addAction(ui->actionStyleWindowsClassic);
+       ui->actionStylePlastique->setData(0);
+       ui->actionStyleCleanlooks->setData(1);
+       ui->actionStyleWindowsVista->setData(2);
+       ui->actionStyleWindowsXP->setData(3);
+       ui->actionStyleWindowsClassic->setData(4);
+       ui->actionStylePlastique->setChecked(true);
+       ui->actionStyleWindowsXP->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_XP && lamexp_themes_enabled());
+       ui->actionStyleWindowsVista->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_VISTA && lamexp_themes_enabled());
        connect(m_styleActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(styleActionActivated(QAction*)));
        styleActionActivated(NULL);
 
@@ -524,46 +612,52 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
                currentLanguage->setCheckable(true);
                currentLanguage->setChecked(false);
                m_languageActionGroup->addAction(currentLanguage);
-               menuLanguage->insertAction(actionLoadTranslationFromFile, currentLanguage);
+               ui->menuLanguage->insertAction(ui->actionLoadTranslationFromFile, currentLanguage);
        }
-       menuLanguage->insertSeparator(actionLoadTranslationFromFile);
-       connect(actionLoadTranslationFromFile, SIGNAL(triggered(bool)), this, SLOT(languageFromFileActionActivated(bool)));
+       ui->menuLanguage->insertSeparator(ui->actionLoadTranslationFromFile);
+       connect(ui->actionLoadTranslationFromFile, SIGNAL(triggered(bool)), this, SLOT(languageFromFileActionActivated(bool)));
        connect(m_languageActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(languageActionActivated(QAction*)));
-       actionLoadTranslationFromFile->setChecked(false);
+       ui->actionLoadTranslationFromFile->setChecked(false);
 
        //Activate tools menu actions
-       actionDisableUpdateReminder->setChecked(!m_settings->autoUpdateEnabled());
-       actionDisableSounds->setChecked(!m_settings->soundsEnabled());
-       actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
-       actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
-       actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
-       actionDisableShellIntegration->setDisabled(lamexp_portable_mode() && actionDisableShellIntegration->isChecked());
-       actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta() || lamexp_version_demo());
-       actionCheckForBetaUpdates->setEnabled(!lamexp_version_demo());
-       actionHibernateComputer->setChecked(m_settings->hibernateComputer());
-       actionHibernateComputer->setEnabled(lamexp_is_hibernation_supported());
-       connect(actionDisableUpdateReminder, SIGNAL(triggered(bool)), this, SLOT(disableUpdateReminderActionTriggered(bool)));
-       connect(actionDisableSounds, SIGNAL(triggered(bool)), this, SLOT(disableSoundsActionTriggered(bool)));
-       connect(actionDisableNeroAacNotifications, SIGNAL(triggered(bool)), this, SLOT(disableNeroAacNotificationsActionTriggered(bool)));
-       connect(actionDisableSlowStartupNotifications, SIGNAL(triggered(bool)), this, SLOT(disableSlowStartupNotificationsActionTriggered(bool)));
-       connect(actionDisableShellIntegration, SIGNAL(triggered(bool)), this, SLOT(disableShellIntegrationActionTriggered(bool)));
-       connect(actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool)));
-       connect(actionHibernateComputer, SIGNAL(triggered(bool)), this, SLOT(hibernateComputerActionTriggered(bool)));
-       connect(actionCheckForBetaUpdates, SIGNAL(triggered(bool)), this, SLOT(checkForBetaUpdatesActionTriggered(bool)));
-       connect(actionImportCueSheet, SIGNAL(triggered(bool)), this, SLOT(importCueSheetActionTriggered(bool)));
+       ui->actionDisableUpdateReminder->setChecked(!m_settings->autoUpdateEnabled());
+       ui->actionDisableSounds->setChecked(!m_settings->soundsEnabled());
+       ui->actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
+       ui->actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
+       ui->actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
+       ui->actionDisableShellIntegration->setDisabled(lamexp_portable_mode() && ui->actionDisableShellIntegration->isChecked());
+       ui->actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta() || lamexp_version_demo());
+       ui->actionCheckForBetaUpdates->setEnabled(!lamexp_version_demo());
+       ui->actionHibernateComputer->setChecked(m_settings->hibernateComputer());
+       ui->actionHibernateComputer->setEnabled(lamexp_is_hibernation_supported());
+       connect(ui->actionDisableUpdateReminder, SIGNAL(triggered(bool)), this, SLOT(disableUpdateReminderActionTriggered(bool)));
+       connect(ui->actionDisableSounds, SIGNAL(triggered(bool)), this, SLOT(disableSoundsActionTriggered(bool)));
+       connect(ui->actionDisableNeroAacNotifications, SIGNAL(triggered(bool)), this, SLOT(disableNeroAacNotificationsActionTriggered(bool)));
+       connect(ui->actionDisableSlowStartupNotifications, SIGNAL(triggered(bool)), this, SLOT(disableSlowStartupNotificationsActionTriggered(bool)));
+       connect(ui->actionDisableShellIntegration, SIGNAL(triggered(bool)), this, SLOT(disableShellIntegrationActionTriggered(bool)));
+       connect(ui->actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool)));
+       connect(ui->actionHibernateComputer, SIGNAL(triggered(bool)), this, SLOT(hibernateComputerActionTriggered(bool)));
+       connect(ui->actionCheckForBetaUpdates, SIGNAL(triggered(bool)), this, SLOT(checkForBetaUpdatesActionTriggered(bool)));
+       connect(ui->actionImportCueSheet, SIGNAL(triggered(bool)), this, SLOT(importCueSheetActionTriggered(bool)));
                
        //Activate help menu actions
-       actionVisitHomepage->setData(QString::fromLatin1(lamexp_website_url()));
-       actionVisitSupport->setData(QString::fromLatin1(lamexp_support_url()));
-       actionDocumentFAQ->setData(QString("%1/FAQ.html").arg(QApplication::applicationDirPath()));
-       actionDocumentChangelog->setData(QString("%1/Changelog.html").arg(QApplication::applicationDirPath()));
-       actionDocumentTranslate->setData(QString("%1/Translate.html").arg(QApplication::applicationDirPath()));
-       connect(actionCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdatesActionActivated()));
-       connect(actionVisitHomepage, SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
-       connect(actionVisitSupport, SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
-       connect(actionDocumentFAQ, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
-       connect(actionDocumentChangelog, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
-       connect(actionDocumentTranslate, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
+       ui->actionVisitHomepage    ->setData(QString::fromLatin1(lamexp_website_url()));
+       ui->actionVisitSupport     ->setData(QString::fromLatin1(lamexp_support_url()));
+       ui->actionVisitMuldersSite ->setData(QString::fromLatin1(lamexp_mulders_url()));
+       ui->actionVisitTracker     ->setData(QString::fromLatin1(lamexp_tracker_url()));
+       ui->actionVisitHAK         ->setData(QString::fromLatin1(g_hydrogen_audio_url));
+       ui->actionDocumentFAQ      ->setData(QString("%1/FAQ.html").arg(QApplication::applicationDirPath()));
+       ui->actionDocumentChangelog->setData(QString("%1/Changelog.html").arg(QApplication::applicationDirPath()));
+       ui->actionDocumentTranslate->setData(QString("%1/Translate.html").arg(QApplication::applicationDirPath()));
+       connect(ui->actionCheckUpdates,      SIGNAL(triggered()), this, SLOT(checkUpdatesActionActivated()));
+       connect(ui->actionVisitSupport,      SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+       connect(ui->actionVisitTracker,      SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+       connect(ui->actionVisitHomepage,     SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+       connect(ui->actionVisitMuldersSite,  SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+       connect(ui->actionVisitHAK,          SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+       connect(ui->actionDocumentFAQ,       SIGNAL(triggered()), this, SLOT(documentActionActivated()));
+       connect(ui->actionDocumentChangelog, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
+       connect(ui->actionDocumentTranslate, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
        
        //--------------------------------
        // Prepare to show window
@@ -575,9 +669,6 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        move((desktopRect.width() - thisRect.width()) / 2, (desktopRect.height() - thisRect.height()) / 2);
        setMinimumSize(thisRect.width(), thisRect.height());
 
-       //Create banner
-       m_banner = new WorkingBanner(this);
-
        //Create DropBox widget
        m_dropBox = new DropBox(this, m_fileListModel, m_settings);
        connect(m_fileListModel, SIGNAL(modelReset()), m_dropBox, SLOT(modelChanged()));
@@ -587,17 +678,19 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 
        //Create message handler thread
        m_messageHandler = new MessageHandlerThread();
-       m_delayedFileList = new QStringList();
-       m_delayedFileTimer = new QTimer();
-       m_delayedFileTimer->setSingleShot(true);
-       m_delayedFileTimer->setInterval(5000);
        connect(m_messageHandler, SIGNAL(otherInstanceDetected()), this, SLOT(notifyOtherInstance()), Qt::QueuedConnection);
        connect(m_messageHandler, SIGNAL(fileReceived(QString)), this, SLOT(addFileDelayed(QString)), Qt::QueuedConnection);
        connect(m_messageHandler, SIGNAL(folderReceived(QString, bool)), this, SLOT(addFolderDelayed(QString, bool)), Qt::QueuedConnection);
        connect(m_messageHandler, SIGNAL(killSignalReceived()), this, SLOT(close()), Qt::QueuedConnection);
-       connect(m_delayedFileTimer, SIGNAL(timeout()), this, SLOT(handleDelayedFiles()));
        m_messageHandler->start();
 
+       //Init delayed file handling
+       m_delayedFileList = new QStringList();
+       m_delayedFileTimer = new QTimer();
+       m_delayedFileTimer->setSingleShot(true);
+       m_delayedFileTimer->setInterval(5000);
+       connect(m_delayedFileTimer, SIGNAL(timeout()), this, SLOT(handleDelayedFiles()));
+
        //Load translation
        initializeTranslation();
 
@@ -606,6 +699,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        changeEvent(&languageChangeEvent);
 
        //Enable Drag & Drop
+       m_droppedFileList = new QList<QUrl>();
        this->setAcceptDrops(true);
 }
 
@@ -627,31 +721,43 @@ MainWindow::~MainWindow(void)
        }
 
        //Unset models
-       SET_MODEL(sourceFileView, NULL);
-       SET_MODEL(outputFolderView, NULL);
-       SET_MODEL(metaDataView, NULL);
+       SET_MODEL(ui->sourceFileView, NULL);
+       SET_MODEL(ui->outputFolderView, NULL);
+       SET_MODEL(ui->metaDataView, NULL);
 
        //Free memory
-       LAMEXP_DELETE(m_tabActionGroup);
-       LAMEXP_DELETE(m_styleActionGroup);
-       LAMEXP_DELETE(m_languageActionGroup);
-       LAMEXP_DELETE(m_banner);
-       LAMEXP_DELETE(m_fileSystemModel);
-       LAMEXP_DELETE(m_messageHandler);
-       LAMEXP_DELETE(m_delayedFileList);
-       LAMEXP_DELETE(m_delayedFileTimer);
-       LAMEXP_DELETE(m_metaInfoModel);
-       LAMEXP_DELETE(m_encoderButtonGroup);
-       LAMEXP_DELETE(m_modeButtonGroup);
-       LAMEXP_DELETE(m_overwriteButtonGroup);
-       LAMEXP_DELETE(m_sourceFilesContextMenu);
-       LAMEXP_DELETE(m_outputFolderFavoritesMenu);
-       LAMEXP_DELETE(m_outputFolderContextMenu);
-       LAMEXP_DELETE(m_dropBox);
-       LAMEXP_DELETE(m_evenFilterCustumParamsHelp);
-       LAMEXP_DELETE(m_evenFilterOutputFolderMouse);
-       LAMEXP_DELETE(m_evenFilterOutputFolderView);
-       LAMEXP_DELETE(m_evenFilterCompressionTab);
+       MUTILS_DELETE(m_tabActionGroup);
+       MUTILS_DELETE(m_styleActionGroup);
+       MUTILS_DELETE(m_languageActionGroup);
+       MUTILS_DELETE(m_banner);
+       MUTILS_DELETE(m_fileSystemModel);
+       MUTILS_DELETE(m_messageHandler);
+       MUTILS_DELETE(m_droppedFileList);
+       MUTILS_DELETE(m_delayedFileList);
+       MUTILS_DELETE(m_delayedFileTimer);
+       MUTILS_DELETE(m_metaInfoModel);
+       MUTILS_DELETE(m_encoderButtonGroup);
+       MUTILS_DELETE(m_modeButtonGroup);
+       MUTILS_DELETE(m_overwriteButtonGroup);
+       MUTILS_DELETE(m_sourceFilesContextMenu);
+       MUTILS_DELETE(m_outputFolderFavoritesMenu);
+       MUTILS_DELETE(m_outputFolderContextMenu);
+       MUTILS_DELETE(m_dropBox);
+       MUTILS_DELETE(m_evenFilterCornerWidget);
+       MUTILS_DELETE(m_evenFilterCustumParamsHelp);
+       MUTILS_DELETE(m_evenFilterOutputFolderMouse);
+       MUTILS_DELETE(m_evenFilterOutputFolderView);
+       MUTILS_DELETE(m_evenFilterCompressionTab);
+       
+       //Free window icon
+       if(m_windowIcon)
+       {
+               lamexp_free_window_icon(m_windowIcon);
+               m_windowIcon = NULL;
+       }
+
+       //Un-initialize the dialog
+       MUTILS_DELETE(ui);
 }
 
 ////////////////////////////////////////////////////////////
@@ -668,9 +774,12 @@ void MainWindow::addFiles(const QStringList &files)
                return;
        }
 
-       tabWidget->setCurrentIndex(0);
+       WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
+       tabPageChanged(ui->tabWidget->currentIndex(), true);
 
+       INIT_BANNER();
        FileAnalyzer *analyzer = new FileAnalyzer(files);
+
        connect(analyzer, SIGNAL(fileSelected(QString)), m_banner, SLOT(setText(QString)), Qt::QueuedConnection);
        connect(analyzer, SIGNAL(progressValChanged(unsigned int)), m_banner, SLOT(setProgressVal(unsigned int)), Qt::QueuedConnection);
        connect(analyzer, SIGNAL(progressMaxChanged(unsigned int)), m_banner, SLOT(setProgressMax(unsigned int)), Qt::QueuedConnection);
@@ -682,7 +791,6 @@ void MainWindow::addFiles(const QStringList &files)
                m_fileListModel->setBlockUpdates(true);
                QTime startTime = QTime::currentTime();
                m_banner->show(tr("Adding file(s), please wait..."), analyzer);
-               //timeMT = startTime.secsTo(QTime::currentTime());
        }
        catch(...)
        {
@@ -691,29 +799,29 @@ void MainWindow::addFiles(const QStringList &files)
 
        m_fileListModel->setBlockUpdates(false);
        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-       sourceFileView->update();
+       ui->sourceFileView->update();
        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-       sourceFileView->scrollToBottom();
+       ui->sourceFileView->scrollToBottom();
        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 
        if(analyzer->filesDenied())
        {
-               QMessageBox::warning(this, tr("Access Denied"), QString("%1<br>%2").arg(NOBR(tr("%1 file(s) have been rejected, because read access was not granted!").arg(analyzer->filesDenied())), NOBR(tr("This usually means the file is locked by another process."))));
+               QMessageBox::warning(this, tr("Access Denied"), QString("%1<br>%2").arg(NOBR(tr("%n file(s) have been rejected, because read access was not granted!", "", analyzer->filesDenied())), NOBR(tr("This usually means the file is locked by another process."))));
        }
        if(analyzer->filesDummyCDDA())
        {
-               QMessageBox::warning(this, tr("CDDA Files"), QString("%1<br><br>%2<br>%3").arg(NOBR(tr("%1 file(s) have been rejected, because they are dummy CDDA files!").arg(analyzer->filesDummyCDDA())), NOBR(tr("Sorry, LameXP cannot extract audio tracks from an Audio-CD at present.")), NOBR(tr("We recommend using %1 for that purpose.").arg("<a href=\"http://www.exactaudiocopy.de/\">Exact Audio Copy</a>"))));
+               QMessageBox::warning(this, tr("CDDA Files"), QString("%1<br><br>%2<br>%3").arg(NOBR(tr("%n file(s) have been rejected, because they are dummy CDDA files!", "", analyzer->filesDummyCDDA())), NOBR(tr("Sorry, LameXP cannot extract audio tracks from an Audio-CD at present.")), NOBR(tr("We recommend using %1 for that purpose.").arg("<a href=\"http://www.exactaudiocopy.de/\">Exact Audio Copy</a>"))));
        }
        if(analyzer->filesCueSheet())
        {
-               QMessageBox::warning(this, tr("Cue Sheet"), QString("%1<br>%2").arg(NOBR(tr("%1 file(s) have been rejected, because they appear to be Cue Sheet images!").arg(analyzer->filesCueSheet())), NOBR(tr("Please use LameXP's Cue Sheet wizard for importing Cue Sheet files."))));
+               QMessageBox::warning(this, tr("Cue Sheet"), QString("%1<br>%2").arg(NOBR(tr("%n file(s) have been rejected, because they appear to be Cue Sheet images!", "",analyzer->filesCueSheet())), NOBR(tr("Please use LameXP's Cue Sheet wizard for importing Cue Sheet files."))));
        }
        if(analyzer->filesRejected())
        {
-               QMessageBox::warning(this, tr("Files Rejected"), QString("%1<br>%2").arg(NOBR(tr("%1 file(s) have been rejected, because the file format could not be recognized!").arg(analyzer->filesRejected())), NOBR(tr("This usually means the file is damaged or the file format is not supported."))));
+               QMessageBox::warning(this, tr("Files Rejected"), QString("%1<br>%2").arg(NOBR(tr("%n file(s) have been rejected, because the file format could not be recognized!", "", analyzer->filesRejected())), NOBR(tr("This usually means the file is damaged or the file format is not supported."))));
        }
 
-       LAMEXP_DELETE(analyzer);
+       MUTILS_DELETE(analyzer);
        m_banner->close();
 }
 
@@ -726,16 +834,16 @@ void MainWindow::addFolder(const QString &path, bool recursive, bool delayed)
        folderInfoList << QFileInfo(path);
        QStringList fileList;
        
-       m_banner->show(tr("Scanning folder(s) for files, please wait..."));
+       SHOW_BANNER(tr("Scanning folder(s) for files, please wait..."));
        
        QApplication::processEvents();
-       GetAsyncKeyState(VK_ESCAPE);
+       lamexp_check_escape_state();
 
        while(!folderInfoList.isEmpty())
        {
-               if(GetAsyncKeyState(VK_ESCAPE) & 0x0001)
+               if(lamexp_check_escape_state())
                {
-                       MessageBeep(MB_ICONERROR);
+                       lamexp_beep(lamexp_beep_error);
                        qWarning("Operation cancelled by user!");
                        fileList.clear();
                        break;
@@ -749,7 +857,7 @@ void MainWindow::addFolder(const QString &path, bool recursive, bool delayed)
                        fileList << fileInfoList.takeFirst().canonicalFilePath();
                }
 
-               QApplication::processEvents();
+               QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 
                if(recursive)
                {
@@ -786,11 +894,12 @@ bool MainWindow::checkForUpdates(void)
 
        if(updateDialog->getSuccess())
        {
+               SHOW_CORNER_WIDGET(false);
                m_settings->autoUpdateLastCheck(QDate::currentDate().toString(Qt::ISODate));
                bReadyToInstall = updateDialog->updateReadyToInstall();
        }
 
-       LAMEXP_DELETE(updateDialog);
+       MUTILS_DELETE(updateDialog);
        return bReadyToInstall;
 }
 
@@ -808,7 +917,7 @@ void MainWindow::refreshFavorites(void)
                QAction *currentItem = folderList.takeFirst();
                if(currentItem->isSeparator()) break;
                m_outputFolderFavoritesMenu->removeAction(currentItem);
-               LAMEXP_DELETE(currentItem);
+               MUTILS_DELETE(currentItem);
        }
 
        QAction *lastItem = m_outputFolderFavoritesMenu->actions().first();
@@ -844,7 +953,7 @@ void MainWindow::initializeTranslation(void)
                        {
                                QList<QAction*> actions = m_languageActionGroup->actions();
                                while(!actions.isEmpty()) actions.takeFirst()->setChecked(false);
-                               actionLoadTranslationFromFile->setChecked(true);
+                               ui->actionLoadTranslationFromFile->setChecked(true);
                                translationLoaded = true;
                        }
                }
@@ -899,12 +1008,13 @@ void MainWindow::initializeTranslation(void)
 void MainWindow::showEvent(QShowEvent *event)
 {
        m_accepted = false;
-       m_dropNoteLabel->setGeometry(0, 0, sourceFileView->width(), sourceFileView->height());
+       resizeEvent(NULL);
        sourceModelChanged();
-       
+
        if(!event->spontaneous())
        {
-               tabWidget->setCurrentIndex(0);
+               WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
+               tabPageChanged(ui->tabWidget->currentIndex(), true);
        }
 
        if(m_firstTimeShown)
@@ -926,78 +1036,93 @@ void MainWindow::showEvent(QShowEvent *event)
  */
 void MainWindow::changeEvent(QEvent *e)
 {
-       if(e->type() == QEvent::LanguageChange)
+       QMainWindow::changeEvent(e);
+       if(e->type() != QEvent::LanguageChange)
        {
-               int comboBoxIndex[8];
+               return;
+       }
+
+       int comboBoxIndex[8];
                
-               //Backup combobox indices, as retranslateUi() resets
-               comboBoxIndex[0] = comboBoxMP3ChannelMode->currentIndex();
-               comboBoxIndex[1] = comboBoxSamplingRate->currentIndex();
-               comboBoxIndex[2] = comboBoxAACProfile->currentIndex();
-               comboBoxIndex[3] = comboBoxAftenCodingMode->currentIndex();
-               comboBoxIndex[4] = comboBoxAftenDRCMode->currentIndex();
-               comboBoxIndex[5] = comboBoxNormalizationMode->currentIndex();
-               comboBoxIndex[6] = comboBoxOpusOptimize->currentIndex();
-               comboBoxIndex[7] = comboBoxOpusFramesize->currentIndex();
+       //Backup combobox indices, as retranslateUi() resets
+       comboBoxIndex[0] = ui->comboBoxMP3ChannelMode->currentIndex();
+       comboBoxIndex[1] = ui->comboBoxSamplingRate->currentIndex();
+       comboBoxIndex[2] = ui->comboBoxAACProfile->currentIndex();
+       comboBoxIndex[3] = ui->comboBoxAftenCodingMode->currentIndex();
+       comboBoxIndex[4] = ui->comboBoxAftenDRCMode->currentIndex();
+       comboBoxIndex[5] = ui->comboBoxNormalizationMode->currentIndex();
+       comboBoxIndex[6] = 0; //comboBoxOpusOptimize->currentIndex();
+       comboBoxIndex[7] = ui->comboBoxOpusFramesize->currentIndex();
                
-               //Re-translate from UIC
-               Ui::MainWindow::retranslateUi(this);
-
-               //Restore combobox indices
-               comboBoxMP3ChannelMode->setCurrentIndex(comboBoxIndex[0]);
-               comboBoxSamplingRate->setCurrentIndex(comboBoxIndex[1]);
-               comboBoxAACProfile->setCurrentIndex(comboBoxIndex[2]);
-               comboBoxAftenCodingMode->setCurrentIndex(comboBoxIndex[3]);
-               comboBoxAftenDRCMode->setCurrentIndex(comboBoxIndex[4]);
-               comboBoxNormalizationMode->setCurrentIndex(comboBoxIndex[5]);
-               comboBoxOpusOptimize->setCurrentIndex(comboBoxIndex[6]);
-               comboBoxOpusFramesize->setCurrentIndex(comboBoxIndex[7]);
-
-               //Update the window title
-               if(LAMEXP_DEBUG)
-               {
-                       setWindowTitle(QString("%1 [!!! DEBUG BUILD !!!]").arg(windowTitle()));
-               }
-               else if(lamexp_version_demo())
-               {
-                       setWindowTitle(QString("%1 [%2]").arg(windowTitle(), tr("DEMO VERSION")));
-               }
-
-               //Manually re-translate widgets that UIC doesn't handle
-               m_dropNoteLabel->setText(QString("» %1 Â«").arg(tr("You can drop in audio files here!")));
-               m_outputFolderNoteBox->setText(tr("Initializing directory outline, please be patient..."));
-               m_showDetailsContextAction->setText(tr("Show Details"));
-               m_previewContextAction->setText(tr("Open File in External Application"));
-               m_findFileContextAction->setText(tr("Browse File Location"));
-               m_showFolderContextAction->setText(tr("Browse Selected Folder"));
-               m_refreshFolderContextAction->setText(tr("Refresh Directory Outline"));
-               m_addFavoriteFolderAction->setText(tr("Bookmark Current Output Folder"));
-               m_exportCsvContextAction->setText(tr("Export Meta Tags to CSV File"));
-               m_importCsvContextAction->setText(tr("Import Meta Tags from CSV File"));
-
-               //Force GUI update
-               m_metaInfoModel->clearData();
-               m_metaInfoModel->setData(m_metaInfoModel->index(4, 1), m_settings->metaInfoPosition());
-               updateEncoder(m_settings->compressionEncoder());
-               updateLameAlgoQuality(sliderLameAlgoQuality->value());
-               updateMaximumInstances(sliderMaxInstances->value());
-               renameOutputPatternChanged(lineEditRenamePattern->text());
-
-               //Re-install shell integration
-               if(m_settings->shellIntegrationEnabled())
-               {
-                       ShellIntegration::install();
-               }
+       //Re-translate from UIC
+       ui->retranslateUi(this);
+
+       //Restore combobox indices
+       ui->comboBoxMP3ChannelMode->setCurrentIndex(comboBoxIndex[0]);
+       ui->comboBoxSamplingRate->setCurrentIndex(comboBoxIndex[1]);
+       ui->comboBoxAACProfile->setCurrentIndex(comboBoxIndex[2]);
+       ui->comboBoxAftenCodingMode->setCurrentIndex(comboBoxIndex[3]);
+       ui->comboBoxAftenDRCMode->setCurrentIndex(comboBoxIndex[4]);
+       ui->comboBoxNormalizationMode->setCurrentIndex(comboBoxIndex[5]);
+       //comboBoxOpusOptimize->setCurrentIndex(comboBoxIndex[6]);
+       ui->comboBoxOpusFramesize->setCurrentIndex(comboBoxIndex[7]);
+
+       //Update the window title
+       if(MUTILS_DEBUG)
+       {
+               setWindowTitle(QString("%1 [!!! DEBUG BUILD !!!]").arg(windowTitle()));
+       }
+       else if(lamexp_version_demo())
+       {
+               setWindowTitle(QString("%1 [%2]").arg(windowTitle(), tr("DEMO VERSION")));
+       }
+
+       //Manually re-translate widgets that UIC doesn't handle
+       m_outputFolderNoteBox->setText(tr("Initializing directory outline, please be patient..."));
+       m_dropNoteLabel->setText(QString("<br><img src=\":/images/DropZone.png\"><br><br>%1").arg(tr("You can drop in audio files here!")));
+       if(QLabel *cornerWidget = dynamic_cast<QLabel*>(ui->menubar->cornerWidget()))
+       {
+               cornerWidget->setText(QString("<nobr><img src=\":/icons/exclamation_small.png\">&nbsp;<b style=\"color:darkred\">%1</b>&nbsp;&nbsp;&nbsp;</nobr>").arg(tr("Check for Updates")));
+       }
+       m_showDetailsContextAction->setText(tr("Show Details"));
+       m_previewContextAction->setText(tr("Open File in External Application"));
+       m_findFileContextAction->setText(tr("Browse File Location"));
+       m_showFolderContextAction->setText(tr("Browse Selected Folder"));
+       m_refreshFolderContextAction->setText(tr("Refresh Directory Outline"));
+       m_goUpFolderContextAction->setText(tr("Go To Parent Directory"));
+       m_addFavoriteFolderAction->setText(tr("Bookmark Current Output Folder"));
+       m_exportCsvContextAction->setText(tr("Export Meta Tags to CSV File"));
+       m_importCsvContextAction->setText(tr("Import Meta Tags from CSV File"));
+
+       //Force GUI update
+       m_metaInfoModel->clearData();
+       m_metaInfoModel->setData(m_metaInfoModel->index(4, 1), m_settings->metaInfoPosition());
+       updateEncoder(m_settings->compressionEncoder());
+       updateLameAlgoQuality(ui->sliderLameAlgoQuality->value());
+       updateMaximumInstances(ui->sliderMaxInstances->value());
+       renameOutputPatternChanged(ui->lineEditRenamePattern->text(), true);
 
-               //Translate system menu
-               if(HMENU hMenu = ::GetSystemMenu(winId(), FALSE))
+       //Re-install shell integration
+       if(m_settings->shellIntegrationEnabled())
+       {
+               ShellIntegration::install();
+       }
+
+       //Translate system menu
+       lamexp_update_sysmenu(this, IDM_ABOUTBOX, ui->buttonAbout->text());
+       
+       //Force resize event
+       QApplication::postEvent(this, new QResizeEvent(this->size(), QSize()));
+       for(QObjectList::ConstIterator iter = this->children().constBegin(); iter != this->children().constEnd(); iter++)
+       {
+               if(QWidget *child = dynamic_cast<QWidget*>(*iter))
                {
-                       ModifyMenu(hMenu, IDM_ABOUTBOX, MF_STRING | MF_BYCOMMAND, IDM_ABOUTBOX, QWCHAR(buttonAbout->text()));
+                       QApplication::postEvent(child, new QResizeEvent(child->size(), QSize()));
                }
-                       
-               //Force resize, if needed
-               tabPageChanged(tabWidget->currentIndex());
        }
+
+       //Force tabe page change
+       tabPageChanged(ui->tabWidget->currentIndex(), true);
 }
 
 /*
@@ -1018,51 +1143,12 @@ void MainWindow::dragEnterEvent(QDragEnterEvent *event)
  */
 void MainWindow::dropEvent(QDropEvent *event)
 {
-       ABORT_IF_BUSY;
-
-       QStringList droppedFiles;
-       QList<QUrl> urls = event->mimeData()->urls();
-
-       while(!urls.isEmpty())
-       {
-               QUrl currentUrl = urls.takeFirst();
-               QFileInfo file(currentUrl.toLocalFile());
-               if(!file.exists())
-               {
-                       continue;
-               }
-               if(file.isFile())
-               {
-                       qDebug("Dropped File: %s", file.canonicalFilePath().toUtf8().constData());
-                       droppedFiles << file.canonicalFilePath();
-                       continue;
-               }
-               if(file.isDir())
-               {
-                       qDebug("Dropped Folder: %s", file.canonicalFilePath().toUtf8().constData());
-                       QList<QFileInfo> list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Files | QDir::NoSymLinks);
-                       if(list.count() > 0)
-                       {
-                               for(int j = 0; j < list.count(); j++)
-                               {
-                                       droppedFiles << list.at(j).canonicalFilePath();
-                               }
-                       }
-                       else
-                       {
-                               list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
-                               for(int j = 0; j < list.count(); j++)
-                               {
-                                       qDebug("Descending to Folder: %s", list.at(j).canonicalFilePath().toUtf8().constData());
-                                       urls.prepend(QUrl::fromLocalFile(list.at(j).canonicalFilePath()));
-                               }
-                       }
-               }
-       }
-       
-       if(!droppedFiles.isEmpty())
+       m_droppedFileList->clear();
+       (*m_droppedFileList) << event->mimeData()->urls();
+       if(!m_droppedFileList->isEmpty())
        {
-               addFilesDelayed(droppedFiles, true);
+               PLAY_SOUND_OPTIONAL("drop", true);
+               QTimer::singleShot(0, this, SLOT(handleDroppedFiles()));
        }
 }
 
@@ -1071,9 +1157,9 @@ void MainWindow::dropEvent(QDropEvent *event)
  */
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-       if(m_banner->isVisible() || m_delayedFileTimer->isActive())
+       if(BANNER_VISIBLE || m_delayedFileTimer->isActive())
        {
-               MessageBeep(MB_ICONEXCLAMATION);
+               lamexp_beep(lamexp_beep_warning);
                event->ignore();
        }
        
@@ -1089,11 +1175,15 @@ void MainWindow::closeEvent(QCloseEvent *event)
 void MainWindow::resizeEvent(QResizeEvent *event)
 {
        if(event) QMainWindow::resizeEvent(event);
-       m_dropNoteLabel->setGeometry(0, 0, sourceFileView->width(), sourceFileView->height());
 
-       if(QWidget *port = outputFolderView->viewport())
+       if(QWidget *port = ui->sourceFileView->viewport())
        {
-               m_outputFolderNoteBox->setGeometry(16, (port->height() - 64) / 2, port->width() - 32,  64);
+               m_dropNoteLabel->setGeometry(port->geometry());
+       }
+
+       if(QWidget *port = ui->outputFolderView->viewport())
+       {
+               m_outputFolderNoteBox->setGeometry(16, (port->height() - 64) / 2, port->width() - 32, 64);
        }
 }
 
@@ -1104,7 +1194,7 @@ void MainWindow::keyPressEvent(QKeyEvent *e)
 {
        if(e->key() == Qt::Key_Delete)
        {
-               if(sourceFileView->isVisible())
+               if(ui->sourceFileView->isVisible())
                {
                        QTimer::singleShot(0, this, SLOT(removeFileButtonClicked()));
                        return;
@@ -1114,13 +1204,13 @@ void MainWindow::keyPressEvent(QKeyEvent *e)
        if(e->modifiers().testFlag(Qt::ControlModifier) && (e->key() == Qt::Key_F5))
        {
                initializeTranslation();
-               MessageBeep(MB_ICONINFORMATION);
+               lamexp_beep(lamexp_beep_info);
                return;
        }
 
        if(e->key() == Qt::Key_F5)
        {
-               if(outputFolderView->isVisible())
+               if(ui->outputFolderView->isVisible())
                {
                        QTimer::singleShot(0, this, SLOT(refreshFolderContextActionTriggered()));
                        return;
@@ -1151,12 +1241,12 @@ bool MainWindow::event(QEvent *e)
 {
        switch(e->type())
        {
-       case lamexp_event_queryendsession:
+       case MUtils::GUI::USER_EVENT_QUERYENDSESSION:
                qWarning("System is shutting down, main window prepares to close...");
-               if(m_banner->isVisible()) m_banner->close();
+               if(BANNER_VISIBLE) m_banner->close();
                if(m_delayedFileTimer->isActive()) m_delayedFileTimer->stop();
                return true;
-       case lamexp_event_endsession:
+       case MUtils::GUI::USER_EVENT_ENDSESSION:
                qWarning("System is shutting down, main window will close now...");
                if(isVisible())
                {
@@ -1168,7 +1258,7 @@ bool MainWindow::event(QEvent *e)
                m_fileListModel->clearFiles();
                return true;
        case QEvent::MouseButtonPress:
-               if(outputFolderEdit->isVisible())
+               if(ui->outputFolderEdit->isVisible())
                {
                        QTimer::singleShot(0, this, SLOT(outputFolderEditFinished()));
                }
@@ -1179,9 +1269,9 @@ bool MainWindow::event(QEvent *e)
 
 bool MainWindow::winEvent(MSG *message, long *result)
 {
-       if((message->message == WM_SYSCOMMAND) && ((message->wParam & 0xFFF0) == IDM_ABOUTBOX))
+       if(lamexp_check_sysmenu_msg(message, IDM_ABOUTBOX))
        {
-               QTimer::singleShot(0, buttonAbout, SLOT(click()));
+               QTimer::singleShot(0, ui->buttonAbout, SLOT(click()));
                *result = 0;
                return true;
        }
@@ -1201,7 +1291,10 @@ bool MainWindow::winEvent(MSG *message, long *result)
  */
 void MainWindow::windowShown(void)
 {
-       const QStringList &arguments = lamexp_arguments(); //QApplication::arguments();
+       const QStringList &arguments = MUtils::OS::arguments(); //QApplication::arguments();
+
+       //Force resize event
+       resizeEvent(NULL);
 
        //First run?
        bool firstRun = false;
@@ -1221,7 +1314,7 @@ void MainWindow::windowShown(void)
                        AboutDialog *about = new AboutDialog(m_settings, this, true);
                        iAccepted = about->exec();
                        if(iAccepted <= 0) iAccepted = -2;
-                       LAMEXP_DELETE(about);
+                       MUTILS_DELETE(about);
                }
 
                if(iAccepted <= 0)
@@ -1229,7 +1322,7 @@ void MainWindow::windowShown(void)
                        m_settings->licenseAccepted(++iAccepted);
                        m_settings->syncNow();
                        QApplication::processEvents();
-                       PlaySound(MAKEINTRESOURCE(IDR_WAVE_WHAMMY), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+                       lamexp_play_sound("whammy", false);
                        QMessageBox::critical(this, tr("License Declined"), tr("You have declined the license. Consequently the application will exit now!"), tr("Goodbye!"));
                        QFileInfo uninstallerInfo = QFileInfo(QString("%1/Uninstall.exe").arg(QApplication::applicationDirPath()));
                        if(uninstallerInfo.exists())
@@ -1238,15 +1331,14 @@ void MainWindow::windowShown(void)
                                QString uninstallerPath = uninstallerInfo.canonicalFilePath();
                                for(int i = 0; i < 3; i++)
                                {
-                                       HINSTANCE res = ShellExecuteW(reinterpret_cast<HWND>(this->winId()), L"open", QWCHAR(QDir::toNativeSeparators(uninstallerPath)), L"/Force", QWCHAR(QDir::toNativeSeparators(uninstallerDir)), SW_SHOWNORMAL);
-                                       if(reinterpret_cast<int>(res) > 32) break;
+                                       if(lamexp_exec_shell(this, QDir::toNativeSeparators(uninstallerPath), "/Force", QDir::toNativeSeparators(uninstallerDir))) break;
                                }
                        }
                        QApplication::quit();
                        return;
                }
                
-               PlaySound(MAKEINTRESOURCE(IDR_WAVE_WOOHOO), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+               lamexp_play_sound("woohoo", false);
                m_settings->licenseAccepted(1);
                m_settings->syncNow();
                if(lamexp_version_demo()) showAnnounceBox();
@@ -1255,10 +1347,10 @@ void MainWindow::windowShown(void)
        //Check for expiration
        if(lamexp_version_demo())
        {
-               if(QDate::currentDate() >= lamexp_version_expires())
+               if(MUtils::OS::current_date() >= lamexp_version_expires())
                {
                        qWarning("Binary has expired !!!");
-                       PlaySound(MAKEINTRESOURCE(IDR_WAVE_WHAMMY), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+                       lamexp_play_sound("whammy", false);
                        if(QMessageBox::warning(this, tr("LameXP - Expired"), QString("%1<br>%2").arg(NOBR(tr("This demo (pre-release) version of LameXP has expired at %1.").arg(lamexp_version_expires().toString(Qt::ISODate))), NOBR(tr("LameXP is free software and release versions won't expire."))), tr("Check for Updates"), tr("Exit Program")) == 0)
                        {
                                checkForUpdates();
@@ -1277,14 +1369,15 @@ void MainWindow::windowShown(void)
                if(QMessageBox::warning(this, tr("Slow Startup"), message, tr("Discard"), tr("Don't Show Again")) == 1)
                {
                        m_settings->antivirNotificationsEnabled(false);
-                       actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
+                       ui->actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
                }
        }
 
        //Update reminder
-       if(QDate::currentDate() >= lamexp_version_date().addYears(1))
+       if(MUtils::OS::current_date() >= MUtils::Version::app_build_date().addYears(1))
        {
                qWarning("Binary is more than a year old, time to update!");
+               SHOW_CORNER_WIDGET(true);
                int ret = QMessageBox::warning(this, tr("Urgent Update"), NOBR(tr("Your version of LameXP is more than a year old. Time for an update!")), tr("Check for Updates"), tr("Exit Program"), tr("Ignore"));
                switch(ret)
                {
@@ -1300,29 +1393,34 @@ void MainWindow::windowShown(void)
                        return;
                default:
                        QEventLoop loop; QTimer::singleShot(7000, &loop, SLOT(quit()));
-                       PlaySound(MAKEINTRESOURCE(IDR_WAVE_WAITING), GetModuleHandle(NULL), SND_RESOURCE | SND_ASYNC);
-                       m_banner->show(tr("Skipping update check this time, please be patient..."), &loop);
+                       lamexp_play_sound("waiting", true);
+                       SHOW_BANNER_ARG(tr("Skipping update check this time, please be patient..."), &loop);
                        break;
                }
        }
-       else if(m_settings->autoUpdateEnabled())
+       else
        {
                QDate lastUpdateCheck = QDate::fromString(m_settings->autoUpdateLastCheck(), Qt::ISODate);
-               if(!firstRun && (!lastUpdateCheck.isValid() || QDate::currentDate() >= lastUpdateCheck.addDays(14)))
+               if((!firstRun) && ((!lastUpdateCheck.isValid()) || (MUtils::OS::current_date() >= lastUpdateCheck.addDays(14))))
                {
-                       if(QMessageBox::information(this, tr("Update Reminder"), NOBR(lastUpdateCheck.isValid() ? tr("Your last update check was more than 14 days ago. Check for updates now?") : tr("Your did not check for LameXP updates yet. Check for updates now?")), tr("Check for Updates"), tr("Postpone")) == 0)
+                       SHOW_CORNER_WIDGET(true);
+                       if(m_settings->autoUpdateEnabled())
                        {
-                               if(checkForUpdates())
+                               if(QMessageBox::information(this, tr("Update Reminder"), NOBR(lastUpdateCheck.isValid() ? tr("Your last update check was more than 14 days ago. Check for updates now?") : tr("Your did not check for LameXP updates yet. Check for updates now?")), tr("Check for Updates"), tr("Postpone")) == 0)
                                {
-                                       QApplication::quit();
-                                       return;
+                                       if(checkForUpdates())
+                                       {
+                                               QApplication::quit();
+                                               return;
+                                       }
                                }
                        }
                }
        }
 
        //Check for AAC support
-       if(m_neroEncoderAvailable)
+       const int aacEncoder = EncoderRegistry::getAacEncoder();
+       if(aacEncoder == SettingsModel::AAC_ENCODER_NERO)
        {
                if(m_settings->neroAacNotificationsEnabled())
                {
@@ -1340,7 +1438,7 @@ void MainWindow::windowShown(void)
        }
        else
        {
-               if(m_settings->neroAacNotificationsEnabled() && (!(m_fhgEncoderAvailable || m_qaacEncoderAvailable)))
+               if(m_settings->neroAacNotificationsEnabled() && (aacEncoder <= SettingsModel::AAC_ENCODER_NONE))
                {
                        QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath();
                        if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath();
@@ -1354,7 +1452,7 @@ void MainWindow::windowShown(void)
                        if(QMessageBox::information(this, tr("AAC Support Disabled"), messageText, tr("Discard"), tr("Don't Show Again")) == 1)
                        {
                                m_settings->neroAacNotificationsEnabled(false);
-                               actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
+                               ui->actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
                        }
                }
        }
@@ -1366,7 +1464,7 @@ void MainWindow::windowShown(void)
                if(!arguments[i].compare("--add", Qt::CaseInsensitive))
                {
                        QFileInfo currentFile(arguments[++i].trimmed());
-                       qDebug("Adding file from CLI: %s", currentFile.absoluteFilePath().toUtf8().constData());
+                       qDebug("Adding file from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addedFiles.append(currentFile.absoluteFilePath());
                }
                if(!addedFiles.isEmpty())
@@ -1381,13 +1479,13 @@ void MainWindow::windowShown(void)
                if(!arguments[i].compare("--add-folder", Qt::CaseInsensitive))
                {
                        QFileInfo currentFile(arguments[++i].trimmed());
-                       qDebug("Adding folder from CLI: %s", currentFile.absoluteFilePath().toUtf8().constData());
+                       qDebug("Adding folder from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addFolder(currentFile.absoluteFilePath(), false, true);
                }
                if(!arguments[i].compare("--add-recursive", Qt::CaseInsensitive))
                {
                        QFileInfo currentFile(arguments[++i].trimmed());
-                       qDebug("Adding folder recursively from CLI: %s", currentFile.absoluteFilePath().toUtf8().constData());
+                       qDebug("Adding folder recursively from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addFolder(currentFile.absoluteFilePath(), true, true);
                }
        }
@@ -1457,10 +1555,10 @@ void MainWindow::showAnnounceBox(void)
        for(unsigned int i = 0; i < timeout; i++)
        {
                timers[i]->stop();
-               LAMEXP_DELETE(timers[i]);
+               MUTILS_DELETE(timers[i]);
        }
 
-       LAMEXP_DELETE(announceBox);
+       MUTILS_DELETE(announceBox);
 }
 
 // =========================================================
@@ -1481,16 +1579,16 @@ void MainWindow::encodeButtonClicked(void)
        if(m_fileListModel->rowCount() < 1)
        {
                QMessageBox::warning(this, tr("LameXP"), NOBR(tr("You must add at least one file to the list before proceeding!")));
-               tabWidget->setCurrentIndex(0);
+               ui->tabWidget->setCurrentIndex(0);
                return;
        }
        
-       QString tempFolder = m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2();
+       QString tempFolder = m_settings->customTempPathEnabled() ? m_settings->customTempPath() : MUtils::temp_folder();
        if(!QFileInfo(tempFolder).exists() || !QFileInfo(tempFolder).isDir())
        {
                if(QMessageBox::warning(this, tr("Not Found"), QString("%1<br><tt>%2</tt>").arg(NOBR(tr("Your currently selected TEMP folder does not exist anymore:")), NOBR(QDir::toNativeSeparators(tempFolder))), tr("Restore Default"), tr("Cancel")) == 0)
                {
-                       SET_CHECKBOX_STATE(checkBoxUseSystemTempFolder, m_settings->customTempPathEnabledDefault());
+                       SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder, m_settings->customTempPathEnabledDefault());
                }
                return;
        }
@@ -1502,7 +1600,7 @@ void MainWindow::encodeButtonClicked(void)
        {
                QStringList tempFolderParts = tempFolder.split("/", QString::SkipEmptyParts, Qt::CaseInsensitive);
                tempFolderParts.takeLast();
-               if(m_settings->soundsEnabled()) PlaySound(MAKEINTRESOURCE(IDR_WAVE_WHAMMY), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+               PLAY_SOUND_OPTIONAL("whammy", false);
                QString lowDiskspaceMsg = QString("%1<br>%2<br><br>%3<br>%4<br>").arg
                (
                        NOBR(tr("There are less than %1 GB of free diskspace available on your system's TEMP folder.").arg(QString::number(minimumFreeDiskspaceMultiplier))),
@@ -1513,7 +1611,7 @@ void MainWindow::encodeButtonClicked(void)
                switch(QMessageBox::warning(this, tr("Low Diskspace Warning"), lowDiskspaceMsg, tr("Abort Encoding Process"), tr("Clean Disk Now"), tr("Ignore")))
                {
                case 1:
-                       QProcess::startDetached(QString("%1/cleanmgr.exe").arg(lamexp_known_folder(lamexp_folder_systemfolder)), QStringList() << "/D" << tempFolderParts.first());
+                       QProcess::startDetached(QString("%1/cleanmgr.exe").arg(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER)), QStringList() << "/D" << tempFolderParts.first());
                case 0:
                        return;
                        break;
@@ -1532,21 +1630,22 @@ void MainWindow::encodeButtonClicked(void)
        case SettingsModel::FLACEncoder:
        case SettingsModel::OpusEncoder:
        case SettingsModel::DCAEncoder:
+       case SettingsModel::MACEncoder:
        case SettingsModel::PCMEncoder:
                break;
        default:
                QMessageBox::warning(this, tr("LameXP"), tr("Sorry, an unsupported encoder has been chosen!"));
-               tabWidget->setCurrentIndex(3);
+               ui->tabWidget->setCurrentIndex(3);
                return;
        }
 
        if(!m_settings->outputToSourceDir())
        {
-               QFile writeTest(QString("%1/~%2.txt").arg(m_settings->outputDir(), lamexp_rand_str()));
+               QFile writeTest(QString("%1/~%2.txt").arg(m_settings->outputDir(), MUtils::rand_str()));
                if(!(writeTest.open(QIODevice::ReadWrite) && (writeTest.write(writeTestBuffer) == strlen(writeTestBuffer))))
                {
                        QMessageBox::warning(this, tr("LameXP"), QString("%1<br><nobr>%2</nobr><br><br>%3").arg(tr("Cannot write to the selected output directory."), m_settings->outputDir(), tr("Please choose a different directory!")));
-                       tabWidget->setCurrentIndex(1);
+                       ui->tabWidget->setCurrentIndex(1);
                        return;
                }
                else
@@ -1555,7 +1654,7 @@ void MainWindow::encodeButtonClicked(void)
                        writeTest.remove();
                }
        }
-               
+
        m_accepted = true;
        close();
 }
@@ -1571,7 +1670,7 @@ void MainWindow::aboutButtonClicked(void)
        (
                AboutDialog *aboutBox = new AboutDialog(m_settings, this);
                aboutBox->exec();
-               LAMEXP_DELETE(aboutBox);
+               MUTILS_DELETE(aboutBox);
        );
 }
 
@@ -1591,10 +1690,11 @@ void MainWindow::closeButtonClicked(void)
 /*
  * Tab page changed
  */
-void MainWindow::tabPageChanged(int idx)
+void MainWindow::tabPageChanged(int idx, const bool silent)
 {
        resizeEvent(NULL);
        
+       //Update "view" menu
        QList<QAction*> actions = m_tabActionGroup->actions();
        for(int i = 0; i < actions.count(); i++)
        {
@@ -1606,13 +1706,19 @@ void MainWindow::tabPageChanged(int idx)
                }
        }
 
+       //Play tick sound
+       if(!silent)
+       {
+               PLAY_SOUND_OPTIONAL("tick", true);
+       }
+
        int initialWidth = this->width();
        int maximumWidth = QApplication::desktop()->availableGeometry().width();
 
        //Make sure all tab headers are fully visible
        if(this->isVisible())
        {
-               int delta = tabWidget->sizeHint().width() - tabWidget->width();
+               int delta = ui->tabWidget->sizeHint().width() - ui->tabWidget->width();
                if(delta > 0)
                {
                        this->resize(qMin(this->width() + delta, maximumWidth), this->height());
@@ -1620,22 +1726,22 @@ void MainWindow::tabPageChanged(int idx)
        }
 
        //Tab specific operations
-       if(idx == tabWidget->indexOf(tabOptions) && scrollArea->widget() && this->isVisible())
+       if(idx == ui->tabWidget->indexOf(ui->tabOptions) && ui->scrollArea->widget() && this->isVisible())
        {
-               scrollArea->widget()->updateGeometry();
-               scrollArea->viewport()->updateGeometry();
+               ui->scrollArea->widget()->updateGeometry();
+               ui->scrollArea->viewport()->updateGeometry();
                qApp->processEvents();
-               int delta = scrollArea->widget()->width() - scrollArea->viewport()->width();
+               int delta = ui->scrollArea->widget()->width() - ui->scrollArea->viewport()->width();
                if(delta > 0)
                {
                        this->resize(qMin(this->width() + delta, maximumWidth), this->height());
                }
        }
-       else if(idx == tabWidget->indexOf(tabSourceFiles))
+       else if(idx == ui->tabWidget->indexOf(ui->tabSourceFiles))
        {
-               m_dropNoteLabel->setGeometry(0, 0, sourceFileView->width(), sourceFileView->height());
+               m_dropNoteLabel->setGeometry(0, 0, ui->sourceFileView->width(), ui->sourceFileView->height());
        }
-       else if(idx == tabWidget->indexOf(tabOutputDir))
+       else if(idx == ui->tabWidget->indexOf(ui->tabOutputDir))
        {
                if(!m_fileSystemModel)
                {
@@ -1667,12 +1773,27 @@ void MainWindow::tabActionActivated(QAction *action)
                int index = action->data().toInt(&ok);
                if(ok)
                {
-                       tabWidget->setCurrentIndex(index);
+                       ui->tabWidget->setCurrentIndex(index);
                }
        }
 }
 
 // =========================================================
+// Menubar slots
+// =========================================================
+
+/*
+ * Handle corner widget Event
+ */
+void MainWindow::cornerWidgetEventOccurred(QWidget *sender, QEvent *event)
+{
+       if(event->type() == QEvent::MouseButtonPress)
+       {
+               QTimer::singleShot(0, this, SLOT(checkUpdatesActionActivated()));
+       }
+}
+
+// =========================================================
 // View menu slots
 // =========================================================
 
@@ -1696,35 +1817,35 @@ void MainWindow::styleActionActivated(QAction *action)
        switch(m_settings->interfaceStyle())
        {
        case 1:
-               if(actionStyleCleanlooks->isEnabled())
+               if(ui->actionStyleCleanlooks->isEnabled())
                {
-                       actionStyleCleanlooks->setChecked(true);
+                       ui->actionStyleCleanlooks->setChecked(true);
                        QApplication::setStyle(new QCleanlooksStyle());
                        break;
                }
        case 2:
-               if(actionStyleWindowsVista->isEnabled())
+               if(ui->actionStyleWindowsVista->isEnabled())
                {
-                       actionStyleWindowsVista->setChecked(true);
+                       ui->actionStyleWindowsVista->setChecked(true);
                        QApplication::setStyle(new QWindowsVistaStyle());
                        break;
                }
        case 3:
-               if(actionStyleWindowsXP->isEnabled())
+               if(ui->actionStyleWindowsXP->isEnabled())
                {
-                       actionStyleWindowsXP->setChecked(true);
+                       ui->actionStyleWindowsXP->setChecked(true);
                        QApplication::setStyle(new QWindowsXPStyle());
                        break;
                }
        case 4:
-               if(actionStyleWindowsClassic->isEnabled())
+               if(ui->actionStyleWindowsClassic->isEnabled())
                {
-                       actionStyleWindowsClassic->setChecked(true);
+                       ui->actionStyleWindowsClassic->setChecked(true);
                        QApplication::setStyle(new QWindowsStyle());
                        break;
                }
        default:
-               actionStylePlastique->setChecked(true);
+               ui->actionStylePlastique->setChecked(true);
                QApplication::setStyle(new QPlastiqueStyle());
                break;
        }
@@ -1733,8 +1854,17 @@ void MainWindow::styleActionActivated(QAction *action)
        if(QEvent *e = new QEvent(QEvent::LanguageChange))
        {
                changeEvent(e);
-               LAMEXP_DELETE(e);
+               MUTILS_DELETE(e);
        }
+
+       //Make transparent
+       const type_info &styleType = typeid(*qApp->style());
+       const bool bTransparent = ((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType));
+       MAKE_TRANSPARENT(ui->scrollArea, bTransparent);
+
+       //Also force a re-size event
+       QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+       resizeEvent(NULL);
 }
 
 /*
@@ -1749,7 +1879,7 @@ void MainWindow::languageActionActivated(QAction *action)
                if(lamexp_install_translator(langId))
                {
                        action->setChecked(true);
-                       actionLoadTranslationFromFile->setChecked(false);
+                       ui->actionLoadTranslationFromFile->setChecked(false);
                        m_settings->currentLanguage(langId);
                        m_settings->currentLanguageFile(QString());
                }
@@ -1776,7 +1906,7 @@ void MainWindow::languageFromFileActionActivated(bool checked)
                        {
                                actions.takeFirst()->setChecked(false);
                        }
-                       actionLoadTranslationFromFile->setChecked(true);
+                       ui->actionLoadTranslationFromFile->setChecked(true);
                        m_settings->currentLanguageFile(qmFile);
                }
                else
@@ -1813,7 +1943,7 @@ void MainWindow::disableUpdateReminderActionTriggered(bool checked)
                        m_settings->autoUpdateEnabled(true);
        }
 
-       actionDisableUpdateReminder->setChecked(!m_settings->autoUpdateEnabled());
+       ui->actionDisableUpdateReminder->setChecked(!m_settings->autoUpdateEnabled());
 }
 
 /*
@@ -1839,7 +1969,7 @@ void MainWindow::disableSoundsActionTriggered(bool checked)
                        m_settings->soundsEnabled(true);
        }
 
-       actionDisableSounds->setChecked(!m_settings->soundsEnabled());
+       ui->actionDisableSounds->setChecked(!m_settings->soundsEnabled());
 }
 
 /*
@@ -1865,7 +1995,7 @@ void MainWindow::disableNeroAacNotificationsActionTriggered(bool checked)
                        m_settings->neroAacNotificationsEnabled(true);
        }
 
-       actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
+       ui->actionDisableNeroAacNotifications->setChecked(!m_settings->neroAacNotificationsEnabled());
 }
 
 /*
@@ -1891,7 +2021,7 @@ void MainWindow::disableSlowStartupNotificationsActionTriggered(bool checked)
                        m_settings->antivirNotificationsEnabled(true);
        }
 
-       actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
+       ui->actionDisableSlowStartupNotifications->setChecked(!m_settings->antivirNotificationsEnabled());
 }
 
 /*
@@ -1908,7 +2038,7 @@ void MainWindow::importCueSheetActionTriggered(bool checked)
                        int result = 0;
                        QString selectedCueFile;
 
-                       if(USE_NATIVE_FILE_DIALOG)
+                       if(lamexp_themes_enabled())
                        {
                                selectedCueFile = QFileDialog::getOpenFileName(this, tr("Open Cue Sheet"), m_settings->mostRecentInputPath(), QString("%1 (*.cue)").arg(tr("Cue Sheet File")));
                        }
@@ -1927,9 +2057,18 @@ void MainWindow::importCueSheetActionTriggered(bool checked)
                        if(!selectedCueFile.isEmpty())
                        {
                                m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath());
-                               CueImportDialog *cueImporter  = new CueImportDialog(this, m_fileListModel, selectedCueFile);
+                               CueImportDialog *cueImporter  = new CueImportDialog(this, m_fileListModel, selectedCueFile, m_settings);
                                result = cueImporter->exec();
-                               LAMEXP_DELETE(cueImporter);
+                               MUTILS_DELETE(cueImporter);
+                       }
+
+                       if(result == QDialog::Accepted)
+                       {
+                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                               ui->sourceFileView->update();
+                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                               ui->sourceFileView->scrollToBottom();
+                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
                        }
 
                        if(result != (-1)) break;
@@ -1947,6 +2086,7 @@ void MainWindow::showDropBoxWidgetActionTriggered(bool checked)
        if(!m_dropBox->isVisible())
        {
                m_dropBox->show();
+               QTimer::singleShot(2500, m_dropBox, SLOT(showToolTip()));
        }
        
        lamexp_blink_window(m_dropBox);
@@ -1980,7 +2120,7 @@ void MainWindow::checkForBetaUpdatesActionTriggered(bool checked)
                        m_settings->autoUpdateCheckBeta(false);
        }
 
-       actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta());
+       ui->actionCheckForBetaUpdates->setChecked(m_settings->autoUpdateCheckBeta());
 
        if(checkUpdatesNow)
        {
@@ -2014,7 +2154,7 @@ void MainWindow::hibernateComputerActionTriggered(bool checked)
                        m_settings->hibernateComputer(false);
        }
 
-       actionHibernateComputer->setChecked(m_settings->hibernateComputer());
+       ui->actionHibernateComputer->setChecked(m_settings->hibernateComputer());
 }
 
 /*
@@ -2042,11 +2182,11 @@ void MainWindow::disableShellIntegrationActionTriggered(bool checked)
                        m_settings->shellIntegrationEnabled(true);
        }
 
-       actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
+       ui->actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
        
-       if(lamexp_portable_mode() && actionDisableShellIntegration->isChecked())
+       if(lamexp_portable_mode() && ui->actionDisableShellIntegration->isChecked())
        {
-               actionDisableShellIntegration->setEnabled(false);
+               ui->actionDisableShellIntegration->setEnabled(false);
        }
 }
 
@@ -2086,7 +2226,7 @@ void MainWindow::documentActionActivated(void)
                        else
                        {
                                QFile source(resource.filePath());
-                               QFile output(QString("%1/%2.%3.html").arg(lamexp_temp_folder2(), document.baseName(), lamexp_rand_str().left(8)));
+                               QFile output(QString("%1/%2.%3.html").arg(MUtils::temp_folder(), document.baseName(), MUtils::rand_str().left(8)));
                                if(source.open(QIODevice::ReadOnly) && output.open(QIODevice::ReadWrite))
                                {
                                        output.write(source.readAll());
@@ -2132,7 +2272,7 @@ void MainWindow::addFilesButtonClicked(void)
 
        TEMP_HIDE_DROPBOX
        (
-               if(USE_NATIVE_FILE_DIALOG)
+               if(lamexp_themes_enabled())
                {
                        QStringList fileTypeFilters = DecoderRegistry::getSupportedTypes();
                        QStringList selectedFiles = QFileDialog::getOpenFileNames(this, tr("Add file(s)"), m_settings->mostRecentInputPath(), fileTypeFilters.join(";;"));
@@ -2174,7 +2314,7 @@ void MainWindow::openFolderActionActivated(void)
        {
                TEMP_HIDE_DROPBOX
                (
-                       if(USE_NATIVE_FILE_DIALOG)
+                       if(lamexp_themes_enabled())
                        {
                                selectedFolder = QFileDialog::getExistingDirectory(this, tr("Add Folder"), m_settings->mostRecentInputPath());
                        }
@@ -2203,11 +2343,11 @@ void MainWindow::openFolderActionActivated(void)
  */
 void MainWindow::removeFileButtonClicked(void)
 {
-       if(sourceFileView->currentIndex().isValid())
+       if(ui->sourceFileView->currentIndex().isValid())
        {
-               int iRow = sourceFileView->currentIndex().row();
-               m_fileListModel->removeFile(sourceFileView->currentIndex());
-               sourceFileView->selectRow(iRow < m_fileListModel->rowCount() ? iRow : m_fileListModel->rowCount()-1);
+               int iRow = ui->sourceFileView->currentIndex().row();
+               m_fileListModel->removeFile(ui->sourceFileView->currentIndex());
+               ui->sourceFileView->selectRow(iRow < m_fileListModel->rowCount() ? iRow : m_fileListModel->rowCount()-1);
        }
 }
 
@@ -2224,11 +2364,11 @@ void MainWindow::clearFilesButtonClicked(void)
  */
 void MainWindow::fileUpButtonClicked(void)
 {
-       if(sourceFileView->currentIndex().isValid())
+       if(ui->sourceFileView->currentIndex().isValid())
        {
-               int iRow = sourceFileView->currentIndex().row() - 1;
-               m_fileListModel->moveFile(sourceFileView->currentIndex(), -1);
-               sourceFileView->selectRow(iRow >= 0 ? iRow : 0);
+               int iRow = ui->sourceFileView->currentIndex().row() - 1;
+               m_fileListModel->moveFile(ui->sourceFileView->currentIndex(), -1);
+               ui->sourceFileView->selectRow(iRow >= 0 ? iRow : 0);
        }
 }
 
@@ -2237,11 +2377,11 @@ void MainWindow::fileUpButtonClicked(void)
  */
 void MainWindow::fileDownButtonClicked(void)
 {
-       if(sourceFileView->currentIndex().isValid())
+       if(ui->sourceFileView->currentIndex().isValid())
        {
-               int iRow = sourceFileView->currentIndex().row() + 1;
-               m_fileListModel->moveFile(sourceFileView->currentIndex(), 1);
-               sourceFileView->selectRow(iRow < m_fileListModel->rowCount() ? iRow : m_fileListModel->rowCount()-1);
+               int iRow = ui->sourceFileView->currentIndex().row() + 1;
+               m_fileListModel->moveFile(ui->sourceFileView->currentIndex(), 1);
+               ui->sourceFileView->selectRow(iRow < m_fileListModel->rowCount() ? iRow : m_fileListModel->rowCount()-1);
        }
 }
 
@@ -2254,19 +2394,19 @@ void MainWindow::showDetailsButtonClicked(void)
 
        int iResult = 0;
        MetaInfoDialog *metaInfoDialog = new MetaInfoDialog(this);
-       QModelIndex index = sourceFileView->currentIndex();
+       QModelIndex index = ui->sourceFileView->currentIndex();
 
        while(index.isValid())
        {
                if(iResult > 0)
                {
                        index = m_fileListModel->index(index.row() + 1, index.column()); 
-                       sourceFileView->selectRow(index.row());
+                       ui->sourceFileView->selectRow(index.row());
                }
                if(iResult < 0)
                {
                        index = m_fileListModel->index(index.row() - 1, index.column()); 
-                       sourceFileView->selectRow(index.row());
+                       ui->sourceFileView->selectRow(index.row());
                }
 
                AudioFileModel &file = (*m_fileListModel)[index];
@@ -2275,17 +2415,18 @@ void MainWindow::showDetailsButtonClicked(void)
                        iResult = metaInfoDialog->exec(file, index.row() > 0, index.row() < m_fileListModel->rowCount() - 1);
                );
                
+               //Copy all info to Meta Info tab
                if(iResult == INT_MAX)
                {
                        m_metaInfoModel->assignInfoFrom(file);
-                       tabWidget->setCurrentIndex(tabWidget->indexOf(tabMetaData));
+                       ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->tabMetaData));
                        break;
                }
 
                if(!iResult) break;
        }
 
-       LAMEXP_DELETE(metaInfoDialog);
+       MUTILS_DELETE(metaInfoDialog);
        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
        sourceFilesScrollbarMoved(0);
 }
@@ -2312,7 +2453,7 @@ void MainWindow::sourceFilesContextMenu(const QPoint &pos)
  */
 void MainWindow::sourceFilesScrollbarMoved(int)
 {
-       sourceFileView->resizeColumnToContents(0);
+       ui->sourceFileView->resizeColumnToContents(0);
 }
 
 /*
@@ -2320,45 +2461,17 @@ void MainWindow::sourceFilesScrollbarMoved(int)
  */
 void MainWindow::previewContextActionTriggered(void)
 {
-       const static char *appNames[3] = {"smplayer_portable.exe", "smplayer.exe", "mplayer.exe"};
-       const static wchar_t *registryKey = L"SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{DB9E4EAB-2717-499F-8D56-4CC8A644AB60}";
-       
-       QModelIndex index = sourceFileView->currentIndex();
+       QModelIndex index = ui->sourceFileView->currentIndex();
        if(!index.isValid())
        {
                return;
        }
 
-       QString mplayerPath;
-       HKEY registryKeyHandle;
-
-       if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryKey, 0, KEY_READ, &registryKeyHandle) == ERROR_SUCCESS)
-       {
-               wchar_t Buffer[4096];
-               DWORD BuffSize = sizeof(wchar_t*) * 4096;
-               if(RegQueryValueExW(registryKeyHandle, L"InstallLocation", 0, 0, reinterpret_cast<BYTE*>(Buffer), &BuffSize) == ERROR_SUCCESS)
-               {
-                       mplayerPath = QString::fromUtf16(reinterpret_cast<const unsigned short*>(Buffer));
-               }
-       }
-
-       if(!mplayerPath.isEmpty())
+       if(!lamexp_open_media_file(m_fileListModel->getFile(index).filePath()))
        {
-               QDir mplayerDir(mplayerPath);
-               if(mplayerDir.exists())
-               {
-                       for(int i = 0; i < 3; i++)
-                       {
-                               if(mplayerDir.exists(appNames[i]))
-                               {
-                                       QProcess::startDetached(mplayerDir.absoluteFilePath(appNames[i]), QStringList() << QDir::toNativeSeparators(m_fileListModel->getFile(index).filePath()));
-                                       return;
-                               }
-                       }
-               }
+               qDebug("Player not found, falling back to default application...");
+               QDesktopServices::openUrl(QString("file:///").append(m_fileListModel->getFile(index).filePath()));
        }
-       
-       QDesktopServices::openUrl(QString("file:///").append(m_fileListModel->getFile(index).filePath()));
 }
 
 /*
@@ -2366,12 +2479,12 @@ void MainWindow::previewContextActionTriggered(void)
  */
 void MainWindow::findFileContextActionTriggered(void)
 {
-       QModelIndex index = sourceFileView->currentIndex();
+       QModelIndex index = ui->sourceFileView->currentIndex();
        if(index.isValid())
        {
                QString systemRootPath;
 
-               QDir systemRoot(lamexp_known_folder(lamexp_folder_systemfolder));
+               QDir systemRoot(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER));
                if(systemRoot.exists() && systemRoot.cdUp())
                {
                        systemRootPath = systemRoot.canonicalPath();
@@ -2394,6 +2507,73 @@ void MainWindow::findFileContextActionTriggered(void)
 }
 
 /*
+ * Add all dropped files
+ */
+void MainWindow::handleDroppedFiles(void)
+{
+       ABORT_IF_BUSY;
+
+       static const int MIN_COUNT = 16;
+       const QString bannerText = tr("Loading dropped files or folders, please wait...");
+       bool bUseBanner = false;
+
+       SHOW_BANNER_CONDITIONALLY(bUseBanner, (m_droppedFileList->count() >= MIN_COUNT), bannerText);
+
+       QStringList droppedFiles;
+       while(!m_droppedFileList->isEmpty())
+       {
+               QFileInfo file(m_droppedFileList->takeFirst().toLocalFile());
+               QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+
+               if(!file.exists())
+               {
+                       continue;
+               }
+
+               if(file.isFile())
+               {
+                       qDebug("Dropped File: %s", MUTILS_UTF8(file.canonicalFilePath()));
+                       droppedFiles << file.canonicalFilePath();
+                       continue;
+               }
+
+               if(file.isDir())
+               {
+                       qDebug("Dropped Folder: %s", MUTILS_UTF8(file.canonicalFilePath()));
+                       QFileInfoList list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+                       if(list.count() > 0)
+                       {
+                               SHOW_BANNER_CONDITIONALLY(bUseBanner, (list.count() >= MIN_COUNT), bannerText);
+                               for(QFileInfoList::ConstIterator iter = list.constBegin(); iter != list.constEnd(); iter++)
+                               {
+                                       droppedFiles << (*iter).canonicalFilePath();
+                               }
+                       }
+                       else
+                       {
+                               list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+                               SHOW_BANNER_CONDITIONALLY(bUseBanner, (list.count() >= MIN_COUNT), bannerText);
+                               for(QFileInfoList::ConstIterator iter = list.constBegin(); iter != list.constEnd(); iter++)
+                               {
+                                       qDebug("Descending to Folder: %s", MUTILS_UTF8((*iter).canonicalFilePath()));
+                                       m_droppedFileList->prepend(QUrl::fromLocalFile((*iter).canonicalFilePath()));
+                               }
+                       }
+               }
+       }
+       
+       if(bUseBanner)
+       {
+               m_banner->close();
+       }
+
+       if(!droppedFiles.isEmpty())
+       {
+               addFiles(droppedFiles);
+       }
+}
+
+/*
  * Add all pending files
  */
 void MainWindow::handleDelayedFiles(void)
@@ -2405,15 +2585,16 @@ void MainWindow::handleDelayedFiles(void)
                return;
        }
 
-       if(m_banner->isVisible())
+       if(BANNER_VISIBLE)
        {
                m_delayedFileTimer->start(5000);
                return;
        }
-
+       
+       WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
+       tabPageChanged(ui->tabWidget->currentIndex(), true);
+       
        QStringList selectedFiles;
-       tabWidget->setCurrentIndex(0);
-
        while(!m_delayedFileList->isEmpty())
        {
                QFileInfo currentFile = QFileInfo(m_delayedFileList->takeFirst());
@@ -2436,7 +2617,7 @@ void MainWindow::exportCsvContextActionTriggered(void)
        (
                QString selectedCsvFile;
        
-               if(USE_NATIVE_FILE_DIALOG)
+               if(lamexp_themes_enabled())
                {
                        selectedCsvFile = QFileDialog::getSaveFileName(this, tr("Save CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
                }
@@ -2487,7 +2668,7 @@ void MainWindow::importCsvContextActionTriggered(void)
        (
                QString selectedCsvFile;
        
-               if(USE_NATIVE_FILE_DIALOG)
+               if(lamexp_themes_enabled())
                {
                        selectedCsvFile = QFileDialog::getOpenFileName(this, tr("Open CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
                }
@@ -2550,21 +2731,23 @@ void MainWindow::sourceModelChanged(void)
  */
 void MainWindow::outputFolderViewClicked(const QModelIndex &index)
 {
-       if(index.isValid() && (outputFolderView->currentIndex() != index))
+       if(index.isValid() && (ui->outputFolderView->currentIndex() != index))
        {
-               outputFolderView->setCurrentIndex(index);
+               ui->outputFolderView->setCurrentIndex(index);
        }
        
        if(m_fileSystemModel && index.isValid())
        {
                QString selectedDir = m_fileSystemModel->filePath(index);
                if(selectedDir.length() < 3) selectedDir.append(QDir::separator());
-               outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
+               ui->outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
+               ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
                m_settings->outputDir(selectedDir);
        }
        else
        {
-               outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir()));
+               ui->outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir()));
+               ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
        }
 }
 
@@ -2594,13 +2777,13 @@ void MainWindow::gotoDesktopButtonClicked(void)
        
        if(!desktopPath.isEmpty() && QDir(desktopPath).exists())
        {
-               outputFolderView->setCurrentIndex(m_fileSystemModel->index(desktopPath));
-               outputFolderViewClicked(outputFolderView->currentIndex());
+               ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(desktopPath));
+               outputFolderViewClicked(ui->outputFolderView->currentIndex());
                CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
        }
        else
        {
-               buttonGotoDesktop->setEnabled(false);
+               ui->buttonGotoDesktop->setEnabled(false);
        }
 }
 
@@ -2619,13 +2802,13 @@ void MainWindow::gotoHomeFolderButtonClicked(void)
        
        if(!homePath.isEmpty() && QDir(homePath).exists())
        {
-               outputFolderView->setCurrentIndex(m_fileSystemModel->index(homePath));
-               outputFolderViewClicked(outputFolderView->currentIndex());
+               ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(homePath));
+               outputFolderViewClicked(ui->outputFolderView->currentIndex());
                CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
        }
        else
        {
-               buttonGotoHome->setEnabled(false);
+               ui->buttonGotoHome->setEnabled(false);
        }
 }
 
@@ -2644,13 +2827,13 @@ void MainWindow::gotoMusicFolderButtonClicked(void)
        
        if(!musicPath.isEmpty() && QDir(musicPath).exists())
        {
-               outputFolderView->setCurrentIndex(m_fileSystemModel->index(musicPath));
-               outputFolderViewClicked(outputFolderView->currentIndex());
+               ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(musicPath));
+               outputFolderViewClicked(ui->outputFolderView->currentIndex());
                CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
        }
        else
        {
-               buttonGotoMusic->setEnabled(false);
+               ui->buttonGotoMusic->setEnabled(false);
        }
 }
 
@@ -2672,13 +2855,13 @@ void MainWindow::gotoFavoriteFolder(void)
                QDir path(item->data().toString());
                if(path.exists())
                {
-                       outputFolderView->setCurrentIndex(m_fileSystemModel->index(path.canonicalPath()));
-                       outputFolderViewClicked(outputFolderView->currentIndex());
+                       ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(path.canonicalPath()));
+                       outputFolderViewClicked(ui->outputFolderView->currentIndex());
                        CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
                }
                else
                {
-                       MessageBeep(MB_ICONERROR);
+                       lamexp_beep(lamexp_beep_error);
                        m_outputFolderFavoritesMenu->removeAction(item);
                        item->deleteLater();
                }
@@ -2698,39 +2881,41 @@ void MainWindow::makeFolderButtonClicked(void)
                return;
        }
 
-       QDir basePath(m_fileSystemModel->fileInfo(outputFolderView->currentIndex()).absoluteFilePath());
+       QDir basePath(m_fileSystemModel->fileInfo(ui->outputFolderView->currentIndex()).absoluteFilePath());
        QString suggestedName = tr("New Folder");
 
-       if(!m_metaData->fileArtist().isEmpty() && !m_metaData->fileAlbum().isEmpty())
+       if(!m_metaData->artist().isEmpty() && !m_metaData->album().isEmpty())
        {
-               suggestedName = QString("%1 - %2").arg(m_metaData->fileArtist(), m_metaData->fileAlbum());
+               suggestedName = QString("%1 - %2").arg(m_metaData->artist(),m_metaData->album());
        }
-       else if(!m_metaData->fileArtist().isEmpty())
+       else if(!m_metaData->artist().isEmpty())
        {
-               suggestedName = m_metaData->fileArtist();
+               suggestedName = m_metaData->artist();
        }
-       else if(!m_metaData->fileAlbum().isEmpty())
+       else if(!m_metaData->album().isEmpty())
        {
-               suggestedName = m_metaData->fileAlbum();
+               suggestedName =m_metaData->album();
        }
        else
        {
                for(int i = 0; i < m_fileListModel->rowCount(); i++)
                {
-                       AudioFileModel audioFile = m_fileListModel->getFile(m_fileListModel->index(i, 0));
-                       if(!audioFile.fileAlbum().isEmpty() || !audioFile.fileArtist().isEmpty())
+                       const AudioFileModel &audioFile = m_fileListModel->getFile(m_fileListModel->index(i, 0));
+                       const AudioFileModel_MetaInfo &fileMetaInfo = audioFile.metaInfo();
+
+                       if(!fileMetaInfo.album().isEmpty() || !fileMetaInfo.artist().isEmpty())
                        {
-                               if(!audioFile.fileArtist().isEmpty() && !audioFile.fileAlbum().isEmpty())
+                               if(!fileMetaInfo.artist().isEmpty() && !fileMetaInfo.album().isEmpty())
                                {
-                                       suggestedName = QString("%1 - %2").arg(audioFile.fileArtist(), audioFile.fileAlbum());
+                                       suggestedName = QString("%1 - %2").arg(fileMetaInfo.artist(), fileMetaInfo.album());
                                }
-                               else if(!audioFile.fileArtist().isEmpty())
+                               else if(!fileMetaInfo.artist().isEmpty())
                                {
-                                       suggestedName = audioFile.fileArtist();
+                                       suggestedName = fileMetaInfo.artist();
                                }
-                               else if(!audioFile.fileAlbum().isEmpty())
+                               else if(!fileMetaInfo.album().isEmpty())
                                {
-                                       suggestedName = audioFile.fileAlbum();
+                                       suggestedName = fileMetaInfo.album();
                                }
                                break;
                        }
@@ -2750,7 +2935,7 @@ void MainWindow::makeFolderButtonClicked(void)
 
                        if(folderName.isEmpty())
                        {
-                               MessageBeep(MB_ICONERROR);
+                               lamexp_beep(lamexp_beep_error);
                                continue;
                        }
 
@@ -2768,7 +2953,7 @@ void MainWindow::makeFolderButtonClicked(void)
                                if(createdDir.cd(newFolder))
                                {
                                        QModelIndex newIndex = m_fileSystemModel->index(createdDir.canonicalPath());
-                                       outputFolderView->setCurrentIndex(newIndex);
+                                       ui->outputFolderView->setCurrentIndex(newIndex);
                                        outputFolderViewClicked(newIndex);
                                        CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
                                }
@@ -2787,7 +2972,7 @@ void MainWindow::makeFolderButtonClicked(void)
  */
 void MainWindow::saveToSourceFolderChanged(void)
 {
-       m_settings->outputToSourceDir(saveToSourceFolderCheckBox->isChecked());
+       m_settings->outputToSourceDir(ui->saveToSourceFolderCheckBox->isChecked());
 }
 
 /*
@@ -2795,7 +2980,7 @@ void MainWindow::saveToSourceFolderChanged(void)
  */
 void MainWindow::prependRelativePathChanged(void)
 {
-       m_settings->prependRelativeSourcePath(prependRelativePathCheckBox->isChecked());
+       m_settings->prependRelativeSourcePath(ui->prependRelativePathCheckBox->isChecked());
 }
 
 /*
@@ -2823,9 +3008,9 @@ void MainWindow::showFolderContextActionTriggered(void)
                return;
        }
 
-       QString path = QDir::toNativeSeparators(m_fileSystemModel->filePath(outputFolderView->currentIndex()));
+       QString path = QDir::toNativeSeparators(m_fileSystemModel->filePath(ui->outputFolderView->currentIndex()));
        if(!path.endsWith(QDir::separator())) path.append(QDir::separator());
-       ShellExecuteW(reinterpret_cast<HWND>(this->winId()), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW);
+       lamexp_exec_shell(this, path, true);
 }
 
 /*
@@ -2838,11 +3023,34 @@ void MainWindow::refreshFolderContextActionTriggered(void)
 }
 
 /*
+ * Go one directory up
+ */
+void MainWindow::goUpFolderContextActionTriggered(void)
+{
+       QModelIndex current = ui->outputFolderView->currentIndex();
+       if(current.isValid())
+       {
+               QModelIndex parent = current.parent();
+               if(parent.isValid())
+               {
+                       
+                       ui->outputFolderView->setCurrentIndex(parent);
+                       outputFolderViewClicked(parent);
+               }
+               else
+               {
+                       lamexp_beep(lamexp_beep_warning);
+               }
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+       }
+}
+
+/*
  * Add current folder to favorites
  */
 void MainWindow::addFavoriteFolderActionTriggered(void)
 {
-       QString path = m_fileSystemModel->filePath(outputFolderView->currentIndex());
+       QString path = m_fileSystemModel->filePath(ui->outputFolderView->currentIndex());
        QStringList favorites = m_settings->favoriteOutputFolders().split("|", QString::SkipEmptyParts);
 
        if(!favorites.contains(path, Qt::CaseInsensitive))
@@ -2852,7 +3060,7 @@ void MainWindow::addFavoriteFolderActionTriggered(void)
        }
        else
        {
-               MessageBeep(MB_ICONWARNING);
+               lamexp_beep(lamexp_beep_warning);
        }
 
        m_settings->favoriteOutputFolders(favorites.join("|"));
@@ -2864,14 +3072,14 @@ void MainWindow::addFavoriteFolderActionTriggered(void)
  */
 void MainWindow::outputFolderEditFinished(void)
 {
-       if(outputFolderEdit->isHidden())
+       if(ui->outputFolderEdit->isHidden())
        {
                return; //Not currently in edit mode!
        }
        
        bool ok = false;
        
-       QString text = QDir::fromNativeSeparators(outputFolderEdit->text().trimmed());
+       QString text = QDir::fromNativeSeparators(ui->outputFolderEdit->text().trimmed());
        while(text.startsWith('"') || text.startsWith('/')) text = text.right(text.length() - 1).trimmed();
        while(text.endsWith('"') || text.endsWith('/')) text = text.left(text.length() - 1).trimmed();
 
@@ -2880,7 +3088,7 @@ void MainWindow::outputFolderEditFinished(void)
 
        if(!((text.length() >= 2) && text.at(0).isLetter() && text.at(1) == QChar(':')))
        {
-               text = QString("%1/%2").arg(QDir::fromNativeSeparators(outputFolderLabel->text()), text);
+               text = QString("%1/%2").arg(QDir::fromNativeSeparators(ui->outputFolderLabel->text()), text);
        }
 
        if(text.length() == 2) text += "/"; /* "X:" => "X:/" */
@@ -2894,7 +3102,7 @@ void MainWindow::outputFolderEditFinished(void)
                        if(index.isValid())
                        {
                                ok = true;
-                               outputFolderView->setCurrentIndex(index);
+                               ui->outputFolderView->setCurrentIndex(index);
                                outputFolderViewClicked(index);
                                break;
                        }
@@ -2905,7 +3113,7 @@ void MainWindow::outputFolderEditFinished(void)
                        if(index.isValid())
                        {
                                ok = true;
-                               outputFolderView->setCurrentIndex(index);
+                               ui->outputFolderView->setCurrentIndex(index);
                                outputFolderViewClicked(index);
                                break;
                        }
@@ -2914,11 +3122,11 @@ void MainWindow::outputFolderEditFinished(void)
                text = text.left(text.length() - 1).trimmed();
        }
 
-       outputFolderEdit->setVisible(false);
-       outputFolderLabel->setVisible(true);
-       outputFolderView->setEnabled(true);
+       ui->outputFolderEdit->setVisible(false);
+       ui->outputFolderLabel->setVisible(true);
+       ui->outputFolderView->setEnabled(true);
 
-       if(!ok) MessageBeep(MB_ICONERROR);
+       if(!ok) lamexp_beep(lamexp_beep_error);
        CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
 }
 
@@ -2935,9 +3143,9 @@ void MainWindow::initOutputFolderModel(void)
 
                if(m_fileSystemModel)
                {
-                       SET_MODEL(outputFolderView, NULL);
-                       LAMEXP_DELETE(m_fileSystemModel);
-                       outputFolderView->repaint();
+                       SET_MODEL(ui->outputFolderView, NULL);
+                       MUTILS_DELETE(m_fileSystemModel);
+                       ui->outputFolderView->repaint();
                }
 
                if(m_fileSystemModel = new QFileSystemModelEx())
@@ -2946,16 +3154,16 @@ void MainWindow::initOutputFolderModel(void)
                        connect(m_fileSystemModel, SIGNAL(directoryLoaded(QString)), this, SLOT(outputFolderDirectoryLoaded(QString)));
                        connect(m_fileSystemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(outputFolderRowsInserted(QModelIndex,int,int)));
 
-                       SET_MODEL(outputFolderView, m_fileSystemModel);
-                       outputFolderView->header()->setStretchLastSection(true);
-                       outputFolderView->header()->hideSection(1);
-                       outputFolderView->header()->hideSection(2);
-                       outputFolderView->header()->hideSection(3);
+                       SET_MODEL(ui->outputFolderView, m_fileSystemModel);
+                       ui->outputFolderView->header()->setStretchLastSection(true);
+                       ui->outputFolderView->header()->hideSection(1);
+                       ui->outputFolderView->header()->hideSection(2);
+                       ui->outputFolderView->header()->hideSection(3);
                
                        m_fileSystemModel->setRootPath("");
                        QModelIndex index = m_fileSystemModel->index(m_settings->outputDir());
-                       if(index.isValid()) outputFolderView->setCurrentIndex(index);
-                       outputFolderViewClicked(outputFolderView->currentIndex());
+                       if(index.isValid()) ui->outputFolderView->setCurrentIndex(index);
+                       outputFolderViewClicked(ui->outputFolderView->currentIndex());
                }
 
                CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
@@ -2976,7 +3184,7 @@ void MainWindow::initOutputFolderModel_doAsync(void)
        else
        {
                QTimer::singleShot(125, m_outputFolderNoteBox, SLOT(hide()));
-               outputFolderView->setFocus();
+               ui->outputFolderView->setFocus();
        }
 }
 
@@ -2985,7 +3193,7 @@ void MainWindow::initOutputFolderModel_doAsync(void)
  */
 void MainWindow::centerOutputFolderModel(void)
 {
-       if(outputFolderView->isVisible())
+       if(ui->outputFolderView->isVisible())
        {
                centerOutputFolderModel_doAsync();
                QTimer::singleShot(125, this, SLOT(centerOutputFolderModel_doAsync()));
@@ -2997,12 +3205,12 @@ void MainWindow::centerOutputFolderModel(void)
  */
 void MainWindow::centerOutputFolderModel_doAsync(void)
 {
-       if(outputFolderView->isVisible())
+       if(ui->outputFolderView->isVisible())
        {
                m_outputFolderViewCentering = true;
-               const QModelIndex index = outputFolderView->currentIndex();
-               outputFolderView->scrollTo(index, QAbstractItemView::PositionAtCenter);
-               outputFolderView->setFocus();
+               const QModelIndex index = ui->outputFolderView->currentIndex();
+               ui->outputFolderView->scrollTo(index, QAbstractItemView::PositionAtCenter);
+               ui->outputFolderView->setFocus();
        }
 }
 
@@ -3051,7 +3259,7 @@ void MainWindow::outputFolderViewEventOccurred(QWidget *sender, QEvent *event)
        case QEvent::FocusIn:
        case QEvent::FocusOut:
        case QEvent::TouchEnd:
-               outputFolderViewClicked(outputFolderView->currentIndex());
+               outputFolderViewClicked(ui->outputFolderView->currentIndex());
                break;
        }
 }
@@ -3064,85 +3272,79 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
        QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
        QPoint pos = (mouseEvent) ? mouseEvent->pos() : QPoint();
 
-       if(sender == outputFolderLabel)
+       if(sender == ui->outputFolderLabel)
        {
                switch(event->type())
                {
                case QEvent::MouseButtonPress:
                        if(mouseEvent && (mouseEvent->button() == Qt::LeftButton))
                        {
-                               QString path = outputFolderLabel->text();
+                               QString path = ui->outputFolderLabel->text();
                                if(!path.endsWith(QDir::separator())) path.append(QDir::separator());
-                               ShellExecuteW(reinterpret_cast<HWND>(this->winId()), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW);
+                               lamexp_exec_shell(this, path, true);
                        }
                        break;
                case QEvent::Enter:
-                       outputFolderLabel->setForegroundRole(QPalette::Link);
+                       ui->outputFolderLabel->setForegroundRole(QPalette::Link);
                        break;
                case QEvent::Leave:
-                       outputFolderLabel->setForegroundRole(QPalette::WindowText);
+                       ui->outputFolderLabel->setForegroundRole(QPalette::WindowText);
                        break;
                }
        }
-       else if(sender == outputFoldersFovoritesLabel)
+
+       if((sender == ui->outputFoldersFovoritesLabel) || (sender == ui->outputFoldersEditorLabel) || (sender == ui->outputFoldersGoUpLabel))
        {
-               switch(event->type())
+               const type_info &styleType = typeid(*qApp->style());
+               if((typeid(QPlastiqueStyle) == styleType) || (typeid(QWindowsStyle) == styleType))
                {
-               case QEvent::Enter:
-                       outputFoldersFovoritesLabel->setFrameShadow(QFrame::Raised);
-                       break;
-               case QEvent::MouseButtonPress:
-                       outputFoldersFovoritesLabel->setFrameShadow(QFrame::Sunken);
-                       break;
-               case QEvent::MouseButtonRelease:
-                       outputFoldersFovoritesLabel->setFrameShadow(QFrame::Raised);
-                       if(mouseEvent)
+                       switch(event->type())
                        {
-                               if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
-                               {
-                                       if(outputFolderView->isEnabled())
-                                       {
-                                               m_outputFolderFavoritesMenu->popup(sender->mapToGlobal(pos));
-                                       }
-                               }
+                       case QEvent::Enter:
+                               dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
+                               break;
+                       case QEvent::MouseButtonPress:
+                               dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
+                               break;
+                       case QEvent::MouseButtonRelease:
+                               dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
+                               break;
+                       case QEvent::Leave:
+                               dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
+                               break;
                        }
-                       break;
-               case QEvent::Leave:
-                       outputFoldersFovoritesLabel->setFrameShadow(QFrame::Plain);
-                       break;
                }
-       }
-       else if(sender == outputFoldersEditorLabel)
-       {
-               switch(event->type())
+               else
                {
-               case QEvent::Enter:
-                       outputFoldersEditorLabel->setFrameShadow(QFrame::Raised);
-                       break;
-               case QEvent::MouseButtonPress:
-                       outputFoldersEditorLabel->setFrameShadow(QFrame::Sunken);
-                       break;
-               case QEvent::MouseButtonRelease:
-                       outputFoldersEditorLabel->setFrameShadow(QFrame::Raised);
-                       if(mouseEvent)
+                       dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
+               }
+
+               if((event->type() == QEvent::MouseButtonRelease) && ui->outputFolderView->isEnabled() && (mouseEvent))
+               {
+                       if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
                        {
-                               if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
+                               if(sender == ui->outputFoldersFovoritesLabel)
                                {
-                                       if(outputFolderView->isEnabled())
-                                       {
-                                               outputFolderView->setEnabled(false);
-                                               outputFolderLabel->setVisible(false);
-                                               outputFolderEdit->setVisible(true);
-                                               outputFolderEdit->setText(outputFolderLabel->text());
-                                               outputFolderEdit->selectAll();
-                                               outputFolderEdit->setFocus();
-                                       }
+                                       m_outputFolderFavoritesMenu->popup(sender->mapToGlobal(pos));
+                               }
+                               else if(sender == ui->outputFoldersEditorLabel)
+                               {
+                                       ui->outputFolderView->setEnabled(false);
+                                       ui->outputFolderLabel->setVisible(false);
+                                       ui->outputFolderEdit->setVisible(true);
+                                       ui->outputFolderEdit->setText(ui->outputFolderLabel->text());
+                                       ui->outputFolderEdit->selectAll();
+                                       ui->outputFolderEdit->setFocus();
+                               }
+                               else if(sender == ui->outputFoldersGoUpLabel)
+                               {
+                                       QTimer::singleShot(0, this, SLOT(goUpFolderContextActionTriggered()));
+                               }
+                               else
+                               {
+                                       THROW("Oups, this is not supposed to happen!");
                                }
                        }
-                       break;
-               case QEvent::Leave:
-                       outputFoldersEditorLabel->setFrameShadow(QFrame::Plain);
-                       break;
                }
        }
 }
@@ -3158,7 +3360,7 @@ void MainWindow::editMetaButtonClicked(void)
 {
        ABORT_IF_BUSY;
 
-       const QModelIndex index = metaDataView->currentIndex();
+       const QModelIndex index = ui->metaDataView->currentIndex();
 
        if(index.isValid())
        {
@@ -3166,7 +3368,7 @@ void MainWindow::editMetaButtonClicked(void)
        
                if(index.row() == 4)
                {
-                       m_settings->metaInfoPosition(m_metaData->filePosition());
+                       m_settings->metaInfoPosition(m_metaData->position());
                }
        }
 }
@@ -3185,7 +3387,7 @@ void MainWindow::clearMetaButtonClicked(void)
  */
 void MainWindow::metaTagsEnabledChanged(void)
 {
-       m_settings->writeMetaTags(writeMetaDataCheckBox->isChecked());
+       m_settings->writeMetaTags(ui->writeMetaDataCheckBox->isChecked());
 }
 
 /*
@@ -3193,7 +3395,7 @@ void MainWindow::metaTagsEnabledChanged(void)
  */
 void MainWindow::playlistEnabledChanged(void)
 {
-       m_settings->createPlaylist(generatePlaylistCheckBox->isChecked());
+       m_settings->createPlaylist(ui->generatePlaylistCheckBox->isChecked());
 }
 
 // =========================================================
@@ -3205,71 +3407,44 @@ void MainWindow::playlistEnabledChanged(void)
  */
 void MainWindow::updateEncoder(int id)
 {
+       /*qWarning("\nupdateEncoder(%d)", id);*/
+
        m_settings->compressionEncoder(id);
+       const AbstractEncoderInfo *info = EncoderRegistry::getEncoderInfo(id);
 
-       switch(m_settings->compressionEncoder())
+       //Update UI controls
+       ui->radioButtonModeQuality       ->setEnabled(info->isModeSupported(SettingsModel::VBRMode));
+       ui->radioButtonModeAverageBitrate->setEnabled(info->isModeSupported(SettingsModel::ABRMode));
+       ui->radioButtonConstBitrate      ->setEnabled(info->isModeSupported(SettingsModel::CBRMode));
+       
+       //Initialize checkbox state
+       if(ui->radioButtonModeQuality->isEnabled())             ui->radioButtonModeQuality->setChecked(true);
+       else if(ui->radioButtonModeAverageBitrate->isEnabled()) ui->radioButtonModeAverageBitrate->setChecked(true);
+       else if(ui->radioButtonConstBitrate->isEnabled())       ui->radioButtonConstBitrate->setChecked(true);
+       else THROW("It appears that the encoder does not support *any* RC mode!");
+
+       //Apply current RC mode
+       const int currentRCMode = EncoderRegistry::loadEncoderMode(m_settings, id);
+       switch(currentRCMode)
        {
-       case SettingsModel::VorbisEncoder:
-               radioButtonModeQuality->setEnabled(true);
-               radioButtonModeAverageBitrate->setEnabled(true);
-               radioButtonConstBitrate->setEnabled(false);
-               if(radioButtonConstBitrate->isChecked()) radioButtonModeQuality->setChecked(true);
-               sliderBitrate->setEnabled(true);
-               break;
-       case SettingsModel::AC3Encoder:
-               radioButtonModeQuality->setEnabled(true);
-               radioButtonModeQuality->setChecked(true);
-               radioButtonModeAverageBitrate->setEnabled(false);
-               radioButtonConstBitrate->setEnabled(true);
-               sliderBitrate->setEnabled(true);
-               break;
-       case SettingsModel::FLACEncoder:
-               radioButtonModeQuality->setEnabled(false);
-               radioButtonModeQuality->setChecked(true);
-               radioButtonModeAverageBitrate->setEnabled(false);
-               radioButtonConstBitrate->setEnabled(false);
-               sliderBitrate->setEnabled(true);
-               break;
-       case SettingsModel::PCMEncoder:
-               radioButtonModeQuality->setEnabled(false);
-               radioButtonModeQuality->setChecked(true);
-               radioButtonModeAverageBitrate->setEnabled(false);
-               radioButtonConstBitrate->setEnabled(false);
-               sliderBitrate->setEnabled(false);
-               break;
-       case SettingsModel::AACEncoder:
-               radioButtonModeQuality->setEnabled(true);
-               radioButtonModeAverageBitrate->setEnabled(!m_fhgEncoderAvailable);
-               if(m_fhgEncoderAvailable && radioButtonModeAverageBitrate->isChecked()) radioButtonConstBitrate->setChecked(true);
-               radioButtonConstBitrate->setEnabled(true);
-               sliderBitrate->setEnabled(true);
-               break;
-       case SettingsModel::DCAEncoder:
-               radioButtonModeQuality->setEnabled(false);
-               radioButtonModeAverageBitrate->setEnabled(false);
-               radioButtonConstBitrate->setEnabled(true);
-               radioButtonConstBitrate->setChecked(true);
-               sliderBitrate->setEnabled(true);
-               break;
-       default:
-               radioButtonModeQuality->setEnabled(true);
-               radioButtonModeAverageBitrate->setEnabled(true);
-               radioButtonConstBitrate->setEnabled(true);
-               sliderBitrate->setEnabled(true);
-               break;
+               case SettingsModel::VBRMode: if(ui->radioButtonModeQuality->isEnabled())        ui->radioButtonModeQuality->setChecked(true);        break;
+               case SettingsModel::ABRMode: if(ui->radioButtonModeAverageBitrate->isEnabled()) ui->radioButtonModeAverageBitrate->setChecked(true); break;
+               case SettingsModel::CBRMode: if(ui->radioButtonConstBitrate->isEnabled())       ui->radioButtonConstBitrate->setChecked(true);       break;
+               default: THROW("updateEncoder(): Unknown rc-mode encountered!");
        }
 
-       if(m_settings->compressionEncoder() == SettingsModel::AACEncoder)
+       //Display encoder description
+       if(const char* description = info->description())
        {
-               const QString encoderName = m_qaacEncoderAvailable ? tr("QAAC (Apple)") : (m_fhgEncoderAvailable ? tr("FHG AAC (Winamp)") : (m_neroEncoderAvailable ? tr("Nero AAC") : tr("Not available!")));
-               labelEncoderInfo->setVisible(true);
-               labelEncoderInfo->setText(tr("Current AAC Encoder: %1").arg(encoderName));
+               ui->labelEncoderInfo->setVisible(true);
+               ui->labelEncoderInfo->setText(tr("Current Encoder: %1").arg(QString::fromUtf8(description)));
        }
        else
        {
-               labelEncoderInfo->setVisible(false);
+               ui->labelEncoderInfo->setVisible(false);
        }
 
+       //Update RC mode!
        updateRCMode(m_modeButtonGroup->checkedId());
 }
 
@@ -3278,86 +3453,50 @@ void MainWindow::updateEncoder(int id)
  */
 void MainWindow::updateRCMode(int id)
 {
-       m_settings->compressionRCMode(id);
+       /*qWarning("updateRCMode(%d)", id);*/
 
-       switch(m_settings->compressionEncoder())
+       //Store new RC mode
+       const int currentEncoder = m_encoderButtonGroup->checkedId();
+       EncoderRegistry::saveEncoderMode(m_settings, currentEncoder, id);
+
+       //Fetch encoder info
+       const AbstractEncoderInfo *info = EncoderRegistry::getEncoderInfo(currentEncoder);
+       const int valueCount = info->valueCount(id);
+
+       //Sanity check
+       if(!info->isModeSupported(id))
        {
-       case SettingsModel::MP3Encoder:
-               switch(m_settings->compressionRCMode())
-               {
-               case SettingsModel::VBRMode:
-                       sliderBitrate->setMinimum(0);
-                       sliderBitrate->setMaximum(9);
-                       break;
-               default:
-                       sliderBitrate->setMinimum(0);
-                       sliderBitrate->setMaximum(13);
-                       break;
-               }
-               break;
-       case SettingsModel::VorbisEncoder:
-               switch(m_settings->compressionRCMode())
-               {
-               case SettingsModel::VBRMode:
-                       sliderBitrate->setMinimum(-2);
-                       sliderBitrate->setMaximum(10);
-                       break;
-               default:
-                       sliderBitrate->setMinimum(4);
-                       sliderBitrate->setMaximum(63);
-                       break;
-               }
-               break;
-       case SettingsModel::AC3Encoder:
-               switch(m_settings->compressionRCMode())
-               {
-               case SettingsModel::VBRMode:
-                       sliderBitrate->setMinimum(0);
-                       sliderBitrate->setMaximum(16);
-                       break;
-               default:
-                       sliderBitrate->setMinimum(0);
-                       sliderBitrate->setMaximum(18);
-                       break;
-               }
-               break;
-       case SettingsModel::AACEncoder:
-               switch(m_settings->compressionRCMode())
-               {
-               case SettingsModel::VBRMode:
-                       sliderBitrate->setMinimum(0);
-                       sliderBitrate->setMaximum(20);
-                       break;
-               default:
-                       sliderBitrate->setMinimum(4);
-                       sliderBitrate->setMaximum(63);
-                       break;
-               }
-               break;
-       case SettingsModel::FLACEncoder:
-               sliderBitrate->setMinimum(0);
-               sliderBitrate->setMaximum(8);
-               break;
-       case SettingsModel::OpusEncoder:
-               sliderBitrate->setMinimum(1);
-               sliderBitrate->setMaximum(32);
-               break;
-       case SettingsModel::DCAEncoder:
-               sliderBitrate->setMinimum(1);
-               sliderBitrate->setMaximum(128);
-               break;
-       case SettingsModel::PCMEncoder:
-               sliderBitrate->setMinimum(0);
-               sliderBitrate->setMaximum(2);
-               sliderBitrate->setValue(1);
-               break;
-       default:
-               sliderBitrate->setMinimum(0);
-               sliderBitrate->setMaximum(0);
-               break;
+               qWarning("Attempting to use an unsupported RC mode (%d) with current encoder (%d)!", id, currentEncoder);
+               ui->labelBitrate->setText("(ERROR)");
+               return;
        }
 
-       updateBitrate(sliderBitrate->value());
+       //Update slider min/max values
+       if(valueCount > 0)
+       {
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setEnabled, true);
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMinimum, 0);
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMaximum, valueCount-1);
+       }
+       else
+       {
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setEnabled, false);
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMinimum, 0);
+               WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMaximum, 2);
+       }
+
+       //Now update bitrate/quality value!
+       if(valueCount > 0)
+       {
+               const int currentValue = EncoderRegistry::loadEncoderValue(m_settings, currentEncoder, id);
+               ui->sliderBitrate->setValue(qBound(0, currentValue, valueCount-1));
+               updateBitrate(qBound(0, currentValue, valueCount-1));
+       }
+       else
+       {
+               ui->sliderBitrate->setValue(1);
+               updateBitrate(0);
+       }
 }
 
 /*
@@ -3365,81 +3504,54 @@ void MainWindow::updateRCMode(int id)
  */
 void MainWindow::updateBitrate(int value)
 {
-       m_settings->compressionBitrate(value);
-       
-       switch(m_settings->compressionRCMode())
+       /*qWarning("updateBitrate(%d)", value);*/
+
+       //Load current encoder and RC mode
+       const int currentEncoder = m_encoderButtonGroup->checkedId();
+       const int currentRCMode = m_modeButtonGroup->checkedId();
+
+       //Fetch encoder info
+       const AbstractEncoderInfo *info = EncoderRegistry::getEncoderInfo(currentEncoder);
+       const int valueCount = info->valueCount(currentRCMode);
+
+       //Sanity check
+       if(!info->isModeSupported(currentRCMode))
        {
-       case SettingsModel::VBRMode:
-               switch(m_settings->compressionEncoder())
-               {
-               case SettingsModel::MP3Encoder:
-                       labelBitrate->setText(tr("Quality Level %1").arg(9 - value));
-                       break;
-               case SettingsModel::VorbisEncoder:
-                       labelBitrate->setText(tr("Quality Level %1").arg(value));
-                       break;
-               case SettingsModel::AACEncoder:
-                       labelBitrate->setText(tr("Quality Level %1").arg(QString().sprintf("%.2f", static_cast<double>(value * 5) / 100.0)));
-                       break;
-               case SettingsModel::FLACEncoder:
-                       labelBitrate->setText(tr("Compression %1").arg(value));
-                       break;
-               case SettingsModel::OpusEncoder:
-                       labelBitrate->setText(QString("&asymp; %1 kbps").arg(qMin(500, value * 8)));
-                       break;
-               case SettingsModel::AC3Encoder:
-                       labelBitrate->setText(tr("Quality Level %1").arg(qMin(1024, qMax(0, value * 64))));
-                       break;
-               case SettingsModel::PCMEncoder:
-                       labelBitrate->setText(tr("Uncompressed"));
-                       break;
-               default:
-                       labelBitrate->setText(QString::number(value));
-                       break;
-               }
+               qWarning("Attempting to use an unsupported RC mode (%d) with current encoder (%d)!", currentRCMode, currentEncoder);
+               ui->labelBitrate->setText("(ERROR)");
+               return;
+       }
+
+       //Store new bitrate value
+       if(valueCount > 0)
+       {
+               EncoderRegistry::saveEncoderValue(m_settings, currentEncoder, currentRCMode, qBound(0, value, valueCount-1));
+       }
+
+       //Update bitrate value
+       const int displayValue = (valueCount > 0) ? info->valueAt(currentRCMode, qBound(0, value, valueCount-1)) : INT_MAX;
+       switch(info->valueType(currentRCMode))
+       {
+       case AbstractEncoderInfo::TYPE_BITRATE:
+               ui->labelBitrate->setText(QString("%1 kbps").arg(QString::number(displayValue)));
                break;
-       case SettingsModel::ABRMode:
-               switch(m_settings->compressionEncoder())
-               {
-               case SettingsModel::MP3Encoder:
-                       labelBitrate->setText(QString("&asymp; %1 kbps").arg(SettingsModel::mp3Bitrates[value]));
-                       break;
-               case SettingsModel::FLACEncoder:
-                       labelBitrate->setText(tr("Compression %1").arg(value));
-                       break;
-               case SettingsModel::AC3Encoder:
-                       labelBitrate->setText(QString("&asymp; %1 kbps").arg(SettingsModel::ac3Bitrates[value]));
-                       break;
-               case SettingsModel::PCMEncoder:
-                       labelBitrate->setText(tr("Uncompressed"));
-                       break;
-               default:
-                       labelBitrate->setText(QString("&asymp; %1 kbps").arg(qMin(500, value * 8)));
-                       break;
-               }
+       case AbstractEncoderInfo::TYPE_APPROX_BITRATE:
+               ui->labelBitrate->setText(QString("&asymp; %1 kbps").arg(QString::number(displayValue)));
+               break;
+       case AbstractEncoderInfo::TYPE_QUALITY_LEVEL_INT:
+               ui->labelBitrate->setText(tr("Quality Level %1").arg(QString::number(displayValue)));
+               break;
+       case AbstractEncoderInfo::TYPE_QUALITY_LEVEL_FLT:
+               ui->labelBitrate->setText(tr("Quality Level %1").arg(QString().sprintf("%.2f", double(displayValue)/100.0)));
+               break;
+       case AbstractEncoderInfo::TYPE_COMPRESSION_LEVEL:
+               ui->labelBitrate->setText(tr("Compression %1").arg(QString::number(displayValue)));
+               break;
+       case AbstractEncoderInfo::TYPE_UNCOMPRESSED:
+               ui->labelBitrate->setText(tr("Uncompressed"));
                break;
        default:
-               switch(m_settings->compressionEncoder())
-               {
-               case SettingsModel::MP3Encoder:
-                       labelBitrate->setText(QString("%1 kbps").arg(SettingsModel::mp3Bitrates[value]));
-                       break;
-               case SettingsModel::FLACEncoder:
-                       labelBitrate->setText(tr("Compression %1").arg(value));
-                       break;
-               case SettingsModel::AC3Encoder:
-                       labelBitrate->setText(QString("%1 kbps").arg(SettingsModel::ac3Bitrates[value]));
-                       break;
-               case SettingsModel::DCAEncoder:
-                       labelBitrate->setText(QString("%1 kbps").arg(value * 32));
-                       break;
-               case SettingsModel::PCMEncoder:
-                       labelBitrate->setText(tr("Uncompressed"));
-                       break;
-               default:
-                       labelBitrate->setText(QString("%1 kbps").arg(qMin(500, value * 8)));
-                       break;
-               }
+               THROW("Unknown display value type encountered!");
                break;
        }
 }
@@ -3451,10 +3563,18 @@ void MainWindow::compressionTabEventOccurred(QWidget *sender, QEvent *event)
 {
        static const QUrl helpUrl("http://lamexp.sourceforge.net/doc/FAQ.html#054010d9");
        
-       if((sender == labelCompressionHelp) && (event->type() == QEvent::MouseButtonPress))
+       if((sender == ui->labelCompressionHelp) && (event->type() == QEvent::MouseButtonPress))
        {
                QDesktopServices::openUrl(helpUrl);
        }
+       else if((sender == ui->labelResetEncoders) && (event->type() == QEvent::MouseButtonPress))
+       {
+               PLAY_SOUND_OPTIONAL("blast", true);
+               EncoderRegistry::resetAllEncoders(m_settings);
+               m_settings->compressionEncoder(SettingsModel::MP3Encoder);
+               ui->radioButtonEncoderMP3->setChecked(true);
+               QTimer::singleShot(0, this, SLOT(updateEncoder()));
+       }
 }
 
 // =========================================================
@@ -3470,17 +3590,14 @@ void MainWindow::updateLameAlgoQuality(int value)
 
        switch(value)
        {
-       case 4:
-               text = tr("Best Quality (Very Slow)");
-               break;
        case 3:
-               text = tr("High Quality (Recommended)");
+               text = tr("Best Quality (Slow)");
                break;
        case 2:
-               text = tr("Average Quality (Default)");
+               text = tr("High Quality (Recommended)");
                break;
        case 1:
-               text = tr("Low Quality (Fast)");
+               text = tr("Acceptable Quality (Fast)");
                break;
        case 0:
                text = tr("Poor Quality (Very Fast)");
@@ -3490,15 +3607,15 @@ void MainWindow::updateLameAlgoQuality(int value)
        if(!text.isEmpty())
        {
                m_settings->lameAlgoQuality(value);
-               labelLameAlgoQuality->setText(text);
+               ui->labelLameAlgoQuality->setText(text);
        }
 
-       bool warning = (value == 0), notice = (value == 4);
-       labelLameAlgoQualityWarning->setVisible(warning);
-       labelLameAlgoQualityWarningIcon->setVisible(warning);
-       labelLameAlgoQualityNotice->setVisible(notice);
-       labelLameAlgoQualityNoticeIcon->setVisible(notice);
-       labelLameAlgoQualitySpacer->setVisible(warning || notice);
+       bool warning = (value == 0), notice = (value == 3);
+       ui->labelLameAlgoQualityWarning->setVisible(warning);
+       ui->labelLameAlgoQualityWarningIcon->setVisible(warning);
+       ui->labelLameAlgoQualityNotice->setVisible(notice);
+       ui->labelLameAlgoQualityNoticeIcon->setVisible(notice);
+       ui->labelLameAlgoQualitySpacer->setVisible(warning || notice);
 }
 
 /*
@@ -3514,10 +3631,10 @@ void MainWindow::bitrateManagementEnabledChanged(bool checked)
  */
 void MainWindow::bitrateManagementMinChanged(int value)
 {
-       if(value > spinBoxBitrateManagementMax->value())
+       if(value > ui->spinBoxBitrateManagementMax->value())
        {
-               spinBoxBitrateManagementMin->setValue(spinBoxBitrateManagementMax->value());
-               m_settings->bitrateManagementMinRate(spinBoxBitrateManagementMax->value());
+               ui->spinBoxBitrateManagementMin->setValue(ui->spinBoxBitrateManagementMax->value());
+               m_settings->bitrateManagementMinRate(ui->spinBoxBitrateManagementMax->value());
        }
        else
        {
@@ -3530,10 +3647,10 @@ void MainWindow::bitrateManagementMinChanged(int value)
  */
 void MainWindow::bitrateManagementMaxChanged(int value)
 {
-       if(value < spinBoxBitrateManagementMin->value())
+       if(value < ui->spinBoxBitrateManagementMin->value())
        {
-               spinBoxBitrateManagementMax->setValue(spinBoxBitrateManagementMin->value());
-               m_settings->bitrateManagementMaxRate(spinBoxBitrateManagementMin->value());
+               ui->spinBoxBitrateManagementMax->setValue(ui->spinBoxBitrateManagementMin->value());
+               m_settings->bitrateManagementMaxRate(ui->spinBoxBitrateManagementMin->value());
        }
        else
        {
@@ -3611,10 +3728,9 @@ void MainWindow::aftenFastAllocationChanged(bool checked)
  */
 void MainWindow::opusSettingsChanged(void)
 {
-       m_settings->opusOptimizeFor(comboBoxOpusOptimize->currentIndex());
-       m_settings->opusFramesize(comboBoxOpusFramesize->currentIndex());
-       m_settings->opusComplexity(spinBoxOpusComplexity->value());
-       m_settings->opusExpAnalysis(checkBoxOpusExpAnalysis->isChecked());
+       m_settings->opusFramesize(ui->comboBoxOpusFramesize->currentIndex());
+       m_settings->opusComplexity(ui->spinBoxOpusComplexity->value());
+       m_settings->opusDisableResample(ui->checkBoxOpusDisableResample->isChecked());
 }
 
 /*
@@ -3638,7 +3754,7 @@ void MainWindow::normalizationMaxVolumeChanged(double value)
  */
 void MainWindow::normalizationModeChanged(int mode)
 {
-       m_settings->normalizationFilterEqualizationMode(mode);
+       m_settings->normalizationFilterEQMode(mode);
 }
 
 /*
@@ -3647,7 +3763,7 @@ void MainWindow::normalizationModeChanged(int mode)
 void MainWindow::toneAdjustBassChanged(double value)
 {
        m_settings->toneAdjustBass(static_cast<int>(value * 100.0));
-       spinBoxToneAdjustBass->setPrefix((value > 0) ? "+" : QString());
+       ui->spinBoxToneAdjustBass->setPrefix((value > 0) ? "+" : QString());
 }
 
 /*
@@ -3656,7 +3772,7 @@ void MainWindow::toneAdjustBassChanged(double value)
 void MainWindow::toneAdjustTrebleChanged(double value)
 {
        m_settings->toneAdjustTreble(static_cast<int>(value * 100.0));
-       spinBoxToneAdjustTreble->setPrefix((value > 0) ? "+" : QString());
+       ui->spinBoxToneAdjustTreble->setPrefix((value > 0) ? "+" : QString());
 }
 
 /*
@@ -3664,10 +3780,10 @@ void MainWindow::toneAdjustTrebleChanged(double value)
  */
 void MainWindow::toneAdjustTrebleReset(void)
 {
-       spinBoxToneAdjustBass->setValue(m_settings->toneAdjustBassDefault());
-       spinBoxToneAdjustTreble->setValue(m_settings->toneAdjustTrebleDefault());
-       toneAdjustBassChanged(spinBoxToneAdjustBass->value());
-       toneAdjustTrebleChanged(spinBoxToneAdjustTreble->value());
+       ui->spinBoxToneAdjustBass->setValue(m_settings->toneAdjustBassDefault());
+       ui->spinBoxToneAdjustTreble->setValue(m_settings->toneAdjustTrebleDefault());
+       toneAdjustBassChanged(ui->spinBoxToneAdjustBass->value());
+       toneAdjustTrebleChanged(ui->spinBoxToneAdjustTreble->value());
 }
 
 /*
@@ -3675,31 +3791,31 @@ void MainWindow::toneAdjustTrebleReset(void)
  */
 void MainWindow::customParamsChanged(void)
 {
-       lineEditCustomParamLAME->setText(lineEditCustomParamLAME->text().simplified());
-       lineEditCustomParamOggEnc->setText(lineEditCustomParamOggEnc->text().simplified());
-       lineEditCustomParamNeroAAC->setText(lineEditCustomParamNeroAAC->text().simplified());
-       lineEditCustomParamFLAC->setText(lineEditCustomParamFLAC->text().simplified());
-       lineEditCustomParamAften->setText(lineEditCustomParamAften->text().simplified());
-       lineEditCustomParamOpus->setText(lineEditCustomParamOpus->text().simplified());
+       ui->lineEditCustomParamLAME->setText(ui->lineEditCustomParamLAME->text().simplified());
+       ui->lineEditCustomParamOggEnc->setText(ui->lineEditCustomParamOggEnc->text().simplified());
+       ui->lineEditCustomParamNeroAAC->setText(ui->lineEditCustomParamNeroAAC->text().simplified());
+       ui->lineEditCustomParamFLAC->setText(ui->lineEditCustomParamFLAC->text().simplified());
+       ui->lineEditCustomParamAften->setText(ui->lineEditCustomParamAften->text().simplified());
+       ui->lineEditCustomParamOpus->setText(ui->lineEditCustomParamOpus->text().simplified());
 
        bool customParamsUsed = false;
-       if(!lineEditCustomParamLAME->text().isEmpty()) customParamsUsed = true;
-       if(!lineEditCustomParamOggEnc->text().isEmpty()) customParamsUsed = true;
-       if(!lineEditCustomParamNeroAAC->text().isEmpty()) customParamsUsed = true;
-       if(!lineEditCustomParamFLAC->text().isEmpty()) customParamsUsed = true;
-       if(!lineEditCustomParamAften->text().isEmpty()) customParamsUsed = true;
-       if(!lineEditCustomParamOpus->text().isEmpty()) customParamsUsed = true;
-
-       labelCustomParamsIcon->setVisible(customParamsUsed);
-       labelCustomParamsText->setVisible(customParamsUsed);
-       labelCustomParamsSpacer->setVisible(customParamsUsed);
-
-       m_settings->customParametersLAME(lineEditCustomParamLAME->text());
-       m_settings->customParametersOggEnc(lineEditCustomParamOggEnc->text());
-       m_settings->customParametersAacEnc(lineEditCustomParamNeroAAC->text());
-       m_settings->customParametersFLAC(lineEditCustomParamFLAC->text());
-       m_settings->customParametersAften(lineEditCustomParamAften->text());
-       m_settings->customParametersOpus(lineEditCustomParamOpus->text());
+       if(!ui->lineEditCustomParamLAME->text().isEmpty()) customParamsUsed = true;
+       if(!ui->lineEditCustomParamOggEnc->text().isEmpty()) customParamsUsed = true;
+       if(!ui->lineEditCustomParamNeroAAC->text().isEmpty()) customParamsUsed = true;
+       if(!ui->lineEditCustomParamFLAC->text().isEmpty()) customParamsUsed = true;
+       if(!ui->lineEditCustomParamAften->text().isEmpty()) customParamsUsed = true;
+       if(!ui->lineEditCustomParamOpus->text().isEmpty()) customParamsUsed = true;
+
+       ui->labelCustomParamsIcon->setVisible(customParamsUsed);
+       ui->labelCustomParamsText->setVisible(customParamsUsed);
+       ui->labelCustomParamsSpacer->setVisible(customParamsUsed);
+
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::MP3Encoder,    ui->lineEditCustomParamLAME->text());
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::VorbisEncoder, ui->lineEditCustomParamOggEnc->text());
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::AACEncoder,    ui->lineEditCustomParamNeroAAC->text());
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::FLACEncoder,   ui->lineEditCustomParamFLAC->text());
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::AC3Encoder,    ui->lineEditCustomParamAften->text());
+       EncoderRegistry::saveEncoderCustomParams(m_settings, SettingsModel::OpusEncoder,   ui->lineEditCustomParamOpus->text());
 }
 
 /*
@@ -3715,15 +3831,15 @@ void MainWindow::renameOutputEnabledChanged(bool checked)
  */
 void MainWindow::renameOutputPatternChanged(void)
 {
-       QString temp = lineEditRenamePattern->text().simplified();
-       lineEditRenamePattern->setText(temp.isEmpty() ? m_settings->renameOutputFilesPatternDefault() : temp);
-       m_settings->renameOutputFilesPattern(lineEditRenamePattern->text());
+       QString temp = ui->lineEditRenamePattern->text().simplified();
+       ui->lineEditRenamePattern->setText(temp.isEmpty() ? m_settings->renameOutputFilesPatternDefault() : temp);
+       m_settings->renameOutputFilesPattern(ui->lineEditRenamePattern->text());
 }
 
 /*
  * Rename output files patterm changed
  */
-void MainWindow::renameOutputPatternChanged(const QString &text)
+void MainWindow::renameOutputPatternChanged(const QString &text, bool silent)
 {
        QString pattern(text.simplified());
        
@@ -3735,24 +3851,26 @@ void MainWindow::renameOutputPatternChanged(const QString &text)
        pattern.replace("<Year>", "2001", Qt::CaseInsensitive);
        pattern.replace("<Comment>", "Encoded by LameXP", Qt::CaseInsensitive);
 
-       if(pattern.compare(lamexp_clean_filename(pattern)))
+       const QString patternClean = lamexp_clean_filename(pattern);
+
+       if(pattern.compare(patternClean))
        {
-               if(lineEditRenamePattern->palette().color(QPalette::Text) != Qt::red)
+               if(ui->lineEditRenamePattern->palette().color(QPalette::Text) != Qt::red)
                {
-                       MessageBeep(MB_ICONERROR);
-                       SET_TEXT_COLOR(lineEditRenamePattern, Qt::red);
+                       if(!silent) lamexp_beep(lamexp_beep_error);
+                       SET_TEXT_COLOR(ui->lineEditRenamePattern, Qt::red);
                }
        }
        else
        {
-               if(lineEditRenamePattern->palette().color(QPalette::Text) != Qt::black)
+               if(ui->lineEditRenamePattern->palette() != QPalette())
                {
-                       MessageBeep(MB_ICONINFORMATION);
-                       SET_TEXT_COLOR(lineEditRenamePattern, Qt::black);
+                       if(!silent) lamexp_beep(lamexp_beep_info);
+                       ui->lineEditRenamePattern->setPalette(QPalette());
                }
        }
 
-       labelRanameExample->setText(lamexp_clean_filename(pattern));
+       ui->labelRanameExample->setText(patternClean);
 }
 
 /*
@@ -3762,7 +3880,7 @@ void MainWindow::showRenameMacros(const QString &text)
 {
        if(text.compare("reset", Qt::CaseInsensitive) == 0)
        {
-               lineEditRenamePattern->setText(m_settings->renameOutputFilesPatternDefault());
+               ui->lineEditRenamePattern->setText(m_settings->renameOutputFilesPatternDefault());
                return;
        }
 
@@ -3793,8 +3911,8 @@ void MainWindow::forceStereoDownmixEnabledChanged(bool checked)
  */
 void MainWindow::updateMaximumInstances(int value)
 {
-       labelMaxInstances->setText(tr("%1 Instance(s)").arg(QString::number(value)));
-       m_settings->maximumInstances(checkBoxAutoDetectInstances->isChecked() ? NULL : value);
+       ui->labelMaxInstances->setText(tr("%n Instance(s)", "", value));
+       m_settings->maximumInstances(ui->checkBoxAutoDetectInstances->isChecked() ? NULL : value);
 }
 
 /*
@@ -3802,7 +3920,7 @@ void MainWindow::updateMaximumInstances(int value)
  */
 void MainWindow::autoDetectInstancesChanged(bool checked)
 {
-       m_settings->maximumInstances(checked ? NULL : sliderMaxInstances->value());
+       m_settings->maximumInstances(checked ? NULL : ui->sliderMaxInstances->value());
 }
 
 /*
@@ -3812,7 +3930,7 @@ void MainWindow::browseCustomTempFolderButtonClicked(void)
 {
        QString newTempFolder;
 
-       if(USE_NATIVE_FILE_DIALOG)
+       if(lamexp_themes_enabled())
        {
                newTempFolder = QFileDialog::getExistingDirectory(this, QString(), m_settings->customTempPath());
        }
@@ -3829,11 +3947,11 @@ void MainWindow::browseCustomTempFolderButtonClicked(void)
 
        if(!newTempFolder.isEmpty())
        {
-               QFile writeTest(QString("%1/~%2.tmp").arg(newTempFolder, lamexp_rand_str()));
+               QFile writeTest(QString("%1/~%2.tmp").arg(newTempFolder, MUtils::rand_str()));
                if(writeTest.open(QIODevice::ReadWrite))
                {
                        writeTest.remove();
-                       lineEditCustomTempFolder->setText(QDir::toNativeSeparators(newTempFolder));
+                       ui->lineEditCustomTempFolder->setText(QDir::toNativeSeparators(newTempFolder));
                }
                else
                {
@@ -3877,19 +3995,22 @@ void MainWindow::customParamsHelpRequested(QWidget *obj, QEvent *event)
                }
        }
 
-       if(obj == helpCustomParamLAME)         showCustomParamsHelpScreen("lame.exe", "--longhelp");
-       else if(obj == helpCustomParamOggEnc)  showCustomParamsHelpScreen("oggenc2.exe", "--help");
-       else if(obj == helpCustomParamNeroAAC)
+       if(obj == ui->helpCustomParamLAME)         showCustomParamsHelpScreen("lame.exe", "--longhelp");
+       else if(obj == ui->helpCustomParamOggEnc)  showCustomParamsHelpScreen("oggenc2.exe", "--help");
+       else if(obj == ui->helpCustomParamNeroAAC)
        {
-               if(m_qaacEncoderAvailable)         showCustomParamsHelpScreen("qaac.exe", "--help");
-               else if(m_fhgEncoderAvailable)     showCustomParamsHelpScreen("fhgaacenc.exe", "");
-               else if(m_neroEncoderAvailable)    showCustomParamsHelpScreen("neroAacEnc.exe", "-help");
-               else MessageBeep(MB_ICONERROR);
+               switch(EncoderRegistry::getAacEncoder())
+               {
+                       case SettingsModel::AAC_ENCODER_QAAC: showCustomParamsHelpScreen("qaac.exe", "--help"); break;
+                       case SettingsModel::AAC_ENCODER_FHG : showCustomParamsHelpScreen("fhgaacenc.exe", ""); break;
+                       case SettingsModel::AAC_ENCODER_NERO: showCustomParamsHelpScreen("neroAacEnc.exe", "-help"); break;
+                       default: lamexp_beep(lamexp_beep_error); break;
+               }
        }
-       else if(obj == helpCustomParamFLAC)    showCustomParamsHelpScreen("flac.exe", "--help");
-       else if(obj == helpCustomParamAften)   showCustomParamsHelpScreen("aften.exe", "-h");
-       else if(obj == helpCustomParamOpus)    showCustomParamsHelpScreen("opusenc_std.exe", "--help");
-       else MessageBeep(MB_ICONERROR);
+       else if(obj == ui->helpCustomParamFLAC)    showCustomParamsHelpScreen("flac.exe", "--help");
+       else if(obj == ui->helpCustomParamAften)   showCustomParamsHelpScreen("aften.exe", "-h");
+       else if(obj == ui->helpCustomParamOpus)    showCustomParamsHelpScreen("opusenc.exe", "--help");
+       else lamexp_beep(lamexp_beep_error);
 }
 
 /*
@@ -3900,35 +4021,36 @@ void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QStri
        const QString binary = lamexp_lookup_tool(toolName);
        if(binary.isEmpty())
        {
-               MessageBeep(MB_ICONERROR);
+               lamexp_beep(lamexp_beep_error);
                qWarning("customParamsHelpRequested: Binary could not be found!");
                return;
        }
 
-       QProcess *process = new QProcess();
-       process->setProcessChannelMode(QProcess::MergedChannels);
-       process->setReadChannel(QProcess::StandardOutput);
-       process->start(binary, command.isEmpty() ? QStringList() : QStringList() << command);
+       QProcess process;
+       MUtils::init_process(process, QFileInfo(binary).absolutePath());
+
+       process.start(binary, command.isEmpty() ? QStringList() : QStringList() << command);
+
        qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 
-       if(process->waitForStarted(15000))
+       if(process.waitForStarted(15000))
        {
                qApp->processEvents();
-               process->waitForFinished(15000);
+               process.waitForFinished(15000);
        }
        
-       if(process->state() != QProcess::NotRunning)
+       if(process.state() != QProcess::NotRunning)
        {
-               process->kill();
-               process->waitForFinished(-1);
+               process.kill();
+               process.waitForFinished(-1);
        }
 
        qApp->restoreOverrideCursor();
        QStringList output; bool spaceFlag = true;
 
-       while(process->canReadLine())
+       while(process.canReadLine())
        {
-               QString temp = QString::fromUtf8(process->readLine());
+               QString temp = QString::fromUtf8(process.readLine());
                TRIM_STRING_RIGHT(temp);
                if(temp.isEmpty())
                {
@@ -3940,17 +4062,15 @@ void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QStri
                }
        }
 
-       LAMEXP_DELETE(process);
-
        if(output.count() < 1)
        {
                qWarning("Empty output, cannot show help screen!");
-               MessageBeep(MB_ICONERROR);
+               lamexp_beep(lamexp_beep_error);
        }
 
        LogViewDialog *dialog = new LogViewDialog(this);
        TEMP_HIDE_DROPBOX( dialog->exec(output); );
-       LAMEXP_DELETE(dialog);
+       MUTILS_DELETE(dialog);
 }
 
 void MainWindow::overwriteModeChanged(int id)
@@ -3959,8 +4079,8 @@ void MainWindow::overwriteModeChanged(int id)
        {
                if(QMessageBox::warning(this, tr("Overwrite Mode"), tr("Warning: This mode may overwrite existing files with no way to revert!"), tr("Continue"), tr("Revert"), QString(), 1) != 0)
                {
-                       radioButtonOverwriteModeKeepBoth->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_KeepBoth);
-                       radioButtonOverwriteModeSkipFile->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_SkipFile);
+                       ui->radioButtonOverwriteModeKeepBoth->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_KeepBoth);
+                       ui->radioButtonOverwriteModeSkipFile->setChecked(m_settings->overwriteMode() == SettingsModel::Overwrite_SkipFile);
                        return;
                }
        }
@@ -3973,43 +4093,48 @@ void MainWindow::overwriteModeChanged(int id)
  */
 void MainWindow::resetAdvancedOptionsButtonClicked(void)
 {
-       sliderLameAlgoQuality->setValue(m_settings->lameAlgoQualityDefault());
-       spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRateDefault());
-       spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRateDefault());
-       spinBoxNormalizationFilter->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolumeDefault()) / 100.0);
-       spinBoxToneAdjustBass->setValue(static_cast<double>(m_settings->toneAdjustBassDefault()) / 100.0);
-       spinBoxToneAdjustTreble->setValue(static_cast<double>(m_settings->toneAdjustTrebleDefault()) / 100.0);
-       spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSizeDefault());
-       spinBoxOpusComplexity->setValue(m_settings->opusComplexityDefault());
-       comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelModeDefault());
-       comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRateDefault());
-       comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfileDefault());
-       comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault());
-       comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault());
-       comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationModeDefault());
-       comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeForDefault());
-       comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesizeDefault());
-       SET_CHECKBOX_STATE(checkBoxBitrateManagement, m_settings->bitrateManagementEnabledDefault());
-       SET_CHECKBOX_STATE(checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2PassDefault());
-       SET_CHECKBOX_STATE(checkBoxNormalizationFilter, m_settings->normalizationFilterEnabledDefault());
-       SET_CHECKBOX_STATE(checkBoxAutoDetectInstances, (m_settings->maximumInstancesDefault() < 1));
-       SET_CHECKBOX_STATE(checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabledDefault());
-       SET_CHECKBOX_STATE(checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocationDefault());
-       SET_CHECKBOX_STATE(checkBoxRenameOutput, m_settings->renameOutputFilesEnabledDefault());
-       SET_CHECKBOX_STATE(checkBoxForceStereoDownmix, m_settings->forceStereoDownmixDefault());
-       SET_CHECKBOX_STATE(checkBoxOpusExpAnalysis, m_settings->opusExpAnalysisDefault());
-       lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault());
-       lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault());
-       lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEncDefault());
-       lineEditCustomParamFLAC->setText(m_settings->customParametersFLACDefault());
-       lineEditCustomParamOpus->setText(m_settings->customParametersFLACDefault());
-       lineEditCustomTempFolder->setText(QDir::toNativeSeparators(m_settings->customTempPathDefault()));
-       lineEditRenamePattern->setText(m_settings->renameOutputFilesPatternDefault());
-       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_KeepBoth) radioButtonOverwriteModeKeepBoth->click();
-       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_SkipFile) radioButtonOverwriteModeSkipFile->click();
-       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_Replaces) radioButtonOverwriteModeReplaces->click();
+       PLAY_SOUND_OPTIONAL("blast", true);
+
+       ui->sliderLameAlgoQuality->setValue(m_settings->lameAlgoQualityDefault());
+       ui->spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRateDefault());
+       ui->spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRateDefault());
+       ui->spinBoxNormalizationFilter->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolumeDefault()) / 100.0);
+       ui->spinBoxToneAdjustBass->setValue(static_cast<double>(m_settings->toneAdjustBassDefault()) / 100.0);
+       ui->spinBoxToneAdjustTreble->setValue(static_cast<double>(m_settings->toneAdjustTrebleDefault()) / 100.0);
+       ui->spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSizeDefault());
+       ui->spinBoxOpusComplexity->setValue(m_settings->opusComplexityDefault());
+       ui->comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelModeDefault());
+       ui->comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRateDefault());
+       ui->comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfileDefault());
+       ui->comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault());
+       ui->comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault());
+       ui->comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEQModeDefault());
+       ui->comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesizeDefault());
+
+       SET_CHECKBOX_STATE(ui->checkBoxBitrateManagement, m_settings->bitrateManagementEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2PassDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilter, m_settings->normalizationFilterEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxAutoDetectInstances, (m_settings->maximumInstancesDefault() < 1));
+       SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocationDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxRenameOutput, m_settings->renameOutputFilesEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxForceStereoDownmix, m_settings->forceStereoDownmixDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxOpusDisableResample, m_settings->opusDisableResampleDefault());
+       
+       ui->lineEditCustomParamLAME   ->setText(m_settings->customParametersLAMEDefault());
+       ui->lineEditCustomParamOggEnc ->setText(m_settings->customParametersOggEncDefault());
+       ui->lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEncDefault());
+       ui->lineEditCustomParamFLAC   ->setText(m_settings->customParametersFLACDefault());
+       ui->lineEditCustomParamOpus   ->setText(m_settings->customParametersOpusEncDefault());
+       ui->lineEditCustomTempFolder  ->setText(QDir::toNativeSeparators(m_settings->customTempPathDefault()));
+       ui->lineEditRenamePattern     ->setText(m_settings->renameOutputFilesPatternDefault());
+
+       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_KeepBoth) ui->radioButtonOverwriteModeKeepBoth->click();
+       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_SkipFile) ui->radioButtonOverwriteModeSkipFile->click();
+       if(m_settings->overwriteModeDefault() == SettingsModel::Overwrite_Replaces) ui->radioButtonOverwriteModeReplaces->click();
+
        customParamsChanged();
-       scrollArea->verticalScrollBar()->setValue(0);
+       ui->scrollArea->verticalScrollBar()->setValue(0);
 }
 
 // =========================================================
@@ -4021,7 +4146,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
  */
 void MainWindow::notifyOtherInstance(void)
 {
-       if(!m_banner->isVisible())
+       if(!(BANNER_VISIBLE))
        {
                QMessageBox msgBox(QMessageBox::Warning, tr("Already Running"), tr("LameXP is already running, please use the running instance!"), QMessageBox::NoButton, this, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint);
                msgBox.exec();
@@ -4035,13 +4160,13 @@ void MainWindow::addFileDelayed(const QString &filePath, bool tryASAP)
 {
        if(tryASAP && !m_delayedFileTimer->isActive())
        {
-               qDebug("Received file: %s", filePath.toUtf8().constData());
+               qDebug("Received file: %s", MUTILS_UTF8(filePath));
                m_delayedFileList->append(filePath);
                QTimer::singleShot(0, this, SLOT(handleDelayedFiles()));
        }
        
        m_delayedFileTimer->stop();
-       qDebug("Received file: %s", filePath.toUtf8().constData());
+       qDebug("Received file: %s", MUTILS_UTF8(filePath));
        m_delayedFileList->append(filePath);
        m_delayedFileTimer->start(5000);
 }
@@ -4051,7 +4176,7 @@ void MainWindow::addFileDelayed(const QString &filePath, bool tryASAP)
  */
 void MainWindow::addFilesDelayed(const QStringList &filePaths, bool tryASAP)
 {
-       if(tryASAP && !m_delayedFileTimer->isActive())
+       if(tryASAP && (!m_delayedFileTimer->isActive()))
        {
                qDebug("Received %d file(s).", filePaths.count());
                m_delayedFileList->append(filePaths);
@@ -4071,7 +4196,7 @@ void MainWindow::addFilesDelayed(const QStringList &filePaths, bool tryASAP)
  */
 void MainWindow::addFolderDelayed(const QString &folderPath, bool recursive)
 {
-       if(!m_banner->isVisible())
+       if(!(BANNER_VISIBLE))
        {
                addFolder(folderPath, recursive, true);
        }