OSDN Git Service

Set creation/modified time of the encoded file the same value as the original file...
[lamexp/LameXP.git] / src / Dialog_MainWindow.cpp
index 6f5b542..69042c8 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 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
@@ -40,7 +40,7 @@
 #include "Model_Settings.h"
 #include "Model_FileList.h"
 #include "Model_FileSystem.h"
-#include "WinSevenTaskbar.h"
+#include "Model_FileExts.h"
 #include "Registry_Encoder.h"
 #include "Registry_Decoder.h"
 #include "Encoder_Abstract.h"
 //Mutils includes
 #include <MUtils/Global.h>
 #include <MUtils/OSSupport.h>
+#include <MUtils/GUI.h>
+#include <MUtils/Exception.h>
+#include <MUtils/Sound.h>
+#include <MUtils/Translation.h>
 #include <MUtils/Version.h>
 
 //Qt includes
 #include <QScrollBar>
 
 ////////////////////////////////////////////////////////////
-// Helper macros
+// Constants
 ////////////////////////////////////////////////////////////
 
-#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)
+static const unsigned int IDM_ABOUTBOX = 0xEFF0;
+static const char *g_hydrogen_audio_url = "http://wiki.hydrogenaud.io/index.php?title=Main_Page";
+static const char *g_documents_base_url = "http://lamexp.sourceforge.net/doc";
 
-#define SHOW_BANNER_ARG(TXT, ARG) do \
-{ \
-       INIT_BANNER(); \
-       m_banner->show((TXT), (ARG)); \
-} \
-while(0)
+////////////////////////////////////////////////////////////
+// Helper Macros
+////////////////////////////////////////////////////////////
 
+#define BANNER_VISIBLE ((!m_banner.isNull()) && m_banner->isVisible())
 
-#define SHOW_BANNER_CONDITIONALLY(FLAG, TEST, TXT) do \
+#define INIT_BANNER() do \
 { \
-       if((!(FLAG)) && ((TEST))) \
+       if(m_banner.isNull()) \
        { \
-               INIT_BANNER(); \
-               m_banner->show((TXT)); \
-               FLAG = true; \
+               m_banner.reset(new WorkingBanner(this)); \
        } \
 } \
 while(0)
@@ -122,117 +108,163 @@ while(0)
 { \
        if(BANNER_VISIBLE || m_delayedFileTimer->isActive() || (QApplication::activeModalWidget() != NULL)) \
        { \
-               lamexp_beep(lamexp_beep_warning); \
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN); \
                return; \
        } \
 } \
 while(0)
 
-#define SET_TEXT_COLOR(WIDGET, COLOR) do \
+#define PLAY_SOUND_OPTIONAL(NAME, ASYNC) do \
 { \
-       QPalette _palette = WIDGET->palette(); \
-       _palette.setColor(QPalette::WindowText, (COLOR)); \
-       _palette.setColor(QPalette::Text, (COLOR)); \
-       WIDGET->setPalette(_palette); \
+       if(m_settings->soundsEnabled()) MUtils::Sound::play_sound((NAME), (ASYNC)); \
 } \
 while(0)
 
-#define SET_FONT_BOLD(WIDGET,BOLD) do \
+#define SHOW_CORNER_WIDGET(FLAG) do \
 { \
-       QFont _font = WIDGET->font(); \
-       _font.setBold(BOLD); \
-       WIDGET->setFont(_font); \
+       if(QWidget *cornerWidget = ui->menubar->cornerWidget()) \
+       { \
+               cornerWidget->setVisible((FLAG)); \
+       } \
 } \
 while(0)
 
-#define TEMP_HIDE_DROPBOX(CMD) do \
-{ \
-       bool _dropBoxVisible = m_dropBox->isVisible(); \
-       if(_dropBoxVisible) m_dropBox->hide(); \
-       do { CMD } while(0); \
-       if(_dropBoxVisible) m_dropBox->show(); \
-} \
-while(0)
+#define LINK(URL) \
+       (QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "&minus;")))
 
-#define SET_MODEL(VIEW, MODEL) do \
-{ \
-       QItemSelectionModel *_tmp = (VIEW)->selectionModel(); \
-       (VIEW)->setModel(MODEL); \
-       MUTILS_DELETE(_tmp); \
-} \
-while(0)
+#define LINK_EX(URL, NAME) \
+       (QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(NAME).replace("-", "&minus;")))
 
-#define SET_CHECKBOX_STATE(CHCKBX, STATE) do \
-{ \
-       if((CHCKBX)->isChecked() != (STATE)) \
-       { \
-               (CHCKBX)->click(); \
-       } \
-       if((CHCKBX)->isChecked() != (STATE)) \
-       { \
-               qWarning("Warning: Failed to set checkbox " #CHCKBX " state!"); \
-       } \
-} \
-while(0)
+#define FSLINK(PATH) \
+       (QString("<a href=\"file:///%1\">%2</a>").arg(PATH).arg(QString(PATH).replace("-", "&minus;")))
 
-#define TRIM_STRING_RIGHT(STR) do \
-{ \
-       while((STR.length() > 0) && STR[STR.length()-1].isSpace()) STR.chop(1); \
-} \
-while(0)
+#define CENTER_CURRENT_OUTPUT_FOLDER_DELAYED() \
+       QTimer::singleShot(125, this, SLOT(centerOutputFolderModel()))
 
-#define MAKE_TRANSPARENT(WIDGET, FLAG) do \
-{ \
-       QPalette _p = (WIDGET)->palette(); \
-       _p.setColor(QPalette::Background, Qt::transparent); \
-       (WIDGET)->setPalette(FLAG ? _p : QPalette()); \
-} \
-while(0)
+////////////////////////////////////////////////////////////
+// Static Functions
+////////////////////////////////////////////////////////////
 
-#define WITH_BLOCKED_SIGNALS(WIDGET, CMD, ...) do \
-{ \
-       const bool _flag = (WIDGET)->blockSignals(true); \
-       (WIDGET)->CMD(__VA_ARGS__); \
-       if(!(_flag)) { (WIDGET)->blockSignals(false); } \
-} \
-while(0)
+static inline void SET_TEXT_COLOR(QWidget *const widget, const QColor &color)
+{
+       QPalette _palette = widget->palette();
+       _palette.setColor(QPalette::WindowText, (color));
+       _palette.setColor(QPalette::Text, (color));
+       widget->setPalette(_palette);
+}
 
-#define PLAY_SOUND_OPTIONAL(NAME, ASYNC) do \
-{ \
-       if(m_settings->soundsEnabled()) lamexp_play_sound((NAME), (ASYNC)); \
-} \
-while(0)
+static inline void SET_FONT_BOLD(QWidget *const widget, const bool &bold)
+{ 
+       QFont _font = widget->font();
+       _font.setBold(bold);
+       widget->setFont(_font);
+}
 
-#define SHOW_CORNER_WIDGET(FLAG) do \
-{ \
-       if(QWidget *cornerWidget = ui->menubar->cornerWidget()) \
-       { \
-               cornerWidget->setVisible((FLAG)); \
-       } \
-} \
-while(0)
+static inline void SET_FONT_BOLD(QAction *const widget, const bool &bold)
+{ 
+       QFont _font = widget->font();
+       _font.setBold(bold);
+       widget->setFont(_font);
+}
 
-#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 CENTER_CURRENT_OUTPUT_FOLDER_DELAYED QTimer::singleShot(125, this, SLOT(centerOutputFolderModel()))
+static inline void SET_MODEL(QAbstractItemView *const view, QAbstractItemModel *const model)
+{
+       QItemSelectionModel *_tmp = view->selectionModel();
+       view->setModel(model);
+       MUTILS_DELETE(_tmp);
+}
 
-static const unsigned int IDM_ABOUTBOX = 0xEFF0;
-static const char *g_hydrogen_audio_url = "http://wiki.hydrogenaud.io/index.php?title=Main_Page";
+static inline void SET_CHECKBOX_STATE(QCheckBox *const chckbx, const bool &state)
+{
+       const bool isDisabled = (!chckbx->isEnabled());
+       if(isDisabled)
+       {
+               chckbx->setEnabled(true);
+       }
+       if(chckbx->isChecked() != state)
+       {
+               chckbx->click();
+       }
+       if(chckbx->isChecked() != state)
+       {
+               qWarning("Warning: Failed to set checkbox %p state!", chckbx);
+       }
+       if(isDisabled)
+       {
+               chckbx->setEnabled(false);
+       }
+}
+
+static inline void TRIM_STRING_RIGHT(QString &str)
+{
+       while((str.length() > 0) && str[str.length()-1].isSpace())
+       {
+               str.chop(1);
+       }
+}
+
+static inline void MAKE_TRANSPARENT(QWidget *const widget, const bool &flag)
+{
+       QPalette _p = widget->palette(); \
+       _p.setColor(QPalette::Background, Qt::transparent);
+       widget->setPalette(flag ? _p : QPalette());
+}
+
+template <typename T>
+static QList<T>& INVERT_LIST(QList<T> &list)
+{
+       if(!list.isEmpty())
+       {
+               const int limit = list.size() / 2, maxIdx = list.size() - 1;
+               for(int k = 0; k < limit; k++) list.swap(k, maxIdx - k);
+       }
+       return list;
+}
+
+////////////////////////////////////////////////////////////
+// Helper Classes
+////////////////////////////////////////////////////////////
+
+class WidgetHideHelper
+{
+public:
+       WidgetHideHelper(QWidget *const widget) : m_widget(widget), m_visible(widget && widget->isVisible()) { if(m_widget && m_visible) m_widget->hide(); }
+       ~WidgetHideHelper(void)                                                                              { if(m_widget && m_visible) m_widget->show(); }
+private:
+       QWidget *const m_widget;
+       const bool m_visible;
+};
+
+class SignalBlockHelper
+{
+public:
+       SignalBlockHelper(QObject *const object) : m_object(object), m_flag(object && object->blockSignals(true)) {}
+       ~SignalBlockHelper(void) { if(m_object && (!m_flag)) m_object->blockSignals(false); }
+private:
+       QObject *const m_object;
+       const bool m_flag;
+};
+
+class FileListBlockHelper
+{
+public:
+       FileListBlockHelper(FileListModel *const fileList) : m_fileList(fileList) { if(m_fileList) m_fileList->setBlockUpdates(true);  }
+       ~FileListBlockHelper(void)                                                { if(m_fileList) m_fileList->setBlockUpdates(false); }
+private:
+       FileListModel *const m_fileList;
+};
 
 ////////////////////////////////////////////////////////////
 // Constructor
 ////////////////////////////////////////////////////////////
 
-MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *metaInfo, SettingsModel *settingsModel, QWidget *parent)
+MainWindow::MainWindow(MUtils::IPCChannel *const ipcChannel, FileListModel *const fileListModel, AudioFileModel_MetaInfo *const metaInfo, SettingsModel *const settingsModel, QWidget *const parent)
 :
        QMainWindow(parent),
        ui(new Ui::MainWindow),
        m_fileListModel(fileListModel),
        m_metaData(metaInfo),
        m_settings(settingsModel),
-       m_windowIcon(NULL),
-       m_fileSystemModel(NULL),
-       m_banner(NULL),
        m_accepted(false),
        m_firstTimeShown(true),
        m_outputFolderViewCentering(false),
@@ -243,7 +275,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        setWindowFlags(windowFlags() ^ Qt::WindowMaximizeButtonHint);
 
        //Create window icon
-       m_windowIcon = lamexp_set_window_icon(this, lamexp_app_icon(), true);
+       MUtils::GUI::set_window_icon(this, lamexp_app_icon(), true);
 
        //Register meta types
        qRegisterMetaType<AudioFileModel>("AudioFileModel");
@@ -258,17 +290,17 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabPageChanged(int)));
 
        //Add system menu
-       lamexp_append_sysmenu(this, IDM_ABOUTBOX, "About...");
+       MUtils::GUI::sysmenu_append(this, IDM_ABOUTBOX, "About...");
 
        //Setup corner widget
        QLabel *cornerWidget = new QLabel(ui->menubar);
-       m_evenFilterCornerWidget = new CustomEventFilter;
+       m_evenFilterCornerWidget.reset(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*)));
+       cornerWidget->installEventFilter(m_evenFilterCornerWidget.data());
+       connect(m_evenFilterCornerWidget.data(), SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(cornerWidgetEventOccurred(QWidget*, QEvent*)));
        ui->menubar->setCornerWidget(cornerWidget);
 
        //--------------------------------
@@ -276,21 +308,21 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        //--------------------------------
 
        ui->sourceFileView->setModel(m_fileListModel);
-       ui->sourceFileView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       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.reset(new QLabel(ui->sourceFileView));
        m_dropNoteLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-       SET_FONT_BOLD(m_dropNoteLabel, true);
-       SET_TEXT_COLOR(m_dropNoteLabel, Qt::darkGray);
-       m_sourceFilesContextMenu = new QMenu();
-       m_showDetailsContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/zoom.png"), "N/A");
-       m_previewContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/sound.png"), "N/A");
-       m_findFileContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/folder_go.png"), "N/A");
+       SET_FONT_BOLD(m_dropNoteLabel.data(), true);
+       SET_TEXT_COLOR(m_dropNoteLabel.data(), Qt::darkGray);
+       m_sourceFilesContextMenu.reset(new QMenu());
+       m_showDetailsContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/zoom.png"),         "N/A");
+       m_previewContextAction     = m_sourceFilesContextMenu->addAction(QIcon(":/icons/sound.png"),        "N/A");
+       m_findFileContextAction    = m_sourceFilesContextMenu->addAction(QIcon(":/icons/folder_go.png"),    "N/A");
        m_sourceFilesContextMenu->addSeparator();
-       m_exportCsvContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/table_save.png"), "N/A");
-       m_importCsvContextAction = m_sourceFilesContextMenu->addAction(QIcon(":/icons/folder_table.png"), "N/A");
+       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(ui->buttonAddFiles,                      SIGNAL(clicked()),                          this, SLOT(addFilesButtonClicked()));
@@ -321,63 +353,56 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        ui->outputFolderView->setContextMenuPolicy(Qt::CustomContextMenu);
        ui->outputFolderView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
-       m_evenFilterOutputFolderMouse = new CustomEventFilter;
-       ui->outputFoldersGoUpLabel->installEventFilter(m_evenFilterOutputFolderMouse);
-       ui->outputFoldersEditorLabel->installEventFilter(m_evenFilterOutputFolderMouse);
-       ui->outputFoldersFovoritesLabel->installEventFilter(m_evenFilterOutputFolderMouse);
-       ui->outputFolderLabel->installEventFilter(m_evenFilterOutputFolderMouse);
+       m_evenFilterOutputFolderMouse.reset(new CustomEventFilter);
+       ui->outputFoldersGoUpLabel     ->installEventFilter(m_evenFilterOutputFolderMouse.data());
+       ui->outputFoldersEditorLabel   ->installEventFilter(m_evenFilterOutputFolderMouse.data());
+       ui->outputFoldersFovoritesLabel->installEventFilter(m_evenFilterOutputFolderMouse.data());
+       ui->outputFolderLabel          ->installEventFilter(m_evenFilterOutputFolderMouse.data());
 
-       m_evenFilterOutputFolderView = new CustomEventFilter;
-       ui->outputFolderView->installEventFilter(m_evenFilterOutputFolderView);
+       m_evenFilterOutputFolderView.reset(new CustomEventFilter);
+       ui->outputFolderView->installEventFilter(m_evenFilterOutputFolderView.data());
 
        SET_CHECKBOX_STATE(ui->saveToSourceFolderCheckBox, m_settings->outputToSourceDir());
        ui->prependRelativePathCheckBox->setChecked(m_settings->prependRelativeSourcePath());
        
-       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(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())
-       {
-               m_addFavoriteFolderAction = m_outputFolderFavoritesMenu->addAction(QIcon(":/icons/add.png"), "N/A");
-               m_outputFolderFavoritesMenu->insertSeparator(m_addFavoriteFolderAction);
-               connect(m_addFavoriteFolderAction, SIGNAL(triggered(bool)), this, SLOT(addFavoriteFolderActionTriggered()));
-       }
+       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()),                        this, 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.data(), SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(outputFolderMouseEventOccurred(QWidget*, QEvent*)));
+       connect(m_evenFilterOutputFolderView.data(),  SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(outputFolderViewEventOccurred(QWidget*, QEvent*)));
+
+       m_outputFolderContextMenu.reset(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(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()));
+
+       m_outputFolderFavoritesMenu.reset(new QMenu());
+       m_addFavoriteFolderAction = m_outputFolderFavoritesMenu->addAction(QIcon(":/icons/add.png"), "N/A");
+       m_outputFolderFavoritesMenu->insertSeparator(m_addFavoriteFolderAction);
+       connect(m_addFavoriteFolderAction, SIGNAL(triggered(bool)), this, SLOT(addFavoriteFolderActionTriggered()));
 
        ui->outputFolderEdit->setVisible(false);
-       if(m_outputFolderNoteBox = new QLabel(ui->outputFolderView))
-       {
-               m_outputFolderNoteBox->setAutoFillBackground(true);
-               m_outputFolderNoteBox->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-               m_outputFolderNoteBox->setFrameShape(QFrame::StyledPanel);
-               SET_FONT_BOLD(m_outputFolderNoteBox, true);
-               m_outputFolderNoteBox->hide();
-
-       }
+       m_outputFolderNoteBox.reset(new QLabel(ui->outputFolderView));
+       m_outputFolderNoteBox->setAutoFillBackground(true);
+       m_outputFolderNoteBox->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+       m_outputFolderNoteBox->setFrameShape(QFrame::StyledPanel);
+       SET_FONT_BOLD(m_outputFolderNoteBox.data(), true);
+       m_outputFolderNoteBox->hide();
 
        outputFolderViewClicked(QModelIndex());
        refreshFavorites();
@@ -386,42 +411,42 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        // Setup "Meta Data" tab
        //--------------------------------
 
-       m_metaInfoModel = new MetaInfoModel(m_metaData);
+       m_metaInfoModel.reset(new MetaInfoModel(m_metaData));
        m_metaInfoModel->clearData();
        m_metaInfoModel->setData(m_metaInfoModel->index(4, 1), m_settings->metaInfoPosition());
-       ui->metaDataView->setModel(m_metaInfoModel);
+       ui->metaDataView->setModel(m_metaInfoModel.data());
        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->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(ui->radioButtonEncoderMP3, SettingsModel::MP3Encoder);
+       m_encoderButtonGroup.reset(new QButtonGroup(this));
+       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);
+       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(ui->radioButtonModeQuality, SettingsModel::VBRMode);
+       m_modeButtonGroup.reset(new QButtonGroup(this));
+       m_modeButtonGroup->addButton(ui->radioButtonModeQuality,        SettingsModel::VBRMode);
        m_modeButtonGroup->addButton(ui->radioButtonModeAverageBitrate, SettingsModel::ABRMode);
-       m_modeButtonGroup->addButton(ui->radioButtonConstBitrate, SettingsModel::CBRMode);
+       m_modeButtonGroup->addButton(ui->radioButtonConstBitrate,       SettingsModel::CBRMode);
 
        ui->radioButtonEncoderMP3->setChecked(true);
        foreach(QAbstractButton *currentButton, m_encoderButtonGroup->buttons())
@@ -433,14 +458,14 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
                }
        }
 
-       m_evenFilterCompressionTab = new CustomEventFilter();
-       ui->labelCompressionHelp->installEventFilter(m_evenFilterCompressionTab);
-       ui->labelResetEncoders ->installEventFilter(m_evenFilterCompressionTab);
+       m_evenFilterCompressionTab.reset(new CustomEventFilter());
+       ui->labelCompressionHelp->installEventFilter(m_evenFilterCompressionTab.data());
+       ui->labelResetEncoders  ->installEventFilter(m_evenFilterCompressionTab.data());
 
-       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(ui->sliderBitrate, SIGNAL(valueChanged(int)), this, SLOT(updateBitrate(int)));
+       connect(m_encoderButtonGroup.data(),       SIGNAL(buttonClicked(int)),               this, SLOT(updateEncoder(int)));
+       connect(m_modeButtonGroup.data(),          SIGNAL(buttonClicked(int)),               this, SLOT(updateRCMode(int)));
+       connect(m_evenFilterCompressionTab.data(), SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(compressionTabEventOccurred(QWidget*, QEvent*)));
+       connect(ui->sliderBitrate,                 SIGNAL(valueChanged(int)),                this, SLOT(updateBitrate(int)));
 
        updateEncoder(m_encoderButtonGroup->checkedId());
 
@@ -451,51 +476,57 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        ui->sliderLameAlgoQuality->setValue(m_settings->lameAlgoQuality());
        if(m_settings->maximumInstances() > 0) ui->sliderMaxInstances->setValue(m_settings->maximumInstances());
 
-       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());
+       ui->spinBoxBitrateManagementMin   ->setValue(m_settings->bitrateManagementMinRate());
+       ui->spinBoxBitrateManagementMax   ->setValue(m_settings->bitrateManagementMaxRate());
+       ui->spinBoxNormalizationFilterPeak->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolume()) / 100.0);
+       ui->spinBoxNormalizationFilterSize->setValue(m_settings->normalizationFilterSize());
+       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());
        
-       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());
+       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->comboBoxOpusFramesize    ->setCurrentIndex(m_settings->opusFramesize());
        
-       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());
+       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->checkBoxNormalizationFilterEnabled, m_settings->normalizationFilterEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilterDynamic, m_settings->normalizationFilterDynamic());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilterCoupled, m_settings->normalizationFilterCoupled());
+       SET_CHECKBOX_STATE(ui->checkBoxAutoDetectInstances,        (m_settings->maximumInstances() < 1));
+       SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder,        (!m_settings->customTempPathEnabled()));
+       SET_CHECKBOX_STATE(ui->checkBoxRename_Rename,              m_settings->renameFiles_renameEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxRename_RegExp,              m_settings->renameFiles_regExpEnabled());
+       SET_CHECKBOX_STATE(ui->checkBoxForceStereoDownmix,         m_settings->forceStereoDownmix());
+       SET_CHECKBOX_STATE(ui->checkBoxOpusDisableResample,        m_settings->opusDisableResample());
+
        ui->checkBoxNeroAAC2PassMode->setEnabled(aacEncoder == SettingsModel::AAC_ENCODER_NERO);
        
-       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());
+       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->renameFiles_renamePattern());
+       ui->lineEditRenameRegExp_Search ->setText(m_settings->renameFiles_regExpSearch ());
+       ui->lineEditRenameRegExp_Replace->setText(m_settings->renameFiles_regExpReplace());
        
-       m_evenFilterCustumParamsHelp = new CustomEventFilter();
-       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_evenFilterCustumParamsHelp.reset(new CustomEventFilter());
+       ui->helpCustomParamLAME   ->installEventFilter(m_evenFilterCustumParamsHelp.data());
+       ui->helpCustomParamOggEnc ->installEventFilter(m_evenFilterCustumParamsHelp.data());
+       ui->helpCustomParamNeroAAC->installEventFilter(m_evenFilterCustumParamsHelp.data());
+       ui->helpCustomParamFLAC   ->installEventFilter(m_evenFilterCustumParamsHelp.data());
+       ui->helpCustomParamAften  ->installEventFilter(m_evenFilterCustumParamsHelp.data());
+       ui->helpCustomParamOpus   ->installEventFilter(m_evenFilterCustumParamsHelp.data());
        
-       m_overwriteButtonGroup = new QButtonGroup(this);
+       m_overwriteButtonGroup.reset(new QButtonGroup(this));
        m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeKeepBoth, SettingsModel::Overwrite_KeepBoth);
        m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeSkipFile, SettingsModel::Overwrite_SkipFile);
        m_overwriteButtonGroup->addButton(ui->radioButtonOverwriteModeReplaces, SettingsModel::Overwrite_Replaces);
@@ -504,46 +535,67 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        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*)));
+       FileExtsModel *fileExtModel = new FileExtsModel(this);
+       fileExtModel->importItems(m_settings->renameFiles_fileExtension());
+       ui->tableViewFileExts->setModel(fileExtModel);
+       ui->tableViewFileExts->verticalHeader()  ->setResizeMode(QHeaderView::ResizeToContents);
+       ui->tableViewFileExts->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+
+       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->checkBoxNormalizationFilterEnabled, SIGNAL(clicked(bool)),                    this, SLOT(normalizationEnabledChanged(bool)));
+       connect(ui->checkBoxNormalizationFilterDynamic, SIGNAL(clicked(bool)),                    this, SLOT(normalizationDynamicChanged(bool)));
+       connect(ui->checkBoxNormalizationFilterCoupled, SIGNAL(clicked(bool)),                    this, SLOT(normalizationCoupledChanged(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->spinBoxNormalizationFilterPeak,     SIGNAL(valueChanged(double)),             this, SLOT(normalizationMaxVolumeChanged(double)));
+       connect(ui->spinBoxNormalizationFilterSize,     SIGNAL(valueChanged(int)),                this, SLOT(normalizationFilterSizeChanged(int)));
+       connect(ui->spinBoxNormalizationFilterSize,     SIGNAL(editingFinished()),                this, SLOT(normalizationFilterSizeFinished()));
+       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->checkBoxRename_Rename,              SIGNAL(clicked(bool)),                    this, SLOT(renameOutputEnabledChanged(bool)));
+       connect(ui->checkBoxRename_RegExp,              SIGNAL(clicked(bool)),                    this, SLOT(renameRegExpEnabledChanged(bool)));
+       connect(ui->lineEditRenamePattern,              SIGNAL(editingFinished()),                this, SLOT(renameOutputPatternChanged()));
+       connect(ui->lineEditRenamePattern,              SIGNAL(textChanged(QString)),             this, SLOT(renameOutputPatternChanged(QString)));
+       connect(ui->lineEditRenameRegExp_Search,        SIGNAL(editingFinished()),                this, SLOT(renameRegExpValueChanged()));
+       connect(ui->lineEditRenameRegExp_Search,        SIGNAL(textChanged(QString)),             this, SLOT(renameRegExpSearchChanged(QString)));
+       connect(ui->lineEditRenameRegExp_Replace,       SIGNAL(editingFinished()),                this, SLOT(renameRegExpValueChanged()));
+       connect(ui->lineEditRenameRegExp_Replace,       SIGNAL(textChanged(QString)),             this, SLOT(renameRegExpReplaceChanged(QString)));
+       connect(ui->labelShowRenameMacros,              SIGNAL(linkActivated(QString)),           this, SLOT(showRenameMacros(QString)));
+       connect(ui->labelShowRegExpHelp,                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)),                    this, SLOT(opusSettingsChanged()));
+       connect(ui->buttonRename_Rename,                SIGNAL(clicked(bool)),                    this, SLOT(renameButtonClicked(bool)));
+       connect(ui->buttonRename_RegExp,                SIGNAL(clicked(bool)),                    this, SLOT(renameButtonClicked(bool)));
+       connect(ui->buttonRename_FileEx,                SIGNAL(clicked(bool)),                    this, SLOT(renameButtonClicked(bool)));
+       connect(ui->buttonFileExts_Add,                 SIGNAL(clicked()),                        this, SLOT(fileExtAddButtonClicked()));
+       connect(ui->buttonFileExts_Remove,              SIGNAL(clicked()),                        this, SLOT(fileExtRemoveButtonClicked()));
+       connect(m_overwriteButtonGroup.data(),          SIGNAL(buttonClicked(int)),               this, SLOT(overwriteModeChanged(int)));
+       connect(m_evenFilterCustumParamsHelp.data(),    SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(customParamsHelpRequested(QWidget*, QEvent*)));
+       connect(fileExtModel,                           SIGNAL(modelReset()),                     this, SLOT(fileExtModelChanged()));
 
        //--------------------------------
        // Force initial GUI update
@@ -553,6 +605,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        updateMaximumInstances(ui->sliderMaxInstances->value());
        toneAdjustTrebleChanged(ui->spinBoxToneAdjustTreble->value());
        toneAdjustBassChanged(ui->spinBoxToneAdjustBass->value());
+       normalizationEnabledChanged(ui->checkBoxNormalizationFilterEnabled->isChecked());
        customParamsChanged();
        
        //--------------------------------
@@ -560,13 +613,13 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        //--------------------------------
 
        //Activate file menu actions
-       ui->actionOpenFolder->setData(QVariant::fromValue<bool>(false));
+       ui->actionOpenFolder           ->setData(QVariant::fromValue<bool>(false));
        ui->actionOpenFolderRecursively->setData(QVariant::fromValue<bool>(true));
-       connect(ui->actionOpenFolder, SIGNAL(triggered()), this, SLOT(openFolderActionActivated()));
+       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.reset(new QActionGroup(this));
        m_tabActionGroup->addAction(ui->actionSourceFiles);
        m_tabActionGroup->addAction(ui->actionOutputDirectory);
        m_tabActionGroup->addAction(ui->actionCompression);
@@ -578,10 +631,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        ui->actionCompression->setData(3);
        ui->actionAdvancedOptions->setData(4);
        ui->actionSourceFiles->setChecked(true);
-       connect(m_tabActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(tabActionActivated(QAction*)));
+       connect(m_tabActionGroup.data(), SIGNAL(triggered(QAction*)), this, SLOT(tabActionActivated(QAction*)));
 
        //Activate style menu actions
-       m_styleActionGroup = new QActionGroup(this);
+       m_styleActionGroup .reset(new QActionGroup(this));
        m_styleActionGroup->addAction(ui->actionStylePlastique);
        m_styleActionGroup->addAction(ui->actionStyleCleanlooks);
        m_styleActionGroup->addAction(ui->actionStyleWindowsVista);
@@ -593,29 +646,31 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        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*)));
+       ui->actionStyleWindowsXP->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_XP && MUtils::GUI::themes_enabled());
+       ui->actionStyleWindowsVista->setEnabled((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_VISTA && MUtils::GUI::themes_enabled());
+       connect(m_styleActionGroup.data(), SIGNAL(triggered(QAction*)), this, SLOT(styleActionActivated(QAction*)));
        styleActionActivated(NULL);
 
        //Populate the language menu
-       m_languageActionGroup = new QActionGroup(this);
-       QStringList translations = lamexp_query_translations();
-       while(!translations.isEmpty())
-       {
-               QString langId = translations.takeFirst();
-               QAction *currentLanguage = new QAction(this);
-               currentLanguage->setData(langId);
-               currentLanguage->setText(lamexp_translation_name(langId));
-               currentLanguage->setIcon(QIcon(QString(":/flags/%1.png").arg(langId)));
-               currentLanguage->setCheckable(true);
-               currentLanguage->setChecked(false);
-               m_languageActionGroup->addAction(currentLanguage);
-               ui->menuLanguage->insertAction(ui->actionLoadTranslationFromFile, currentLanguage);
+       m_languageActionGroup.reset(new QActionGroup(this));
+       QStringList translations;
+       if(MUtils::Translation::enumerate(translations) > 0)
+       {
+               for(QStringList::ConstIterator iter = translations.constBegin(); iter != translations.constEnd(); iter++)
+               {
+                       QAction *currentLanguage = new QAction(this);
+                       currentLanguage->setData(*iter);
+                       currentLanguage->setText(MUtils::Translation::get_name(*iter));
+                       currentLanguage->setIcon(QIcon(QString(":/flags/%1.png").arg(*iter)));
+                       currentLanguage->setCheckable(true);
+                       currentLanguage->setChecked(false);
+                       m_languageActionGroup->addAction(currentLanguage);
+                       ui->menuLanguage->insertAction(ui->actionLoadTranslationFromFile, currentLanguage);
+               }
        }
        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*)));
+       connect(ui->actionLoadTranslationFromFile, SIGNAL(triggered(bool)),     this, SLOT(languageFromFileActionActivated(bool)));
+       connect(m_languageActionGroup.data(),      SIGNAL(triggered(QAction*)), this, SLOT(languageActionActivated(QAction*)));
        ui->actionLoadTranslationFromFile->setChecked(false);
 
        //Activate tools menu actions
@@ -624,11 +679,11 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        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->actionDisableShellIntegration->setDisabled(lamexp_version_portable() && 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());
+       ui->actionHibernateComputer->setEnabled(MUtils::OS::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)));
@@ -645,7 +700,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        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->actionDocumentManual   ->setData(QString("%1/Manual.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()));
@@ -654,7 +709,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        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->actionDocumentManual,    SIGNAL(triggered()), this, SLOT(documentActionActivated()));
        connect(ui->actionDocumentChangelog, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
        connect(ui->actionDocumentTranslate, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
        
@@ -669,26 +724,26 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        setMinimumSize(thisRect.width(), thisRect.height());
 
        //Create DropBox widget
-       m_dropBox = new DropBox(this, m_fileListModel, m_settings);
-       connect(m_fileListModel, SIGNAL(modelReset()), m_dropBox, SLOT(modelChanged()));
-       connect(m_fileListModel, SIGNAL(rowsInserted(QModelIndex,int,int)), m_dropBox, SLOT(modelChanged()));
-       connect(m_fileListModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), m_dropBox, SLOT(modelChanged()));
-       connect(m_fileListModel, SIGNAL(rowAppended()), m_dropBox, SLOT(modelChanged()));
+       m_dropBox.reset(new DropBox(this, m_fileListModel, m_settings));
+       connect(m_fileListModel, SIGNAL(modelReset()),                      m_dropBox.data(), SLOT(modelChanged()));
+       connect(m_fileListModel, SIGNAL(rowsInserted(QModelIndex,int,int)), m_dropBox.data(), SLOT(modelChanged()));
+       connect(m_fileListModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),  m_dropBox.data(), SLOT(modelChanged()));
+       connect(m_fileListModel, SIGNAL(rowAppended()),                     m_dropBox.data(), SLOT(modelChanged()));
 
        //Create message handler thread
-       m_messageHandler = new MessageHandlerThread();
-       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);
+       m_messageHandler.reset(new MessageHandlerThread(ipcChannel));
+       connect(m_messageHandler.data(), SIGNAL(otherInstanceDetected()),       this, SLOT(notifyOtherInstance()), Qt::QueuedConnection);
+       connect(m_messageHandler.data(), SIGNAL(fileReceived(QString)),         this, SLOT(addFileDelayed(QString)), Qt::QueuedConnection);
+       connect(m_messageHandler.data(), SIGNAL(folderReceived(QString, bool)), this, SLOT(addFolderDelayed(QString, bool)), Qt::QueuedConnection);
+       connect(m_messageHandler.data(), SIGNAL(killSignalReceived()),          this, SLOT(close()), Qt::QueuedConnection);
        m_messageHandler->start();
 
        //Init delayed file handling
-       m_delayedFileList = new QStringList();
-       m_delayedFileTimer = new QTimer();
+       m_delayedFileList .reset(new QStringList());
+       m_delayedFileTimer.reset(new QTimer());
        m_delayedFileTimer->setSingleShot(true);
        m_delayedFileTimer->setInterval(5000);
-       connect(m_delayedFileTimer, SIGNAL(timeout()), this, SLOT(handleDelayedFiles()));
+       connect(m_delayedFileTimer.data(), SIGNAL(timeout()), this, SLOT(handleDelayedFiles()));
 
        //Load translation
        initializeTranslation();
@@ -698,7 +753,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel_MetaInfo *me
        changeEvent(&languageChangeEvent);
 
        //Enable Drag & Drop
-       m_droppedFileList = new QList<QUrl>();
+       m_droppedFileList.reset(new QList<QUrl>());
        this->setAcceptDrops(true);
 }
 
@@ -720,40 +775,9 @@ MainWindow::~MainWindow(void)
        }
 
        //Unset models
-       SET_MODEL(ui->sourceFileView, NULL);
+       SET_MODEL(ui->sourceFileView,   NULL);
        SET_MODEL(ui->outputFolderView, NULL);
-       SET_MODEL(ui->metaDataView, NULL);
-
-       //Free memory
-       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;
-       }
+       SET_MODEL(ui->metaDataView,     NULL);
 
        //Un-initialize the dialog
        MUTILS_DELETE(ui);
@@ -773,30 +797,28 @@ void MainWindow::addFiles(const QStringList &files)
                return;
        }
 
-       WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
-       tabPageChanged(ui->tabWidget->currentIndex(), true);
+       if(ui->tabWidget->currentIndex() != 0)
+       {
+               SignalBlockHelper signalBlockHelper(ui->tabWidget);
+               ui->tabWidget->setCurrentIndex(0);
+               tabPageChanged(ui->tabWidget->currentIndex(), true);
+       }
 
        INIT_BANNER();
-       FileAnalyzer *analyzer = new FileAnalyzer(files);
+       QScopedPointer<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);
-       connect(analyzer, SIGNAL(fileAnalyzed(AudioFileModel)), m_fileListModel, SLOT(addFile(AudioFileModel)), Qt::QueuedConnection);
-       connect(m_banner, SIGNAL(userAbort()), analyzer, SLOT(abortProcess()), Qt::DirectConnection);
+       connect(analyzer.data(), SIGNAL(fileSelected(QString)),            m_banner.data(), SLOT(setText(QString)),             Qt::QueuedConnection);
+       connect(analyzer.data(), SIGNAL(progressValChanged(unsigned int)), m_banner.data(), SLOT(setProgressVal(unsigned int)), Qt::QueuedConnection);
+       connect(analyzer.data(), SIGNAL(progressMaxChanged(unsigned int)), m_banner.data(), SLOT(setProgressMax(unsigned int)), Qt::QueuedConnection);
+       connect(analyzer.data(), SIGNAL(fileAnalyzed(AudioFileModel)),     m_fileListModel, SLOT(addFile(AudioFileModel)),      Qt::QueuedConnection);
+       connect(m_banner.data(), SIGNAL(userAbort()),                      analyzer.data(), SLOT(abortProcess()),               Qt::DirectConnection);
 
-       try
-       {
-               m_fileListModel->setBlockUpdates(true);
-               QTime startTime = QTime::currentTime();
-               m_banner->show(tr("Adding file(s), please wait..."), analyzer);
-       }
-       catch(...)
+       if(!analyzer.isNull())
        {
-               /* ignore any exceptions that may occur */
+               FileListBlockHelper fileListBlocker(m_fileListModel);
+               m_banner->show(tr("Adding file(s), please wait..."), analyzer.data());
        }
 
-       m_fileListModel->setBlockUpdates(false);
        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
        ui->sourceFileView->update();
        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -820,30 +842,29 @@ void MainWindow::addFiles(const QStringList &files)
                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."))));
        }
 
-       MUTILS_DELETE(analyzer);
        m_banner->close();
 }
 
 /*
  * Add folder to source list
  */
-void MainWindow::addFolder(const QString &path, bool recursive, bool delayed)
+void MainWindow::addFolder(const QString &path, bool recursive, bool delayed, QString filter)
 {
        QFileInfoList folderInfoList;
        folderInfoList << QFileInfo(path);
        QStringList fileList;
        
-       SHOW_BANNER(tr("Scanning folder(s) for files, please wait..."));
+       showBanner(tr("Scanning folder(s) for files, please wait..."));
        
        QApplication::processEvents();
-       lamexp_check_escape_state();
+       MUtils::OS::check_key_state_esc();
 
        while(!folderInfoList.isEmpty())
        {
-               if(lamexp_check_escape_state())
+               if(MUtils::OS::check_key_state_esc())
                {
-                       lamexp_beep(lamexp_beep_error);
                        qWarning("Operation cancelled by user!");
+                       MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
                        fileList.clear();
                        break;
                }
@@ -851,9 +872,12 @@ void MainWindow::addFolder(const QString &path, bool recursive, bool delayed)
                QDir currentDir(folderInfoList.takeFirst().canonicalFilePath());
                QFileInfoList fileInfoList = currentDir.entryInfoList(QDir::Files | QDir::NoSymLinks);
 
-               while(!fileInfoList.isEmpty())
+               for(QFileInfoList::ConstIterator iter = fileInfoList.constBegin(); iter != fileInfoList.constEnd(); iter++)
                {
-                       fileList << fileInfoList.takeFirst().canonicalFilePath();
+                       if(filter.isEmpty() || (iter->suffix().compare(filter, Qt::CaseInsensitive) == 0))
+                       {
+                               fileList << iter->canonicalFilePath();
+                       }
                }
 
                QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -948,7 +972,7 @@ void MainWindow::initializeTranslation(void)
                const QString qmFilePath = QFileInfo(m_settings->currentLanguageFile()).canonicalFilePath();
                if((!qmFilePath.isEmpty()) && QFileInfo(qmFilePath).exists() && QFileInfo(qmFilePath).isFile() && (QFileInfo(qmFilePath).suffix().compare("qm", Qt::CaseInsensitive) == 0))
                {
-                       if(lamexp_install_translator_from_file(qmFilePath))
+                       if(MUtils::Translation::install_translator_from_file(qmFilePath))
                        {
                                QList<QAction*> actions = m_languageActionGroup->actions();
                                while(!actions.isEmpty()) actions.takeFirst()->setChecked(false);
@@ -981,7 +1005,7 @@ void MainWindow::initializeTranslation(void)
                while(!languageActions.isEmpty())
                {
                        QAction *currentLanguage = languageActions.takeFirst();
-                       if(currentLanguage->data().toString().compare(LAMEXP_DEFAULT_LANGID, Qt::CaseInsensitive) == 0)
+                       if(currentLanguage->data().toString().compare(MUtils::Translation::DEFAULT_LANGID, Qt::CaseInsensitive) == 0)
                        {
                                currentLanguage->setChecked(true);
                                languageActionActivated(currentLanguage);
@@ -997,6 +1021,109 @@ void MainWindow::initializeTranslation(void)
        }
 }
 
+/*
+ * Open a document link
+ */
+void MainWindow::openDocumentLink(QAction *const action)
+{
+       if(!(action->data().isValid() && (action->data().type() == QVariant::String)))
+       {
+               qWarning("Cannot open document for this QAction!");
+               return;
+       }
+
+       //Try to open exitsing document file
+       const QFileInfo document(action->data().toString());
+       if(document.exists() && document.isFile() && (document.size() >= 1024))
+       {
+               QDesktopServices::openUrl(QUrl::fromLocalFile(document.canonicalFilePath()));
+               return;
+       }
+
+       //Document not found -> fallback mode!
+       qWarning("Document '%s' not found -> redirecting to the website!", MUTILS_UTF8(document.fileName()));
+       const QUrl url(QString("%1/%2").arg(QString::fromLatin1(g_documents_base_url), document.fileName()));
+       QDesktopServices::openUrl(url);
+}
+
+/*
+ * Move selected files up/down
+ */
+void MainWindow::moveSelectedFiles(const bool &up)
+{
+       QItemSelectionModel *const selection = ui->sourceFileView->selectionModel();
+       if(selection && selection->hasSelection())
+       {
+               const QModelIndexList selectedRows = up ? selection->selectedRows() : INVERT_LIST(selection->selectedRows());
+               if((up && (selectedRows.first().row() > 0)) || ((!up) && (selectedRows.first().row() < m_fileListModel->rowCount() - 1)))
+               {
+                       const int delta = up ? (-1) : 1;
+                       const int firstIndex = (up ? selectedRows.first() : selectedRows.last()).row() + delta;
+                       const int selectionCount = selectedRows.count();
+                       if(abs(delta) > 0)
+                       {
+                               FileListBlockHelper fileListBlocker(m_fileListModel);
+                               for(QModelIndexList::ConstIterator iter = selectedRows.constBegin(); iter != selectedRows.constEnd(); iter++)
+                               {
+                                       if(!m_fileListModel->moveFile((*iter), delta))
+                                       {
+                                               break;
+                                       }
+                               }
+                       }
+                       selection->clearSelection();
+                       for(int i = 0; i < selectionCount; i++)
+                       {
+                               const QModelIndex item = m_fileListModel->index(firstIndex + i, 0);
+                               selection->select(QItemSelection(item, item), QItemSelectionModel::Select | QItemSelectionModel::Rows);
+                       }
+                       ui->sourceFileView->scrollTo(m_fileListModel->index((up ? firstIndex : firstIndex + selectionCount - 1), 0), QAbstractItemView::PositionAtCenter);
+                       return;
+               }
+       }
+       MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
+}
+
+/*
+ * Show banner popup dialog
+ */
+void MainWindow::showBanner(const QString &text)
+{
+       INIT_BANNER();
+       m_banner->show(text);
+}
+
+/*
+ * Show banner popup dialog
+ */
+void MainWindow::showBanner(const QString &text, QThread *const thread)
+{
+       INIT_BANNER();
+       m_banner->show(text, thread);
+}
+
+/*
+ * Show banner popup dialog
+ */
+void MainWindow::showBanner(const QString &text, QEventLoop *const eventLoop)
+{
+       INIT_BANNER();
+       m_banner->show(text, eventLoop);
+}
+
+/*
+ * Show banner popup dialog
+ */
+void MainWindow::showBanner(const QString &text, bool &flag, const bool &test)
+{
+       if((!flag) && (test))
+       {
+               INIT_BANNER();
+               m_banner->show(text);
+               flag = true;
+       }
+}
+
 ////////////////////////////////////////////////////////////
 // EVENTS
 ////////////////////////////////////////////////////////////
@@ -1012,7 +1139,8 @@ void MainWindow::showEvent(QShowEvent *event)
 
        if(!event->spontaneous())
        {
-               WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
+               SignalBlockHelper signalBlockHelper(ui->tabWidget);
+               ui->tabWidget->setCurrentIndex(0);
                tabPageChanged(ui->tabWidget->currentIndex(), true);
        }
 
@@ -1041,7 +1169,7 @@ void MainWindow::changeEvent(QEvent *e)
                return;
        }
 
-       int comboBoxIndex[8];
+       int comboBoxIndex[6];
                
        //Backup combobox indices, as retranslateUi() resets
        comboBoxIndex[0] = ui->comboBoxMP3ChannelMode->currentIndex();
@@ -1049,9 +1177,7 @@ void MainWindow::changeEvent(QEvent *e)
        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();
+       comboBoxIndex[5] = ui->comboBoxOpusFramesize->currentIndex();
                
        //Re-translate from UIC
        ui->retranslateUi(this);
@@ -1062,9 +1188,7 @@ void MainWindow::changeEvent(QEvent *e)
        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]);
+       ui->comboBoxOpusFramesize->setCurrentIndex(comboBoxIndex[5]);
 
        //Update the window title
        if(MUTILS_DEBUG)
@@ -1100,6 +1224,8 @@ void MainWindow::changeEvent(QEvent *e)
        updateLameAlgoQuality(ui->sliderLameAlgoQuality->value());
        updateMaximumInstances(ui->sliderMaxInstances->value());
        renameOutputPatternChanged(ui->lineEditRenamePattern->text(), true);
+       renameRegExpSearchChanged (ui->lineEditRenameRegExp_Search ->text(), true);
+       renameRegExpReplaceChanged(ui->lineEditRenameRegExp_Replace->text(), true);
 
        //Re-install shell integration
        if(m_settings->shellIntegrationEnabled())
@@ -1108,7 +1234,7 @@ void MainWindow::changeEvent(QEvent *e)
        }
 
        //Translate system menu
-       lamexp_update_sysmenu(this, IDM_ABOUTBOX, ui->buttonAbout->text());
+       MUtils::GUI::sysmenu_update(this, IDM_ABOUTBOX, ui->buttonAbout->text());
        
        //Force resize event
        QApplication::postEvent(this, new QResizeEvent(this->size(), QSize()));
@@ -1158,7 +1284,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 {
        if(BANNER_VISIBLE || m_delayedFileTimer->isActive())
        {
-               lamexp_beep(lamexp_beep_warning);
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
                event->ignore();
        }
        
@@ -1203,7 +1329,7 @@ void MainWindow::keyPressEvent(QKeyEvent *e)
        if(e->modifiers().testFlag(Qt::ControlModifier) && (e->key() == Qt::Key_F5))
        {
                initializeTranslation();
-               lamexp_beep(lamexp_beep_info);
+               MUtils::Sound::beep(MUtils::Sound::BEEP_NFO);
                return;
        }
 
@@ -1224,7 +1350,7 @@ void MainWindow::keyPressEvent(QKeyEvent *e)
  */
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
 {
-       if(obj == m_fileSystemModel)
+       if(obj == m_fileSystemModel.data())
        {
                if(QApplication::overrideCursor() == NULL)
                {
@@ -1240,12 +1366,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(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())
                {
@@ -1268,13 +1394,13 @@ bool MainWindow::event(QEvent *e)
 
 bool MainWindow::winEvent(MSG *message, long *result)
 {
-       if(lamexp_check_sysmenu_msg(message, IDM_ABOUTBOX))
+       if(MUtils::GUI::sysmenu_check_msg(message, IDM_ABOUTBOX))
        {
                QTimer::singleShot(0, ui->buttonAbout, SLOT(click()));
                *result = 0;
                return true;
        }
-       return WinSevenTaskbar::handleWinEvent(message, result);
+       return false;
 }
 
 ////////////////////////////////////////////////////////////
@@ -1290,18 +1416,13 @@ bool MainWindow::winEvent(MSG *message, long *result)
  */
 void MainWindow::windowShown(void)
 {
-       const QStringList &arguments = lamexp_arguments(); //QApplication::arguments();
+       const MUtils::OS::ArgumentMap &arguments = MUtils::OS::arguments(); //QApplication::arguments();
 
        //Force resize event
        resizeEvent(NULL);
 
        //First run?
-       bool firstRun = false;
-       for(int i = 0; i < arguments.count(); i++)
-       {
-               /*QMessageBox::information(this, QString::number(i), arguments[i]);*/
-               if(!arguments[i].compare("--first-run", Qt::CaseInsensitive)) firstRun = true;
-       }
+       const bool firstRun = arguments.contains("first-run");
 
        //Check license
        if((m_settings->licenseAccepted() <= 0) || firstRun)
@@ -1321,7 +1442,7 @@ void MainWindow::windowShown(void)
                        m_settings->licenseAccepted(++iAccepted);
                        m_settings->syncNow();
                        QApplication::processEvents();
-                       lamexp_play_sound("whammy", false);
+                       MUtils::Sound::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())
@@ -1330,14 +1451,14 @@ void MainWindow::windowShown(void)
                                QString uninstallerPath = uninstallerInfo.canonicalFilePath();
                                for(int i = 0; i < 3; i++)
                                {
-                                       if(lamexp_exec_shell(this, QDir::toNativeSeparators(uninstallerPath), "/Force", QDir::toNativeSeparators(uninstallerDir))) break;
+                                       if(MUtils::OS::shell_open(this, QDir::toNativeSeparators(uninstallerPath), "/Force", QDir::toNativeSeparators(uninstallerDir))) break;
                                }
                        }
                        QApplication::quit();
                        return;
                }
                
-               lamexp_play_sound("woohoo", false);
+               MUtils::Sound::play_sound("woohoo", false);
                m_settings->licenseAccepted(1);
                m_settings->syncNow();
                if(lamexp_version_demo()) showAnnounceBox();
@@ -1349,7 +1470,7 @@ void MainWindow::windowShown(void)
                if(MUtils::OS::current_date() >= lamexp_version_expires())
                {
                        qWarning("Binary has expired !!!");
-                       lamexp_play_sound("whammy", false);
+                       MUtils::Sound::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();
@@ -1364,7 +1485,7 @@ void MainWindow::windowShown(void)
        {
                QString message;
                message += NOBR(tr("It seems that a bogus anti-virus software is slowing down the startup of LameXP.")).append("<br>");
-               message += NOBR(tr("Please refer to the %1 document for details and solutions!")).arg("<a href=\"http://lamexp.sourceforge.net/doc/FAQ.html#df406578\">F.A.Q.</a>").append("<br>");
+               message += NOBR(tr("Please refer to the %1 document for details and solutions!")).arg(LINK_EX(QString("%1/Manual.html#performance-issues").arg(g_documents_base_url), tr("Manual"))).append("<br>");
                if(QMessageBox::warning(this, tr("Slow Startup"), message, tr("Discard"), tr("Don't Show Again")) == 1)
                {
                        m_settings->antivirNotificationsEnabled(false);
@@ -1373,7 +1494,7 @@ void MainWindow::windowShown(void)
        }
 
        //Update reminder
-       if(MUtils::OS::current_date() >= MUtils::Version::build_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);
@@ -1392,8 +1513,8 @@ void MainWindow::windowShown(void)
                        return;
                default:
                        QEventLoop loop; QTimer::singleShot(7000, &loop, SLOT(quit()));
-                       lamexp_play_sound("waiting", true);
-                       SHOW_BANNER_ARG(tr("Skipping update check this time, please be patient..."), &loop);
+                       MUtils::Sound::play_sound("waiting", true);
+                       showBanner(tr("Skipping update check this time, please be patient..."), &loop);
                        break;
                }
        }
@@ -1423,11 +1544,11 @@ void MainWindow::windowShown(void)
        {
                if(m_settings->neroAacNotificationsEnabled())
                {
-                       if(lamexp_tool_version("neroAacEnc.exe") < lamexp_toolver_neroaac())
+                       if(lamexp_tools_version("neroAacEnc.exe") < lamexp_toolver_neroaac())
                        {
                                QString messageText;
                                messageText += NOBR(tr("LameXP detected that your version of the Nero AAC encoder is outdated!")).append("<br>");
-                               messageText += NOBR(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac(), tr("n/a")), lamexp_version2string("?.?.?.?", lamexp_tool_version("neroAacEnc.exe"), tr("n/a")))).append("<br><br>");
+                               messageText += NOBR(tr("The current version available is %1 (or later), but you still have version %2 installed.").arg(lamexp_version2string("?.?.?.?", lamexp_toolver_neroaac(), tr("n/a")), lamexp_version2string("?.?.?.?", lamexp_tools_version("neroAacEnc.exe"), tr("n/a")))).append("<br><br>");
                                messageText += NOBR(tr("You can download the latest version of the Nero AAC encoder from the Nero website at:")).append("<br>");
                                messageText += "<nobr><tt>" + LINK(AboutDialog::neroAacUrl) + "</tt></nobr><br><br>";
                                messageText += NOBR(tr("(Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!)")).append("<br>");
@@ -1457,33 +1578,36 @@ void MainWindow::windowShown(void)
        }
 
        //Add files from the command-line
-       for(int i = 0; i < arguments.count() - 1; i++)
+       QStringList addedFiles;
+       foreach(const QString &value, arguments.values("add"))
        {
-               QStringList addedFiles;
-               if(!arguments[i].compare("--add", Qt::CaseInsensitive))
+               if(!value.isEmpty())
                {
-                       QFileInfo currentFile(arguments[++i].trimmed());
+                       QFileInfo currentFile(value);
                        qDebug("Adding file from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addedFiles.append(currentFile.absoluteFilePath());
                }
-               if(!addedFiles.isEmpty())
-               {
-                       addFilesDelayed(addedFiles);
-               }
+       }
+       if(!addedFiles.isEmpty())
+       {
+               addFilesDelayed(addedFiles);
        }
 
        //Add folders from the command-line
-       for(int i = 0; i < arguments.count() - 1; i++)
+       foreach(const QString &value, arguments.values("add-folder"))
        {
-               if(!arguments[i].compare("--add-folder", Qt::CaseInsensitive))
+               if(!value.isEmpty())
                {
-                       QFileInfo currentFile(arguments[++i].trimmed());
+                       const QFileInfo currentFile(value);
                        qDebug("Adding folder from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addFolder(currentFile.absoluteFilePath(), false, true);
                }
-               if(!arguments[i].compare("--add-recursive", Qt::CaseInsensitive))
+       }
+       foreach(const QString &value, arguments.values("add-recursive"))
+       {
+               if(!value.isEmpty())
                {
-                       QFileInfo currentFile(arguments[++i].trimmed());
+                       const QFileInfo currentFile(value);
                        qDebug("Adding folder recursively from CLI: %s", MUTILS_UTF8(currentFile.absoluteFilePath()));
                        addFolder(currentFile.absoluteFilePath(), true, true);
                }
@@ -1587,36 +1711,37 @@ void MainWindow::encodeButtonClicked(void)
        {
                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(ui->checkBoxUseSystemTempFolder, m_settings->customTempPathEnabledDefault());
+                       SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder, (!m_settings->customTempPathEnabledDefault()));
                }
                return;
        }
 
-       bool ok = false;
-       unsigned __int64 currentFreeDiskspace = lamexp_free_diskspace(tempFolder, &ok);
-
-       if(ok && (currentFreeDiskspace < (oneGigabyte * minimumFreeDiskspaceMultiplier)))
-       {
-               QStringList tempFolderParts = tempFolder.split("/", QString::SkipEmptyParts, Qt::CaseInsensitive);
-               tempFolderParts.takeLast();
-               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))),
-                       NOBR(tr("It is highly recommend to free up more diskspace before proceeding with the encode!")),
-                       NOBR(tr("Your TEMP folder is located at:")),
-                       QString("<nobr><tt>%1</tt></nobr>").arg(FSLINK(tempFolderParts.join("\\")))
-               );
-               switch(QMessageBox::warning(this, tr("Low Diskspace Warning"), lowDiskspaceMsg, tr("Abort Encoding Process"), tr("Clean Disk Now"), tr("Ignore")))
+       quint64 currentFreeDiskspace = 0;
+       if(MUtils::OS::free_diskspace(tempFolder, currentFreeDiskspace))
+       {
+               if(currentFreeDiskspace < (oneGigabyte * minimumFreeDiskspaceMultiplier))
                {
-               case 1:
-                       QProcess::startDetached(QString("%1/cleanmgr.exe").arg(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER)), QStringList() << "/D" << tempFolderParts.first());
-               case 0:
-                       return;
-                       break;
-               default:
-                       QMessageBox::warning(this, tr("Low Diskspace"), NOBR(tr("You are proceeding with low diskspace. Problems might occur!")));
-                       break;
+                       QStringList tempFolderParts = tempFolder.split("/", QString::SkipEmptyParts, Qt::CaseInsensitive);
+                       tempFolderParts.takeLast();
+                       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))),
+                               NOBR(tr("It is highly recommend to free up more diskspace before proceeding with the encode!")),
+                               NOBR(tr("Your TEMP folder is located at:")),
+                               QString("<nobr><tt>%1</tt></nobr>").arg(FSLINK(tempFolderParts.join("\\")))
+                       );
+                       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(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER)), QStringList() << "/D" << tempFolderParts.first());
+                       case 0:
+                               return;
+                               break;
+                       default:
+                               QMessageBox::warning(this, tr("Low Diskspace"), NOBR(tr("You are proceeding with low diskspace. Problems might occur!")));
+                               break;
+                       }
                }
        }
 
@@ -1664,13 +1789,9 @@ void MainWindow::encodeButtonClicked(void)
 void MainWindow::aboutButtonClicked(void)
 {
        ABORT_IF_BUSY;
-
-       TEMP_HIDE_DROPBOX
-       (
-               AboutDialog *aboutBox = new AboutDialog(m_settings, this);
-               aboutBox->exec();
-               MUTILS_DELETE(aboutBox);
-       );
+       WidgetHideHelper hiderHelper(m_dropBox.data());
+       QScopedPointer<AboutDialog> aboutBox(new AboutDialog(m_settings, this));
+       aboutBox->exec();
 }
 
 /*
@@ -1748,7 +1869,7 @@ void MainWindow::tabPageChanged(int idx, const bool silent)
                }
                else
                {
-                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
                }
        }
 
@@ -1875,7 +1996,7 @@ void MainWindow::languageActionActivated(QAction *action)
        {
                QString langId = action->data().toString();
 
-               if(lamexp_install_translator(langId))
+               if(MUtils::Translation::install_translator(langId))
                {
                        action->setChecked(true);
                        ui->actionLoadTranslationFromFile->setChecked(false);
@@ -1898,7 +2019,7 @@ void MainWindow::languageFromFileActionActivated(bool checked)
        {
                QStringList selectedFiles = dialog.selectedFiles();
                const QString qmFile = QFileInfo(selectedFiles.first()).canonicalFilePath();
-               if(lamexp_install_translator_from_file(qmFile))
+               if(MUtils::Translation::install_translator_from_file(qmFile))
                {
                        QList<QAction*> actions = m_languageActionGroup->actions();
                        while(!actions.isEmpty())
@@ -2029,50 +2150,47 @@ void MainWindow::disableSlowStartupNotificationsActionTriggered(bool checked)
 void MainWindow::importCueSheetActionTriggered(bool checked)
 {
        ABORT_IF_BUSY;
-       
-       TEMP_HIDE_DROPBOX
-       (
-               while(true)
-               {
-                       int result = 0;
-                       QString selectedCueFile;
+       WidgetHideHelper hiderHelper(m_dropBox.data());
 
-                       if(lamexp_themes_enabled())
-                       {
-                               selectedCueFile = QFileDialog::getOpenFileName(this, tr("Open Cue Sheet"), m_settings->mostRecentInputPath(), QString("%1 (*.cue)").arg(tr("Cue Sheet File")));
-                       }
-                       else
-                       {
-                               QFileDialog dialog(this, tr("Open Cue Sheet"));
-                               dialog.setFileMode(QFileDialog::ExistingFile);
-                               dialog.setNameFilter(QString("%1 (*.cue)").arg(tr("Cue Sheet File")));
-                               dialog.setDirectory(m_settings->mostRecentInputPath());
-                               if(dialog.exec())
-                               {
-                                       selectedCueFile = dialog.selectedFiles().first();
-                               }
-                       }
+       while(true)
+       {
+               int result = 0;
+               QString selectedCueFile;
 
-                       if(!selectedCueFile.isEmpty())
+               if(MUtils::GUI::themes_enabled())
+               {
+                       selectedCueFile = QFileDialog::getOpenFileName(this, tr("Open Cue Sheet"), m_settings->mostRecentInputPath(), QString("%1 (*.cue)").arg(tr("Cue Sheet File")));
+               }
+               else
+               {
+                       QFileDialog dialog(this, tr("Open Cue Sheet"));
+                       dialog.setFileMode(QFileDialog::ExistingFile);
+                       dialog.setNameFilter(QString("%1 (*.cue)").arg(tr("Cue Sheet File")));
+                       dialog.setDirectory(m_settings->mostRecentInputPath());
+                       if(dialog.exec())
                        {
-                               m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath());
-                               CueImportDialog *cueImporter  = new CueImportDialog(this, m_fileListModel, selectedCueFile, m_settings);
-                               result = cueImporter->exec();
-                               MUTILS_DELETE(cueImporter);
+                               selectedCueFile = dialog.selectedFiles().first();
                        }
+               }
 
-                       if(result == QDialog::Accepted)
-                       {
-                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-                               ui->sourceFileView->update();
-                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-                               ui->sourceFileView->scrollToBottom();
-                               qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-                       }
+               if(!selectedCueFile.isEmpty())
+               {
+                       m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath());
+                       FileListBlockHelper fileListBlocker(m_fileListModel);
+                       QScopedPointer<CueImportDialog> cueImporter(new CueImportDialog(this, m_fileListModel, selectedCueFile, m_settings));
+                       result = cueImporter->exec();
+               }
 
-                       if(result != (-1)) break;
+               if(result != (-1))
+               {
+                       qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                       ui->sourceFileView->update();
+                       qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                       ui->sourceFileView->scrollToBottom();
+                       qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+                       break;
                }
-       );
+       }
 }
 
 /*
@@ -2085,10 +2203,10 @@ void MainWindow::showDropBoxWidgetActionTriggered(bool checked)
        if(!m_dropBox->isVisible())
        {
                m_dropBox->show();
-               QTimer::singleShot(2500, m_dropBox, SLOT(showToolTip()));
+               QTimer::singleShot(2500, m_dropBox.data(), SLOT(showToolTip()));
        }
        
-       lamexp_blink_window(m_dropBox);
+       MUtils::GUI::blink_window(m_dropBox.data());
 }
 
 /*
@@ -2183,7 +2301,7 @@ void MainWindow::disableShellIntegrationActionTriggered(bool checked)
 
        ui->actionDisableShellIntegration->setChecked(!m_settings->shellIntegrationEnabled());
        
-       if(lamexp_portable_mode() && ui->actionDisableShellIntegration->isChecked())
+       if(lamexp_version_portable() && ui->actionDisableShellIntegration->isChecked())
        {
                ui->actionDisableShellIntegration->setEnabled(false);
        }
@@ -2214,28 +2332,7 @@ void MainWindow::documentActionActivated(void)
 {
        if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
        {
-               if(action->data().isValid() && (action->data().type() == QVariant::String))
-               {
-                       QFileInfo document(action->data().toString());
-                       QFileInfo resource(QString(":/doc/%1.html").arg(document.baseName()));
-                       if(document.exists() && document.isFile() && (document.size() == resource.size()))
-                       {
-                               QDesktopServices::openUrl(QUrl::fromLocalFile(document.canonicalFilePath()));
-                       }
-                       else
-                       {
-                               QFile source(resource.filePath());
-                               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());
-                                       action->setData(output.fileName());
-                                       source.close();
-                                       output.close();
-                                       QDesktopServices::openUrl(QUrl::fromLocalFile(output.fileName()));
-                               }
-                       }
-               }
+               openDocumentLink(action);
        }
 }
 
@@ -2245,14 +2342,9 @@ void MainWindow::documentActionActivated(void)
 void MainWindow::checkUpdatesActionActivated(void)
 {
        ABORT_IF_BUSY;
-       bool bFlag = false;
-
-       TEMP_HIDE_DROPBOX
-       (
-               bFlag = checkForUpdates();
-       );
+       WidgetHideHelper hiderHelper(m_dropBox.data());
        
-       if(bFlag)
+       if(checkForUpdates())
        {
                QApplication::quit();
        }
@@ -2268,37 +2360,35 @@ void MainWindow::checkUpdatesActionActivated(void)
 void MainWindow::addFilesButtonClicked(void)
 {
        ABORT_IF_BUSY;
+       WidgetHideHelper hiderHelper(m_dropBox.data());
 
-       TEMP_HIDE_DROPBOX
-       (
-               if(lamexp_themes_enabled())
+       if(MUtils::GUI::themes_enabled() && (!MUTILS_DEBUG))
+       {
+               QStringList fileTypeFilters = DecoderRegistry::getSupportedTypes();
+               QStringList selectedFiles = QFileDialog::getOpenFileNames(this, tr("Add file(s)"), m_settings->mostRecentInputPath(), fileTypeFilters.join(";;"));
+               if(!selectedFiles.isEmpty())
+               {
+                       m_settings->mostRecentInputPath(QFileInfo(selectedFiles.first()).canonicalPath());
+                       addFiles(selectedFiles);
+               }
+       }
+       else
+       {
+               QFileDialog dialog(this, tr("Add file(s)"));
+               QStringList fileTypeFilters = DecoderRegistry::getSupportedTypes();
+               dialog.setFileMode(QFileDialog::ExistingFiles);
+               dialog.setNameFilter(fileTypeFilters.join(";;"));
+               dialog.setDirectory(m_settings->mostRecentInputPath());
+               if(dialog.exec())
                {
-                       QStringList fileTypeFilters = DecoderRegistry::getSupportedTypes();
-                       QStringList selectedFiles = QFileDialog::getOpenFileNames(this, tr("Add file(s)"), m_settings->mostRecentInputPath(), fileTypeFilters.join(";;"));
+                       QStringList selectedFiles = dialog.selectedFiles();
                        if(!selectedFiles.isEmpty())
                        {
                                m_settings->mostRecentInputPath(QFileInfo(selectedFiles.first()).canonicalPath());
                                addFiles(selectedFiles);
                        }
                }
-               else
-               {
-                       QFileDialog dialog(this, tr("Add file(s)"));
-                       QStringList fileTypeFilters = DecoderRegistry::getSupportedTypes();
-                       dialog.setFileMode(QFileDialog::ExistingFiles);
-                       dialog.setNameFilter(fileTypeFilters.join(";;"));
-                       dialog.setDirectory(m_settings->mostRecentInputPath());
-                       if(dialog.exec())
-                       {
-                               QStringList selectedFiles = dialog.selectedFiles();
-                               if(!selectedFiles.isEmpty())
-                               {
-                                       m_settings->mostRecentInputPath(QFileInfo(selectedFiles.first()).canonicalPath());
-                                       addFiles(selectedFiles);
-                               }
-                       }
-               }
-       );
+       }
 }
 
 /*
@@ -2311,29 +2401,49 @@ void MainWindow::openFolderActionActivated(void)
        
        if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
        {
-               TEMP_HIDE_DROPBOX
-               (
-                       if(lamexp_themes_enabled())
-                       {
-                               selectedFolder = QFileDialog::getExistingDirectory(this, tr("Add Folder"), m_settings->mostRecentInputPath());
-                       }
-                       else
-                       {
-                               QFileDialog dialog(this, tr("Add Folder"));
-                               dialog.setFileMode(QFileDialog::DirectoryOnly);
-                               dialog.setDirectory(m_settings->mostRecentInputPath());
-                               if(dialog.exec())
-                               {
-                                       selectedFolder = dialog.selectedFiles().first();
-                               }
-                       }
-                       
-                       if(!selectedFolder.isEmpty())
+               WidgetHideHelper hiderHelper(m_dropBox.data());
+               if(MUtils::GUI::themes_enabled())
+               {
+                       selectedFolder = QFileDialog::getExistingDirectory(this, tr("Add Folder"), m_settings->mostRecentInputPath());
+               }
+               else
+               {
+                       QFileDialog dialog(this, tr("Add Folder"));
+                       dialog.setFileMode(QFileDialog::DirectoryOnly);
+                       dialog.setDirectory(m_settings->mostRecentInputPath());
+                       if(dialog.exec())
                        {
-                               m_settings->mostRecentInputPath(QDir(selectedFolder).canonicalPath());
-                               addFolder(selectedFolder, action->data().toBool());
+                               selectedFolder = dialog.selectedFiles().first();
                        }
-               );
+               }
+
+               if(selectedFolder.isEmpty())
+               {
+                       return;
+               }
+
+               QStringList filterItems = DecoderRegistry::getSupportedExts();
+               filterItems.prepend("*.*");
+
+               bool okay;
+               QString filterStr = QInputDialog::getItem(this, tr("Filter Files"), tr("Select filename filter:"), filterItems, 0, false, &okay).trimmed();
+               if(!okay)
+               {
+                       return;
+               }
+
+               QRegExp regExp("\\*\\.([A-Za-z0-9]+)", Qt::CaseInsensitive);
+               if(regExp.lastIndexIn(filterStr) >= 0)
+               {
+                       filterStr = regExp.cap(1).trimmed();
+               }
+               else
+               {
+                       filterStr.clear();
+               }
+
+               m_settings->mostRecentInputPath(QDir(selectedFolder).canonicalPath());
+               addFolder(selectedFolder, action->data().toBool(), false, filterStr);
        }
 }
 
@@ -2342,11 +2452,33 @@ void MainWindow::openFolderActionActivated(void)
  */
 void MainWindow::removeFileButtonClicked(void)
 {
-       if(ui->sourceFileView->currentIndex().isValid())
+       const QItemSelectionModel *const selection = ui->sourceFileView->selectionModel();
+       if(selection && selection->hasSelection())
        {
-               int iRow = ui->sourceFileView->currentIndex().row();
-               m_fileListModel->removeFile(ui->sourceFileView->currentIndex());
-               ui->sourceFileView->selectRow(iRow < m_fileListModel->rowCount() ? iRow : m_fileListModel->rowCount()-1);
+               int firstRow = -1;
+               const QModelIndexList selectedRows = INVERT_LIST(selection->selectedRows());
+               if(!selectedRows.isEmpty())
+               {
+                       FileListBlockHelper fileListBlocker(m_fileListModel);
+                       firstRow = selectedRows.last().row();
+                       for(QModelIndexList::ConstIterator iter = selectedRows.constBegin(); iter != selectedRows.constEnd(); iter++)
+                       {
+                               if(!m_fileListModel->removeFile(*iter))
+                               {
+                                       break;
+                               }
+                       }
+               }
+               if(m_fileListModel->rowCount() > 0)
+               {
+                       const QModelIndex position = m_fileListModel->index(((firstRow >= 0) && (firstRow < m_fileListModel->rowCount())) ? firstRow : (m_fileListModel->rowCount() - 1), 0);
+                       ui->sourceFileView->selectRow(position.row());
+                       ui->sourceFileView->scrollTo(position, QAbstractItemView::PositionAtCenter);
+               }
+       }
+       else
+       {
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
        }
 }
 
@@ -2355,7 +2487,14 @@ void MainWindow::removeFileButtonClicked(void)
  */
 void MainWindow::clearFilesButtonClicked(void)
 {
-       m_fileListModel->clearFiles();
+       if(m_fileListModel->rowCount() > 0)
+       {
+               m_fileListModel->clearFiles();
+       }
+       else
+       {
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
+       }
 }
 
 /*
@@ -2363,12 +2502,7 @@ void MainWindow::clearFilesButtonClicked(void)
  */
 void MainWindow::fileUpButtonClicked(void)
 {
-       if(ui->sourceFileView->currentIndex().isValid())
-       {
-               int iRow = ui->sourceFileView->currentIndex().row() - 1;
-               m_fileListModel->moveFile(ui->sourceFileView->currentIndex(), -1);
-               ui->sourceFileView->selectRow(iRow >= 0 ? iRow : 0);
-       }
+       moveSelectedFiles(true);
 }
 
 /*
@@ -2376,12 +2510,7 @@ void MainWindow::fileUpButtonClicked(void)
  */
 void MainWindow::fileDownButtonClicked(void)
 {
-       if(ui->sourceFileView->currentIndex().isValid())
-       {
-               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);
-       }
+       moveSelectedFiles(false);
 }
 
 /*
@@ -2392,40 +2521,47 @@ void MainWindow::showDetailsButtonClicked(void)
        ABORT_IF_BUSY;
 
        int iResult = 0;
-       MetaInfoDialog *metaInfoDialog = new MetaInfoDialog(this);
        QModelIndex index = ui->sourceFileView->currentIndex();
-
-       while(index.isValid())
+       
+       if(index.isValid())
        {
-               if(iResult > 0)
-               {
-                       index = m_fileListModel->index(index.row() + 1, index.column()); 
-                       ui->sourceFileView->selectRow(index.row());
-               }
-               if(iResult < 0)
+               ui->sourceFileView->selectRow(index.row());
+               QScopedPointer<MetaInfoDialog> metaInfoDialog(new MetaInfoDialog(this));
+               forever
                {
-                       index = m_fileListModel->index(index.row() - 1, index.column()); 
-                       ui->sourceFileView->selectRow(index.row());
-               }
-
-               AudioFileModel &file = (*m_fileListModel)[index];
-               TEMP_HIDE_DROPBOX
-               (
+                       AudioFileModel &file = (*m_fileListModel)[index];
+                       WidgetHideHelper hiderHelper(m_dropBox.data());
                        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);
-                       ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->tabMetaData));
-                       break;
-               }
+                       //Copy all info to Meta Info tab
+                       if(iResult == INT_MAX)
+                       {
+                               m_metaInfoModel->assignInfoFrom(file);
+                               ui->tabWidget->setCurrentIndex(ui->tabWidget->indexOf(ui->tabMetaData));
+                               break;
+                       }
 
-               if(!iResult) break;
+                       if(iResult > 0)
+                       {
+                               index = m_fileListModel->index(index.row() + 1, index.column()); 
+                               ui->sourceFileView->selectRow(index.row());
+                               continue;
+                       }
+                       else if(iResult < 0)
+                       {
+                               index = m_fileListModel->index(index.row() - 1, index.column()); 
+                               ui->sourceFileView->selectRow(index.row());
+                               continue;
+                       }               
+
+                       break; /*close dilalog now*/
+               }
+       }
+       else
+       {
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
        }
 
-       MUTILS_DELETE(metaInfoDialog);
        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
        sourceFilesScrollbarMoved(0);
 }
@@ -2466,7 +2602,7 @@ void MainWindow::previewContextActionTriggered(void)
                return;
        }
 
-       if(!lamexp_open_media_file(m_fileListModel->getFile(index).filePath()))
+       if(!MUtils::OS::open_media_file(m_fileListModel->getFile(index).filePath()))
        {
                qDebug("Player not found, falling back to default application...");
                QDesktopServices::openUrl(QString("file:///").append(m_fileListModel->getFile(index).filePath()));
@@ -2516,7 +2652,7 @@ void MainWindow::handleDroppedFiles(void)
        const QString bannerText = tr("Loading dropped files or folders, please wait...");
        bool bUseBanner = false;
 
-       SHOW_BANNER_CONDITIONALLY(bUseBanner, (m_droppedFileList->count() >= MIN_COUNT), bannerText);
+       showBanner(bannerText, bUseBanner, (m_droppedFileList->count() >= MIN_COUNT));
 
        QStringList droppedFiles;
        while(!m_droppedFileList->isEmpty())
@@ -2542,7 +2678,7 @@ void MainWindow::handleDroppedFiles(void)
                        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);
+                               showBanner(bannerText, bUseBanner, (list.count() >= MIN_COUNT));
                                for(QFileInfoList::ConstIterator iter = list.constBegin(); iter != list.constEnd(); iter++)
                                {
                                        droppedFiles << (*iter).canonicalFilePath();
@@ -2551,7 +2687,7 @@ void MainWindow::handleDroppedFiles(void)
                        else
                        {
                                list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
-                               SHOW_BANNER_CONDITIONALLY(bUseBanner, (list.count() >= MIN_COUNT), bannerText);
+                               showBanner(bannerText, bUseBanner, (list.count() >= MIN_COUNT));
                                for(QFileInfoList::ConstIterator iter = list.constBegin(); iter != list.constEnd(); iter++)
                                {
                                        qDebug("Descending to Folder: %s", MUTILS_UTF8((*iter).canonicalFilePath()));
@@ -2590,8 +2726,12 @@ void MainWindow::handleDelayedFiles(void)
                return;
        }
        
-       WITH_BLOCKED_SIGNALS(ui->tabWidget, setCurrentIndex, 0);
-       tabPageChanged(ui->tabWidget->currentIndex(), true);
+       if(ui->tabWidget->currentIndex() != 0)
+       {
+               SignalBlockHelper signalBlockHelper(ui->tabWidget);
+               ui->tabWidget->setCurrentIndex(0);
+               tabPageChanged(ui->tabWidget->currentIndex(), true);
+       }
        
        QStringList selectedFiles;
        while(!m_delayedFileList->isEmpty())
@@ -2612,49 +2752,48 @@ void MainWindow::handleDelayedFiles(void)
  */
 void MainWindow::exportCsvContextActionTriggered(void)
 {
-       TEMP_HIDE_DROPBOX
-       (
-               QString selectedCsvFile;
-       
-               if(lamexp_themes_enabled())
-               {
-                       selectedCsvFile = QFileDialog::getSaveFileName(this, tr("Save CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
-               }
-               else
+       ABORT_IF_BUSY;
+       WidgetHideHelper hiderHelper(m_dropBox.data());
+
+       QString selectedCsvFile;
+       if(MUtils::GUI::themes_enabled())
+       {
+               selectedCsvFile = QFileDialog::getSaveFileName(this, tr("Save CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
+       }
+       else
+       {
+               QFileDialog dialog(this, tr("Save CSV file"));
+               dialog.setFileMode(QFileDialog::AnyFile);
+               dialog.setAcceptMode(QFileDialog::AcceptSave);
+               dialog.setNameFilter(QString("%1 (*.csv)").arg(tr("CSV File")));
+               dialog.setDirectory(m_settings->mostRecentInputPath());
+               if(dialog.exec())
                {
-                       QFileDialog dialog(this, tr("Save CSV file"));
-                       dialog.setFileMode(QFileDialog::AnyFile);
-                       dialog.setAcceptMode(QFileDialog::AcceptSave);
-                       dialog.setNameFilter(QString("%1 (*.csv)").arg(tr("CSV File")));
-                       dialog.setDirectory(m_settings->mostRecentInputPath());
-                       if(dialog.exec())
-                       {
-                               selectedCsvFile = dialog.selectedFiles().first();
-                       }
+                       selectedCsvFile = dialog.selectedFiles().first();
                }
+       }
 
-               if(!selectedCsvFile.isEmpty())
+       if(!selectedCsvFile.isEmpty())
+       {
+               m_settings->mostRecentInputPath(QFileInfo(selectedCsvFile).canonicalPath());
+               switch(m_fileListModel->exportToCsv(selectedCsvFile))
                {
-                       m_settings->mostRecentInputPath(QFileInfo(selectedCsvFile).canonicalPath());
-                       switch(m_fileListModel->exportToCsv(selectedCsvFile))
-                       {
-                       case FileListModel::CsvError_NoTags:
-                               QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, there are no meta tags that can be exported!")));
-                               break;
-                       case FileListModel::CsvError_FileOpen:
-                               QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, failed to open CSV file for writing!")));
-                               break;
-                       case FileListModel::CsvError_FileWrite:
-                               QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, failed to write to the CSV file!")));
-                               break;
-                       case FileListModel::CsvError_OK:
-                               QMessageBox::information(this, tr("CSV Export"), NOBR(tr("The CSV files was created successfully!")));
-                               break;
-                       default:
-                               qWarning("exportToCsv: Unknown return code!");
-                       }
+               case FileListModel::CsvError_NoTags:
+                       QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, there are no meta tags that can be exported!")));
+                       break;
+               case FileListModel::CsvError_FileOpen:
+                       QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, failed to open CSV file for writing!")));
+                       break;
+               case FileListModel::CsvError_FileWrite:
+                       QMessageBox::critical(this, tr("CSV Export"), NOBR(tr("Sorry, failed to write to the CSV file!")));
+                       break;
+               case FileListModel::CsvError_OK:
+                       QMessageBox::information(this, tr("CSV Export"), NOBR(tr("The CSV files was created successfully!")));
+                       break;
+               default:
+                       qWarning("exportToCsv: Unknown return code!");
                }
-       );
+       }
 }
 
 
@@ -2663,54 +2802,53 @@ void MainWindow::exportCsvContextActionTriggered(void)
  */
 void MainWindow::importCsvContextActionTriggered(void)
 {
-       TEMP_HIDE_DROPBOX
-       (
-               QString selectedCsvFile;
-       
-               if(lamexp_themes_enabled())
+       ABORT_IF_BUSY;
+       WidgetHideHelper hiderHelper(m_dropBox.data());
+
+       QString selectedCsvFile;
+       if(MUtils::GUI::themes_enabled())
+       {
+               selectedCsvFile = QFileDialog::getOpenFileName(this, tr("Open CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
+       }
+       else
+       {
+               QFileDialog dialog(this, tr("Open CSV file"));
+               dialog.setFileMode(QFileDialog::ExistingFile);
+               dialog.setNameFilter(QString("%1 (*.csv)").arg(tr("CSV File")));
+               dialog.setDirectory(m_settings->mostRecentInputPath());
+               if(dialog.exec())
                {
-                       selectedCsvFile = QFileDialog::getOpenFileName(this, tr("Open CSV file"), m_settings->mostRecentInputPath(), QString("%1 (*.csv)").arg(tr("CSV File")));
-               }
-               else
-               {
-                       QFileDialog dialog(this, tr("Open CSV file"));
-                       dialog.setFileMode(QFileDialog::ExistingFile);
-                       dialog.setNameFilter(QString("%1 (*.csv)").arg(tr("CSV File")));
-                       dialog.setDirectory(m_settings->mostRecentInputPath());
-                       if(dialog.exec())
-                       {
-                               selectedCsvFile = dialog.selectedFiles().first();
-                       }
+                       selectedCsvFile = dialog.selectedFiles().first();
                }
+       }
 
-               if(!selectedCsvFile.isEmpty())
+       if(!selectedCsvFile.isEmpty())
+       {
+               m_settings->mostRecentInputPath(QFileInfo(selectedCsvFile).canonicalPath());
+               switch(m_fileListModel->importFromCsv(this, selectedCsvFile))
                {
-                       m_settings->mostRecentInputPath(QFileInfo(selectedCsvFile).canonicalPath());
-                       switch(m_fileListModel->importFromCsv(this, selectedCsvFile))
-                       {
-                       case FileListModel::CsvError_FileOpen:
-                               QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, failed to open CSV file for reading!")));
-                               break;
-                       case FileListModel::CsvError_FileRead:
-                               QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, failed to read from the CSV file!")));
-                               break;
-                       case FileListModel::CsvError_NoTags:
-                               QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, the CSV file does not contain any known fields!")));
-                               break;
-                       case FileListModel::CsvError_Incomplete:
-                               QMessageBox::warning(this, tr("CSV Import"), NOBR(tr("CSV file is incomplete. Not all files were updated!")));
-                               break;
-                       case FileListModel::CsvError_OK:
-                               QMessageBox::information(this, tr("CSV Import"), NOBR(tr("The CSV files was imported successfully!")));
-                               break;
-                       case FileListModel::CsvError_Aborted:
-                               /* User aborted, ignore! */
-                               break;
-                       default:
-                               qWarning("exportToCsv: Unknown return code!");
-                       }
+               case FileListModel::CsvError_FileOpen:
+                       QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, failed to open CSV file for reading!")));
+                       break;
+               case FileListModel::CsvError_FileRead:
+                       QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, failed to read from the CSV file!")));
+                       break;
+               case FileListModel::CsvError_NoTags:
+                       QMessageBox::critical(this, tr("CSV Import"), NOBR(tr("Sorry, the CSV file does not contain any known fields!")));
+                       break;
+               case FileListModel::CsvError_Incomplete:
+                       QMessageBox::warning(this, tr("CSV Import"), NOBR(tr("CSV file is incomplete. Not all files were updated!")));
+                       break;
+               case FileListModel::CsvError_OK:
+                       QMessageBox::information(this, tr("CSV Import"), NOBR(tr("The CSV files was imported successfully!")));
+                       break;
+               case FileListModel::CsvError_Aborted:
+                       /* User aborted, ignore! */
+                       break;
+               default:
+                       qWarning("exportToCsv: Unknown return code!");
                }
-       );
+       }
 }
 
 /*
@@ -2778,7 +2916,7 @@ void MainWindow::gotoDesktopButtonClicked(void)
        {
                ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(desktopPath));
                outputFolderViewClicked(ui->outputFolderView->currentIndex());
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
        else
        {
@@ -2803,7 +2941,7 @@ void MainWindow::gotoHomeFolderButtonClicked(void)
        {
                ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(homePath));
                outputFolderViewClicked(ui->outputFolderView->currentIndex());
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
        else
        {
@@ -2828,7 +2966,7 @@ void MainWindow::gotoMusicFolderButtonClicked(void)
        {
                ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(musicPath));
                outputFolderViewClicked(ui->outputFolderView->currentIndex());
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
        else
        {
@@ -2856,11 +2994,11 @@ void MainWindow::gotoFavoriteFolder(void)
                {
                        ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(path.canonicalPath()));
                        outputFolderViewClicked(ui->outputFolderView->currentIndex());
-                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
                }
                else
                {
-                       lamexp_beep(lamexp_beep_error);
+                       MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
                        m_outputFolderFavoritesMenu->removeAction(item);
                        item->deleteLater();
                }
@@ -2921,7 +3059,7 @@ void MainWindow::makeFolderButtonClicked(void)
                }
        }
        
-       suggestedName = lamexp_clean_filename(suggestedName);
+       suggestedName = MUtils::clean_file_name(suggestedName);
 
        while(true)
        {
@@ -2930,11 +3068,11 @@ void MainWindow::makeFolderButtonClicked(void)
 
                if(bApplied)
                {
-                       folderName = lamexp_clean_filepath(folderName.simplified());
+                       folderName = MUtils::clean_file_path(folderName.simplified());
 
                        if(folderName.isEmpty())
                        {
-                               lamexp_beep(lamexp_beep_error);
+                               MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
                                continue;
                        }
 
@@ -2954,7 +3092,7 @@ void MainWindow::makeFolderButtonClicked(void)
                                        QModelIndex newIndex = m_fileSystemModel->index(createdDir.canonicalPath());
                                        ui->outputFolderView->setCurrentIndex(newIndex);
                                        outputFolderViewClicked(newIndex);
-                                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+                                       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
                                }
                        }
                        else
@@ -3009,7 +3147,7 @@ void MainWindow::showFolderContextActionTriggered(void)
 
        QString path = QDir::toNativeSeparators(m_fileSystemModel->filePath(ui->outputFolderView->currentIndex()));
        if(!path.endsWith(QDir::separator())) path.append(QDir::separator());
-       lamexp_exec_shell(this, path, true);
+       MUtils::OS::shell_open(this, path, true);
 }
 
 /*
@@ -3038,9 +3176,9 @@ void MainWindow::goUpFolderContextActionTriggered(void)
                }
                else
                {
-                       lamexp_beep(lamexp_beep_warning);
+                       MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
                }
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
 }
 
@@ -3059,7 +3197,7 @@ void MainWindow::addFavoriteFolderActionTriggered(void)
        }
        else
        {
-               lamexp_beep(lamexp_beep_warning);
+               MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
        }
 
        m_settings->favoriteOutputFolders(favorites.join("|"));
@@ -3125,8 +3263,8 @@ void MainWindow::outputFolderEditFinished(void)
        ui->outputFolderLabel->setVisible(true);
        ui->outputFolderView->setEnabled(true);
 
-       if(!ok) lamexp_beep(lamexp_beep_error);
-       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+       if(!ok) MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
+       CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
 }
 
 /*
@@ -3143,17 +3281,17 @@ void MainWindow::initOutputFolderModel(void)
                if(m_fileSystemModel)
                {
                        SET_MODEL(ui->outputFolderView, NULL);
-                       MUTILS_DELETE(m_fileSystemModel);
                        ui->outputFolderView->repaint();
                }
 
-               if(m_fileSystemModel = new QFileSystemModelEx())
+               m_fileSystemModel.reset(new QFileSystemModelEx());
+               if(!m_fileSystemModel.isNull())
                {
                        m_fileSystemModel->installEventFilter(this);
-                       connect(m_fileSystemModel, SIGNAL(directoryLoaded(QString)), this, SLOT(outputFolderDirectoryLoaded(QString)));
-                       connect(m_fileSystemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(outputFolderRowsInserted(QModelIndex,int,int)));
+                       connect(m_fileSystemModel.data(), SIGNAL(directoryLoaded(QString)),          this, SLOT(outputFolderDirectoryLoaded(QString)));
+                       connect(m_fileSystemModel.data(), SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(outputFolderRowsInserted(QModelIndex,int,int)));
 
-                       SET_MODEL(ui->outputFolderView, m_fileSystemModel);
+                       SET_MODEL(ui->outputFolderView, m_fileSystemModel.data());
                        ui->outputFolderView->header()->setStretchLastSection(true);
                        ui->outputFolderView->header()->hideSection(1);
                        ui->outputFolderView->header()->hideSection(2);
@@ -3165,7 +3303,7 @@ void MainWindow::initOutputFolderModel(void)
                        outputFolderViewClicked(ui->outputFolderView->currentIndex());
                }
 
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
                QTimer::singleShot(125, this, SLOT(initOutputFolderModel_doAsync()));
        }
 }
@@ -3182,7 +3320,7 @@ void MainWindow::initOutputFolderModel_doAsync(void)
        }
        else
        {
-               QTimer::singleShot(125, m_outputFolderNoteBox, SLOT(hide()));
+               QTimer::singleShot(125, m_outputFolderNoteBox.data(), SLOT(hide()));
                ui->outputFolderView->setFocus();
        }
 }
@@ -3220,7 +3358,7 @@ void MainWindow::outputFolderDirectoryLoaded(const QString &path)
 {
        if(m_outputFolderViewCentering)
        {
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
 }
 
@@ -3231,7 +3369,7 @@ void MainWindow::outputFolderRowsInserted(const QModelIndex &parent, int start,
 {
        if(m_outputFolderViewCentering)
        {
-               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+               CENTER_CURRENT_OUTPUT_FOLDER_DELAYED();
        }
 }
 
@@ -3280,7 +3418,7 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
                        {
                                QString path = ui->outputFolderLabel->text();
                                if(!path.endsWith(QDir::separator())) path.append(QDir::separator());
-                               lamexp_exec_shell(this, path, true);
+                               MUtils::OS::shell_open(this, path, true);
                        }
                        break;
                case QEvent::Enter:
@@ -3341,7 +3479,7 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
                                }
                                else
                                {
-                                       THROW("Oups, this is not supposed to happen!");
+                                       MUTILS_THROW("Oups, this is not supposed to happen!");
                                }
                        }
                }
@@ -3420,7 +3558,7 @@ void MainWindow::updateEncoder(int id)
        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!");
+       else MUTILS_THROW("It appears that the encoder does not support *any* RC mode!");
 
        //Apply current RC mode
        const int currentRCMode = EncoderRegistry::loadEncoderMode(m_settings, id);
@@ -3429,7 +3567,7 @@ void MainWindow::updateEncoder(int id)
                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!");
+               default: MUTILS_THROW("updateEncoder(): Unknown rc-mode encountered!");
        }
 
        //Display encoder description
@@ -3473,15 +3611,17 @@ void MainWindow::updateRCMode(int id)
        //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);
+               SignalBlockHelper signalBlockHelper(ui->sliderBitrate);
+               ui->sliderBitrate->setEnabled(true);
+               ui->sliderBitrate->setMinimum(0);
+               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);
+               SignalBlockHelper signalBlockHelper(ui->sliderBitrate);
+               ui->sliderBitrate->setEnabled(false);
+               ui->sliderBitrate->setMinimum(0);
+               ui->sliderBitrate->setMaximum(2);
        }
 
        //Now update bitrate/quality value!
@@ -3550,7 +3690,7 @@ void MainWindow::updateBitrate(int value)
                ui->labelBitrate->setText(tr("Uncompressed"));
                break;
        default:
-               THROW("Unknown display value type encountered!");
+               MUTILS_THROW("Unknown display value type encountered!");
                break;
        }
 }
@@ -3738,6 +3878,16 @@ void MainWindow::opusSettingsChanged(void)
 void MainWindow::normalizationEnabledChanged(bool checked)
 {
        m_settings->normalizationFilterEnabled(checked);
+       normalizationDynamicChanged(ui->checkBoxNormalizationFilterDynamic->isChecked());
+}
+
+/*
+ * Dynamic normalization enabled changed
+ */
+void MainWindow::normalizationDynamicChanged(bool checked)
+{
+       ui->spinBoxNormalizationFilterSize->setEnabled(ui->checkBoxNormalizationFilterEnabled->isChecked() && checked);
+       m_settings->normalizationFilterDynamic(checked);
 }
 
 /*
@@ -3751,9 +3901,30 @@ void MainWindow::normalizationMaxVolumeChanged(double value)
 /*
  * Normalization equalization mode changed
  */
-void MainWindow::normalizationModeChanged(int mode)
+void MainWindow::normalizationCoupledChanged(bool checked)
+{
+       m_settings->normalizationFilterCoupled(checked);
+}
+
+/*
+ * Normalization filter size changed
+ */
+void MainWindow::normalizationFilterSizeChanged(int value)
+{
+       m_settings->normalizationFilterSize(value);
+}
+
+/*
+ * Normalization filter size editing finished
+ */
+void MainWindow::normalizationFilterSizeFinished(void)
 {
-       m_settings->normalizationFilterEQMode(mode);
+       const int value = ui->spinBoxNormalizationFilterSize->value();
+       if((value % 2) != 1)
+       {
+               bool rnd = MUtils::parity(MUtils::next_rand32());
+               ui->spinBoxNormalizationFilterSize->setValue(rnd ? value+1 : value-1);
+       }
 }
 
 /*
@@ -3818,11 +3989,29 @@ void MainWindow::customParamsChanged(void)
 }
 
 /*
+ * One of the rename buttons has been clicked
+ */
+void MainWindow::renameButtonClicked(bool checked)
+{
+       if(QPushButton *const button  = dynamic_cast<QPushButton*>(QObject::sender()))
+       {
+               QWidget *pages[]       = { ui->pageRename_Rename,   ui->pageRename_RegExp,   ui->pageRename_FileEx   };
+               QPushButton *buttons[] = { ui->buttonRename_Rename, ui->buttonRename_RegExp, ui->buttonRename_FileEx };
+               for(int i = 0; i < 3; i++)
+               {
+                       const bool match = (button == buttons[i]);
+                       buttons[i]->setChecked(match);
+                       if(match && checked) ui->stackedWidget->setCurrentWidget(pages[i]);
+               }
+       }
+}
+
+/*
  * Rename output files enabled changed
  */
-void MainWindow::renameOutputEnabledChanged(bool checked)
+void MainWindow::renameOutputEnabledChanged(const bool &checked)
 {
-       m_settings->renameOutputFilesEnabled(checked);
+       m_settings->renameFiles_renameEnabled(checked);
 }
 
 /*
@@ -3831,14 +4020,14 @@ void MainWindow::renameOutputEnabledChanged(bool checked)
 void MainWindow::renameOutputPatternChanged(void)
 {
        QString temp = ui->lineEditRenamePattern->text().simplified();
-       ui->lineEditRenamePattern->setText(temp.isEmpty() ? m_settings->renameOutputFilesPatternDefault() : temp);
-       m_settings->renameOutputFilesPattern(ui->lineEditRenamePattern->text());
+       ui->lineEditRenamePattern->setText(temp.isEmpty() ? m_settings->renameFiles_renamePatternDefault() : temp);
+       m_settings->renameFiles_renamePattern(ui->lineEditRenamePattern->text());
 }
 
 /*
  * Rename output files patterm changed
  */
-void MainWindow::renameOutputPatternChanged(const QString &text, bool silent)
+void MainWindow::renameOutputPatternChanged(const QString &text, const bool &silent)
 {
        QString pattern(text.simplified());
        
@@ -3850,13 +4039,13 @@ void MainWindow::renameOutputPatternChanged(const QString &text, bool silent)
        pattern.replace("<Year>", "2001", Qt::CaseInsensitive);
        pattern.replace("<Comment>", "Encoded by LameXP", Qt::CaseInsensitive);
 
-       const QString patternClean = lamexp_clean_filename(pattern);
+       const QString patternClean = MUtils::clean_file_name(pattern);
 
        if(pattern.compare(patternClean))
        {
                if(ui->lineEditRenamePattern->palette().color(QPalette::Text) != Qt::red)
                {
-                       if(!silent) lamexp_beep(lamexp_beep_error);
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
                        SET_TEXT_COLOR(ui->lineEditRenamePattern, Qt::red);
                }
        }
@@ -3864,7 +4053,7 @@ void MainWindow::renameOutputPatternChanged(const QString &text, bool silent)
        {
                if(ui->lineEditRenamePattern->palette() != QPalette())
                {
-                       if(!silent) lamexp_beep(lamexp_beep_info);
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_NFO);
                        ui->lineEditRenamePattern->setPalette(QPalette());
                }
        }
@@ -3873,13 +4062,107 @@ void MainWindow::renameOutputPatternChanged(const QString &text, bool silent)
 }
 
 /*
+ * Regular expression enabled changed
+ */
+void MainWindow::renameRegExpEnabledChanged(const bool &checked)
+{
+       m_settings->renameFiles_regExpEnabled(checked);
+}
+
+/*
+ * Regular expression value has changed
+ */
+void  MainWindow::renameRegExpValueChanged(void)
+{
+       const QString search  = ui->lineEditRenameRegExp_Search->text() .trimmed();
+       const QString replace = ui->lineEditRenameRegExp_Replace->text().simplified();
+       ui->lineEditRenameRegExp_Search ->setText(search.isEmpty()  ? m_settings->renameFiles_regExpSearchDefault()  : search);
+       ui->lineEditRenameRegExp_Replace->setText(replace.isEmpty() ? m_settings->renameFiles_regExpReplaceDefault() : replace);
+       m_settings->renameFiles_regExpSearch (ui->lineEditRenameRegExp_Search ->text());
+       m_settings->renameFiles_regExpReplace(ui->lineEditRenameRegExp_Replace->text());
+}
+
+/*
+ * Regular expression search pattern has changed
+ */
+void  MainWindow::renameRegExpSearchChanged(const QString &text, const bool &silent)
+{
+       const QString pattern(text.trimmed());
+
+       if((!pattern.isEmpty()) && (!QRegExp(pattern.trimmed()).isValid()))
+       {
+               if(ui->lineEditRenameRegExp_Search->palette().color(QPalette::Text) != Qt::red)
+               {
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
+                       SET_TEXT_COLOR(ui->lineEditRenameRegExp_Search, Qt::red);
+               }
+       }
+       else
+       {
+               if(ui->lineEditRenameRegExp_Search->palette() != QPalette())
+               {
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_NFO);
+                       ui->lineEditRenameRegExp_Search->setPalette(QPalette());
+               }
+       }
+
+       renameRegExpReplaceChanged(ui->lineEditRenameRegExp_Replace->text(), silent);
+}
+
+/*
+ * Regular expression replacement string changed
+ */
+void  MainWindow::renameRegExpReplaceChanged(const QString &text, const bool &silent)
+{
+       QString replacement(text.simplified());
+       const QString search(ui->lineEditRenameRegExp_Search->text().trimmed());
+
+       if(!search.isEmpty())
+       {
+               const QRegExp regexp(search);
+               if(regexp.isValid())
+               {
+                       const int count = regexp.captureCount();
+                       const QString blank; 
+                       for(int i = 0; i < count; i++)
+                       {
+                               replacement.replace(QString("\\%0").arg(QString::number(i+1)), blank);
+                       }
+               }
+       }
+
+       if(replacement.compare(MUtils::clean_file_name(replacement)))
+       {
+               if(ui->lineEditRenameRegExp_Replace->palette().color(QPalette::Text) != Qt::red)
+               {
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
+                       SET_TEXT_COLOR(ui->lineEditRenameRegExp_Replace, Qt::red);
+               }
+       }
+       else
+       {
+               if(ui->lineEditRenameRegExp_Replace->palette() != QPalette())
+               {
+                       if(!silent) MUtils::Sound::beep(MUtils::Sound::BEEP_NFO);
+                       ui->lineEditRenameRegExp_Replace->setPalette(QPalette());
+               }
+       }
+}
+
+/*
  * Show list of rename macros
  */
 void MainWindow::showRenameMacros(const QString &text)
 {
        if(text.compare("reset", Qt::CaseInsensitive) == 0)
        {
-               ui->lineEditRenamePattern->setText(m_settings->renameOutputFilesPatternDefault());
+               ui->lineEditRenamePattern->setText(m_settings->renameFiles_renamePatternDefault());
+               return;
+       }
+
+       if(text.compare("regexp", Qt::CaseInsensitive) == 0)
+       {
+               MUtils::OS::shell_open(this, "http://www.regular-expressions.info/quickstart.html");
                return;
        }
 
@@ -3900,6 +4183,38 @@ void MainWindow::showRenameMacros(const QString &text)
        QMessageBox::information(this, tr("Rename Macros"), message, tr("Discard"));
 }
 
+void MainWindow::fileExtAddButtonClicked(void)
+{
+       if(FileExtsModel *const model = dynamic_cast<FileExtsModel*>(ui->tableViewFileExts->model()))
+       {
+               model->addOverwrite(this);
+       }
+}
+
+void MainWindow::fileExtRemoveButtonClicked(void)
+{
+       if(FileExtsModel *const model = dynamic_cast<FileExtsModel*>(ui->tableViewFileExts->model()))
+       {
+               const QModelIndex selected = ui->tableViewFileExts->currentIndex();
+               if(selected.isValid())
+               {
+                       model->removeOverwrite(selected);
+               }
+               else
+               {
+                       MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
+               }
+       }
+}
+
+void MainWindow::fileExtModelChanged(void)
+{
+       if(FileExtsModel *const model = dynamic_cast<FileExtsModel*>(ui->tableViewFileExts->model()))
+       {
+               m_settings->renameFiles_fileExtension(model->exportItems());
+       }
+}
+
 void MainWindow::forceStereoDownmixEnabledChanged(bool checked)
 {
        m_settings->forceStereoDownmix(checked);
@@ -3929,7 +4244,7 @@ void MainWindow::browseCustomTempFolderButtonClicked(void)
 {
        QString newTempFolder;
 
-       if(lamexp_themes_enabled())
+       if(MUtils::GUI::themes_enabled())
        {
                newTempFolder = QFileDialog::getExistingDirectory(this, QString(), m_settings->customTempPath());
        }
@@ -3994,22 +4309,23 @@ void MainWindow::customParamsHelpRequested(QWidget *obj, QEvent *event)
                }
        }
 
-       if(obj == ui->helpCustomParamLAME)         showCustomParamsHelpScreen("lame.exe", "--longhelp");
+       if(obj == ui->helpCustomParamLAME)         showCustomParamsHelpScreen("lame.exe",    "--longhelp");
        else if(obj == ui->helpCustomParamOggEnc)  showCustomParamsHelpScreen("oggenc2.exe", "--help");
        else if(obj == ui->helpCustomParamNeroAAC)
        {
                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;
+                       case SettingsModel::AAC_ENCODER_QAAC: showCustomParamsHelpScreen("qaac64.exe|qaac.exe", "--help"); break;
+                       case SettingsModel::AAC_ENCODER_FHG : showCustomParamsHelpScreen("fhgaacenc.exe",       ""      ); break;
+                       case SettingsModel::AAC_ENCODER_FDK : showCustomParamsHelpScreen("fdkaac.exe",          "--help"); break;
+                       case SettingsModel::AAC_ENCODER_NERO: showCustomParamsHelpScreen("neroAacEnc.exe",      "-help" ); break;
+                       default: MUtils::Sound::beep(MUtils::Sound::BEEP_ERR); break;
                }
        }
-       else if(obj == ui->helpCustomParamFLAC)    showCustomParamsHelpScreen("flac.exe", "--help");
-       else if(obj == ui->helpCustomParamAften)   showCustomParamsHelpScreen("aften.exe", "-h");
+       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);
+       else MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
 }
 
 /*
@@ -4017,10 +4333,20 @@ void MainWindow::customParamsHelpRequested(QWidget *obj, QEvent *event)
  */
 void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QString &command)
 {
-       const QString binary = lamexp_lookup_tool(toolName);
+       const QStringList toolNames = toolName.split('|', QString::SkipEmptyParts);
+       QString binary;
+       for(QStringList::ConstIterator iter = toolNames.constBegin(); iter != toolNames.constEnd(); iter++)
+       {
+               if(lamexp_tools_check(*iter))
+               {
+                       binary = lamexp_tools_lookup(*iter);
+                       break;
+               }
+       }
+
        if(binary.isEmpty())
        {
-               lamexp_beep(lamexp_beep_error);
+               MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
                qWarning("customParamsHelpRequested: Binary could not be found!");
                return;
        }
@@ -4064,12 +4390,12 @@ void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QStri
        if(output.count() < 1)
        {
                qWarning("Empty output, cannot show help screen!");
-               lamexp_beep(lamexp_beep_error);
+               MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);
        }
 
-       LogViewDialog *dialog = new LogViewDialog(this);
-       TEMP_HIDE_DROPBOX( dialog->exec(output); );
-       MUTILS_DELETE(dialog);
+       WidgetHideHelper hiderHelper(m_dropBox.data());
+       QScopedPointer<LogViewDialog> dialog(new LogViewDialog(this));
+       dialog->exec(output);
 }
 
 void MainWindow::overwriteModeChanged(int id)
@@ -4094,46 +4420,59 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
 {
        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->sliderLameAlgoQuality         ->setValue(m_settings->lameAlgoQualityDefault());
+       ui->spinBoxBitrateManagementMin   ->setValue(m_settings->bitrateManagementMinRateDefault());
+       ui->spinBoxBitrateManagementMax   ->setValue(m_settings->bitrateManagementMaxRateDefault());
+       ui->spinBoxNormalizationFilterPeak->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolumeDefault()) / 100.0);
+       ui->spinBoxNormalizationFilterSize->setValue(m_settings->normalizationFilterSizeDefault());
+       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->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->checkBoxNormalizationFilterEnabled, m_settings->normalizationFilterEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilterDynamic, m_settings->normalizationFilterDynamicDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxNormalizationFilterCoupled, m_settings->normalizationFilterCoupledDefault());
+       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->checkBoxRename_Rename,              m_settings->renameFiles_renameEnabledDefault());
+       SET_CHECKBOX_STATE(ui->checkBoxRename_RegExp,              m_settings->renameFiles_regExpEnabledDefault());
+       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());
+       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->renameFiles_renamePatternDefault());
+       ui->lineEditRenameRegExp_Search ->setText(m_settings->renameFiles_regExpSearchDefault());
+       ui->lineEditRenameRegExp_Replace->setText(m_settings->renameFiles_regExpReplaceDefault());
 
        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();
+       if(FileExtsModel *const model = dynamic_cast<FileExtsModel*>(ui->tableViewFileExts->model()))
+       {
+               model->importItems(m_settings->renameFiles_fileExtensionDefault());
+       }
+
        ui->scrollArea->verticalScrollBar()->setValue(0);
+       ui->buttonRename_Rename->click();
+       customParamsChanged();
+       renameOutputPatternChanged();
+       renameRegExpValueChanged();
 }
 
 // =========================================================