fixed cmake scripts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@236 90c681e8-e032-0410-971d-27865f9a5e38

27 files changed, 482 insertions, 904 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ecd753d7..0ab4b2f91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET(LIB_DIR "lib" CACHE STRING "library path")
-add_subdirectory(lib)
-add_subdirectory(lib/qmmp)
-add_subdirectory(src)
+add_subdirectory(src/qmmp)
+add_subdirectory(src/qmmpui)
+add_subdirectory(src/ui)
+add_subdirectory(src/plugins)
 
diff --git a/clear_cmake.sh b/clear_cmake.sh
index 68a526977..b8059a477 100755
--- a/clear_cmake.sh
+++ b/clear_cmake.sh
@@ -1,73 +1,33 @@
 #!/bin/sh
 
+make clean
+
+rm_dir='CMakeFiles'
+
+clear () { rm -f Makefile; rm -f cmake_install.cmake; rm -f CMakeCache.txt; }
+
+walk_dirs(){
+
+    for file in `ls -a`
+    do
+        if [ -d $file ]
+        then
+            if [ $file == $rm_dir ]
+            then
+                echo "Removing $rm_dir directory..."
+                rm -rf $rm_dir
+                clear
+            elif [[ $file != '.' && $file != '..' ]]
+            then
+                echo "Entering $file"
+                cd $file;
+                walk_dirs;
+                cd ..
+            fi
+        fi
+    done
+}
+
+walk_dirs
 
-clear () { rm -rf CMakeFiles; rm -f Makefile; rm -f cmake_install.cmake; rm -f CMakeCache.txt; }
 
-make clean
-clear
-#clear src 
-cd src
-clear
-cd ..
-#clear lib
-cd lib
-clear
-#clear qmmp
-cd qmmp
-clear
-#clear Input
-cd Input
-clear
-#clear ffmpeg
-cd ffmpeg
-clear
-#clear mad
-cd ..
-cd mad
-clear
-#clear mpc
-cd ..
-cd mpc 
-clear
-#clear flac
-cd ..
-cd flac
-clear
-#clear vorbis
-cd ..
-cd vorbis
-clear
-#clear sndfile
-cd ..
-cd sndfile
-clear
-#clear Output
-cd ..
-cd ..
-cd Output 
-clear
-#clear alsa
-cd alsa 
-clear
-#clear jack
-cd ..
-cd jack 
-clear
-#clear oss
-cd ..
-cd oss
-clear
-#clear visual
-cd ..
-cd ..
-cd Visual
-clear
-cd analyzer
-clear
-#clear effect
-cd ..
-cd ..
-cd Effect
-clear
-cd srconverter
-clear
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index be0d02e78..000000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-project(libsrc)
-
-cmake_minimum_required(VERSION 2.4.0)
-
-SET(QT_USE_QTXML TRUE)
-SET(QT_USE_QTNETWORK TRUE)
-
-INCLUDE(UsePkgConfig)
-INCLUDE(FindQt4)
-
-find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
-include(${QT_USE_FILE})
-
-ADD_DEFINITIONS( -Wall )
-ADD_DEFINITIONS(-DQT_NO_DEBUG)
-ADD_DEFINITIONS(-DQT_THREAD)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-SET(QT_INCLUDES
-  ${QT_INCLUDES}
-  ${CMAKE_CURRENT_BINARY_DIR}/../../../
-)
-
-# libqmmp
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../lib)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../lib)
-link_directories(${CMAKE_INSTALL_PREFIX}/lib)
-
-SET(libsrc_SRCS
-  aboutdialog.cpp
-  addurldialog.cpp
-  balancebar.cpp
-  button.cpp
-  configdialog.cpp
-  display.cpp
-  dock.cpp
-  eqgraph.cpp
-  eqpreset.cpp
-  eqslider.cpp
-  eqtitlebar.cpp
-  eqwidget.cpp
-  filedialog.cpp
-  fileloader.cpp
-  jumptotrackdialog.cpp
-  keyboardmanager.cpp
-  listwidget.cpp
-  logscale.cpp
-  mainvisual.cpp
-  mainwindow.cpp
-  mediafile.cpp
-  monostereo.cpp
-  mp3player.cpp
-  number.cpp
-  pixmapwidget.cpp
-  playlistcontrol.cpp
-  playlist.cpp
-  playlistformat.cpp
-  playlistmodel.cpp
-  playlistslider.cpp
-  playlisttitlebar.cpp
-  playstate.cpp
-  playstatus.cpp
-  pluginitem.cpp
-  positionbar.cpp
-  preseteditor.cpp
-  qmmpstarter.cpp
-  skin.cpp
-  skinreader.cpp
-  symboldisplay.cpp
-  textscroller.cpp
-  timeindicator.cpp
-  titlebar.cpp
-  togglebutton.cpp
-  unixdomainsocket.cpp
-  visualmenu.cpp
-  volumebar.cpp
-  fft.c
-  shadedvisual.cpp
-  titlebarcontrol.cpp
-  shadedbar.cpp
-  commandlineoption.cpp
-)
-
-SET(libsrc_MOC_HDRS
-  aboutdialog.h
-  addurldialog.h
-  balancebar.h
-  button.h
-  configdialog.h
-  display.h
-  dock.h
-  eqgraph.h
-  eqpreset.h
-  eqslider.h
-  eqtitlebar.h
-  eqwidget.h
-  fft.h
-  filedialog.h
-  fileloader.h
-  inlines.h
-  jumptotrackdialog.h
-  keyboardmanager.h
-  listwidget.h
-  logscale.h
-  mainvisual.h
-  mainwindow.h
-  mediafile.h
-  monostereo.h
-  number.h
-  pixmapwidget.h
-  playlistcontrol.h
-  playlistformat.h
-  playlist.h
-  playlistmodel.h
-  playlistslider.h
-  playlisttitlebar.h
-  playstate.h
-  playstatus.h
-  pluginitem.h
-  positionbar.h
-  preseteditor.h
-  qmmpstarter.h
-  skin.h
-  skinreader.h
-  symboldisplay.h
-  textscroller.h
-  timeindicator.h
-  titlebar.h
-  togglebutton.h
-  unixdomainsocket.h
-  version.h
-  visualmenu.h
-  volumebar.h
-  shadedvisual.h
-  titlebarcontrol.h
-  shadedbar.h
-  commandlineoption.h
-)
-
-SET(libsrc_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc)
-
-QT4_ADD_RESOURCES(libsrc_RCC_SRCS ${libsrc_RCCS})
-
-QT4_AUTOMOC(${libsrc_MOC_SRC})
-QT4_WRAP_CPP(libsrc_MOC_SRCS ${libsrc_MOC_HDRS})
-
-# user interface
-
-
-SET(libsrc_UIS
-  configdialog.ui
-  preseteditor.ui
-  jumptotrackdialog.ui
-  aboutdialog.ui
-  addurldialog.ui
-)
-
-
-QT4_WRAP_UI(libsrc_UIS_H ${libsrc_UIS})
-# Don't forget to include output directory, otherwise
-# the UI file won't be wrapped!
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-ADD_EXECUTABLE(qmmp ${libsrc_SRCS} ${libsrc_MOC_SRCS} ${libsrc_UIS_H}
-  ${libsrc_RCC_SRCS})
-target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp)
-install(TARGETS qmmp DESTINATION bin PERMISSIONS PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 42382b5cd..9ab96dd16 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(Input)
 add_subdirectory(Output)
 add_subdirectory(Visual)
-add_subdirectory(Effect)
\ No newline at end of file
+add_subdirectory(Effect)
+add_subdirectory(General)
diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt
index ef95abf79..93556cc6d 100644
--- a/src/plugins/Effect/srconverter/CMakeLists.txt
+++ b/src/plugins/Effect/srconverter/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 PKGCONFIG(samplerate SAMPLERATE_INCLUDE_DIR SAMPLERATE_LINK_DIR SAMPLERATE_LINK_FLAGS SAMPLERATE_CFLAGS)
 
diff --git a/src/plugins/Effect/srconverter/effectsrconverterfactory.h b/src/plugins/Effect/srconverter/effectsrconverterfactory.h
index 4112a3af5..c9854a18b 100644
--- a/src/plugins/Effect/srconverter/effectsrconverterfactory.h
+++ b/src/plugins/Effect/srconverter/effectsrconverterfactory.h
@@ -23,8 +23,8 @@
 
 #include <QObject>
 
-#include <effectfactory.h>
-#include <effect.h>
+#include <qmmp/effectfactory.h>
+#include <qmmp/effect.h>
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index 8c6dcb6d3..3638383f9 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -20,7 +20,7 @@
 #ifndef SRCONVERTER_H
 #define SRCONVERTER_H
 
-#include <effect.h>
+#include <qmmp/effect.h>
 
 extern "C"
 {
diff --git a/src/plugins/Effect/srconverter/srconverter.pro b/src/plugins/Effect/srconverter/srconverter.pro
index af20c1e92..d50d5ce9a 100644
--- a/src/plugins/Effect/srconverter/srconverter.pro
+++ b/src/plugins/Effect/srconverter/srconverter.pro
@@ -10,7 +10,7 @@ SOURCES += srconverter.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Effect/srconverter
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libsrconverter.so
-INCLUDEPATH += ../../../qmmp
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt
new file mode 100644
index 000000000..e4769ef9d
--- /dev/null
+++ b/src/plugins/General/CMakeLists.txt
@@ -0,0 +1,24 @@
+SET(USE_DBUS TRUE CACHE BOOL "enable/disable dbus plugin")
+SET(USE_SCROBBLER TRUE CACHE BOOL "enable/disable scrobbler plugin")
+SET(USE_STATICON TRUE CACHE BOOL "enable/disable status icon plugin")
+
+IF(USE_DBUS)
+MESSAGE(STATUS "DBUS ON")
+#add_subdirectory(dbuscontrol)
+ELSE(USE_DBUS)
+MESSAGE(STATUS "DBUS OFF")
+ENDIF(USE_DBUS)
+
+IF(USE_SCROBBLER)
+MESSAGE( STATUS "SCROBBLER ON")
+add_subdirectory(scrobbler)
+ELSE(USE_SCROBBLER)
+MESSAGE( STATUS "SCROBBLER OFF")
+ENDIF(USE_SCROBBLER)
+
+IF(USE_STATICON)
+MESSAGE( STATUS "STATICON ON")
+add_subdirectory(statusicon)
+ELSE(USE_STATICON)
+MESSAGE( STATUS "STATICON OFF")
+ENDIF(USE_STATICON)
\ No newline at end of file
diff --git a/src/plugins/General/dbuscontrol/CMakeLists.txt b/src/plugins/General/dbuscontrol/CMakeLists.txt
new file mode 100644
index 000000000..8d4765dd2
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/CMakeLists.txt
@@ -0,0 +1,61 @@
+project(libdbuscontrol)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+SET(QT_USE_QTDBUS TRUE)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmpui
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+
+SET(libdbuscontrol_SRCS
+    dbuscontrol.cpp
+    dbuscontrolfactory.cpp
+    dbusadaptor.cpp
+)
+
+SET(libdbuscontrol_MOC_HDRS
+    dbuscontrolfactory.h
+    dbuscontrol.h
+    dbusadaptor.h
+)
+
+#SET(libdbuscontrol_RCCS translations/translations.qrc)
+
+#QT4_ADD_RESOURCES(libdbuscontrol_RCC_SRCS ${libdbuscontrol_RCCS})
+
+QT4_WRAP_CPP(libdbuscontrol_MOC_SRCS ${libdbuscontrol_MOC_HDRS})
+
+# user interface
+
+
+# QT4_WRAP_UI(libdbuscontrol_UIS_H ${libdbuscontrol_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(dbuscontrol SHARED ${libdbuscontrol_SRCS} ${libdbuscontrol_MOC_SRCS} ${libdbuscontrol_RCC_SRCS})
+target_link_libraries(dbuscontrol ${QT_LIBRARIES} -lqmmpui)
+install(TARGETS dbuscontrol DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt
new file mode 100644
index 000000000..5f09fd27d
--- /dev/null
+++ b/src/plugins/General/scrobbler/CMakeLists.txt
@@ -0,0 +1,65 @@
+project(libscrobbler)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+SET(QT_USE_QTNETWORK TRUE)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmpui
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+
+SET(libscrobbler_SRCS
+    settingsdialog.cpp
+    scrobbler.cpp
+    scrobblerfactory.cpp
+)
+
+SET(libscrobbler_MOC_HDRS
+    settingsdialog.h
+    scrobblerfactory.h
+    scrobbler.h
+)
+
+#SET(libscrobbler_RCCS translations/translations.qrc)
+
+#QT4_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS})
+
+QT4_WRAP_CPP(libscrobbler_MOC_SRCS ${libscrobbler_MOC_HDRS})
+
+# user interface
+
+
+SET(libscrobbler_UIS
+    settingsdialog.ui
+)
+
+QT4_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(scrobbler SHARED ${libscrobbler_SRCS} ${libscrobbler_MOC_SRCS} ${libscrobbler_UIS_H}
+  ${libscrobbler_RCC_SRCS})
+target_link_libraries(scrobbler ${QT_LIBRARIES} -lqmmpui)
+install(TARGETS scrobbler DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt
new file mode 100644
index 000000000..d2b28ecba
--- /dev/null
+++ b/src/plugins/General/statusicon/CMakeLists.txt
@@ -0,0 +1,65 @@
+project(libstatusicon)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmpui
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+
+SET(libstatusicon_SRCS
+    settingsdialog.cpp
+    statusicon.cpp
+    statusiconfactory.cpp
+)
+
+SET(libstatusicon_MOC_HDRS
+    settingsdialog.h
+    statusiconfactory.h
+    statusicon.h
+)
+
+#SET(libstatusicon_RCCS translations/translations.qrc)
+
+SET(libstatusicon_RCCS images/images.qrc)
+
+QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS})
+
+QT4_WRAP_CPP(libstatusicon_MOC_SRCS ${libstatusicon_MOC_HDRS})
+
+# user interface
+
+
+SET(libstatusicon_UIS
+    settingsdialog.ui
+)
+
+QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(statusicon SHARED ${libstatusicon_SRCS} ${libstatusicon_MOC_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS})
+target_link_libraries(statusicon ${QT_LIBRARIES} -lqmmpui)
+install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index 1ca0d4b7a..ef25ec4b6 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libffmpeg and taglib
 PKGCONFIG(libavcodec LIBAVCODEC_INCLUDE_DIR LIBAVCODEC_LINK_DIR LIBAVCODEC_LINK_FLAGS LIBAVCODEC_CFLAGS)
diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt
index 24041608c..1da4da015 100644
--- a/src/plugins/Input/flac/CMakeLists.txt
+++ b/src/plugins/Input/flac/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libflac and taglib
 PKGCONFIG(flac FLAC_INCLUDE_DIR FLAC_LINK_DIR FLAC_LINK_FLAGS FLAC_CFLAGS)
diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt
index 3e4dfa9d0..0fda693b5 100644
--- a/src/plugins/Input/mad/CMakeLists.txt
+++ b/src/plugins/Input/mad/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libmad and taglib
 PKGCONFIG(mad MAD_INCLUDE_DIR MAD_LINK_DIR MAD_LINK_FLAGS MAD_CFLAGS)
diff --git a/src/plugins/Input/mad/ui_detailsdialog.h b/src/plugins/Input/mad/ui_detailsdialog.h
deleted file mode 100644
index d630be894..000000000
--- a/src/plugins/Input/mad/ui_detailsdialog.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/********************************************************************************
-** Form generated from reading ui file 'detailsdialog.ui'
-**
-** Created: Thu Feb 7 00:21:43 2008
-**      by: Qt User Interface Compiler version 4.3.0
-**
-** WARNING! All changes made in this file will be lost when recompiling ui file!
-********************************************************************************/
-
-#ifndef UI_DETAILSDIALOG_H
-#define UI_DETAILSDIALOG_H
-
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
-
-class Ui_DetailsDialog
-{
-public:
-    QGridLayout *gridLayout;
-    QHBoxLayout *hboxLayout;
-    QLabel *label_28;
-    QLineEdit *pathLineEdit;
-    QVBoxLayout *vboxLayout;
-    QGroupBox *groupBox_3;
-    QHBoxLayout *hboxLayout1;
-    QRadioButton *id3v1RadioButton;
-    QRadioButton *id3v2RadioButton;
-    QRadioButton *apeRadioButton;
-    QGroupBox *groupBox;
-    QGridLayout *gridLayout1;
-    QLabel *label;
-    QLabel *levelLabel;
-    QLabel *label_2;
-    QLabel *bitRateLabel;
-    QLabel *label_3;
-    QLabel *sampleRateLabel;
-    QLabel *label_5;
-    QLabel *fileSizeLabel;
-    QLabel *label_6;
-    QLabel *modeLabel;
-    QLabel *label_8;
-    QLabel *copyrightLabel;
-    QLabel *label_9;
-    QLabel *originalLabel;
-    QGroupBox *tagGroupBox;
-    QVBoxLayout *vboxLayout1;
-    QWidget *tagsWidget;
-    QGridLayout *gridLayout2;
-    QLabel *label_21;
-    QLineEdit *titleLineEdit;
-    QLabel *label_22;
-    QLineEdit *artistLineEdit;
-    QLabel *label_23;
-    QLineEdit *albumLineEdit;
-    QLabel *label_24;
-    QLineEdit *commentLineEdit;
-    QLabel *label_25;
-    QLineEdit *yearLineEdit;
-    QLabel *label_26;
-    QLineEdit *trackLineEdit;
-    QLabel *label_27;
-    QLineEdit *genreLineEdit;
-    QHBoxLayout *hboxLayout2;
-    QPushButton *createButton;
-    QPushButton *deleteButton;
-    QPushButton *saveButton;
-    QSpacerItem *spacerItem;
-    QPushButton *pushButton_3;
-
-    void setupUi(QDialog *DetailsDialog)
-    {
-    if (DetailsDialog->objectName().isEmpty())
-        DetailsDialog->setObjectName(QString::fromUtf8("DetailsDialog"));
-    QSize size(593, 402);
-    size = size.expandedTo(DetailsDialog->minimumSizeHint());
-    DetailsDialog->resize(size);
-    gridLayout = new QGridLayout(DetailsDialog);
-    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
-    hboxLayout = new QHBoxLayout();
-    hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-    label_28 = new QLabel(DetailsDialog);
-    label_28->setObjectName(QString::fromUtf8("label_28"));
-    label_28->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
-
-    hboxLayout->addWidget(label_28);
-
-    pathLineEdit = new QLineEdit(DetailsDialog);
-    pathLineEdit->setObjectName(QString::fromUtf8("pathLineEdit"));
-    pathLineEdit->setReadOnly(true);
-
-    hboxLayout->addWidget(pathLineEdit);
-
-
-    gridLayout->addLayout(hboxLayout, 0, 0, 1, 3);
-
-    vboxLayout = new QVBoxLayout();
-    vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-    groupBox_3 = new QGroupBox(DetailsDialog);
-    groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
-    QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(groupBox_3->sizePolicy().hasHeightForWidth());
-    groupBox_3->setSizePolicy(sizePolicy);
-    hboxLayout1 = new QHBoxLayout(groupBox_3);
-    hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
-    id3v1RadioButton = new QRadioButton(groupBox_3);
-    id3v1RadioButton->setObjectName(QString::fromUtf8("id3v1RadioButton"));
-
-    hboxLayout1->addWidget(id3v1RadioButton);
-
-    id3v2RadioButton = new QRadioButton(groupBox_3);
-    id3v2RadioButton->setObjectName(QString::fromUtf8("id3v2RadioButton"));
-
-    hboxLayout1->addWidget(id3v2RadioButton);
-
-    apeRadioButton = new QRadioButton(groupBox_3);
-    apeRadioButton->setObjectName(QString::fromUtf8("apeRadioButton"));
-
-    hboxLayout1->addWidget(apeRadioButton);
-
-
-    vboxLayout->addWidget(groupBox_3);
-
-    groupBox = new QGroupBox(DetailsDialog);
-    groupBox->setObjectName(QString::fromUtf8("groupBox"));
-    groupBox->setMinimumSize(QSize(200, 16));
-    gridLayout1 = new QGridLayout(groupBox);
-    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
-    label = new QLabel(groupBox);
-    label->setObjectName(QString::fromUtf8("label"));
-    label->setTextFormat(Qt::AutoText);
-    label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label, 0, 0, 1, 1);
-
-    levelLabel = new QLabel(groupBox);
-    levelLabel->setObjectName(QString::fromUtf8("levelLabel"));
-
-    gridLayout1->addWidget(levelLabel, 0, 1, 1, 1);
-
-    label_2 = new QLabel(groupBox);
-    label_2->setObjectName(QString::fromUtf8("label_2"));
-    label_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_2, 1, 0, 1, 1);
-
-    bitRateLabel = new QLabel(groupBox);
-    bitRateLabel->setObjectName(QString::fromUtf8("bitRateLabel"));
-
-    gridLayout1->addWidget(bitRateLabel, 1, 1, 1, 1);
-
-    label_3 = new QLabel(groupBox);
-    label_3->setObjectName(QString::fromUtf8("label_3"));
-    label_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_3, 2, 0, 1, 1);
-
-    sampleRateLabel = new QLabel(groupBox);
-    sampleRateLabel->setObjectName(QString::fromUtf8("sampleRateLabel"));
-
-    gridLayout1->addWidget(sampleRateLabel, 2, 1, 1, 1);
-
-    label_5 = new QLabel(groupBox);
-    label_5->setObjectName(QString::fromUtf8("label_5"));
-    label_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_5, 3, 0, 1, 1);
-
-    fileSizeLabel = new QLabel(groupBox);
-    fileSizeLabel->setObjectName(QString::fromUtf8("fileSizeLabel"));
-
-    gridLayout1->addWidget(fileSizeLabel, 3, 1, 1, 1);
-
-    label_6 = new QLabel(groupBox);
-    label_6->setObjectName(QString::fromUtf8("label_6"));
-    label_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_6, 4, 0, 1, 1);
-
-    modeLabel = new QLabel(groupBox);
-    modeLabel->setObjectName(QString::fromUtf8("modeLabel"));
-
-    gridLayout1->addWidget(modeLabel, 4, 1, 1, 1);
-
-    label_8 = new QLabel(groupBox);
-    label_8->setObjectName(QString::fromUtf8("label_8"));
-    label_8->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_8, 5, 0, 1, 1);
-
-    copyrightLabel = new QLabel(groupBox);
-    copyrightLabel->setObjectName(QString::fromUtf8("copyrightLabel"));
-
-    gridLayout1->addWidget(copyrightLabel, 5, 1, 1, 1);
-
-    label_9 = new QLabel(groupBox);
-    label_9->setObjectName(QString::fromUtf8("label_9"));
-    label_9->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout1->addWidget(label_9, 6, 0, 1, 1);
-
-    originalLabel = new QLabel(groupBox);
-    originalLabel->setObjectName(QString::fromUtf8("originalLabel"));
-
-    gridLayout1->addWidget(originalLabel, 6, 1, 1, 1);
-
-
-    vboxLayout->addWidget(groupBox);
-
-
-    gridLayout->addLayout(vboxLayout, 1, 0, 2, 1);
-
-    tagGroupBox = new QGroupBox(DetailsDialog);
-    tagGroupBox->setObjectName(QString::fromUtf8("tagGroupBox"));
-    vboxLayout1 = new QVBoxLayout(tagGroupBox);
-    vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
-    tagsWidget = new QWidget(tagGroupBox);
-    tagsWidget->setObjectName(QString::fromUtf8("tagsWidget"));
-    tagsWidget->setEnabled(true);
-    gridLayout2 = new QGridLayout(tagsWidget);
-    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
-    label_21 = new QLabel(tagsWidget);
-    label_21->setObjectName(QString::fromUtf8("label_21"));
-    label_21->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_21, 0, 0, 1, 1);
-
-    titleLineEdit = new QLineEdit(tagsWidget);
-    titleLineEdit->setObjectName(QString::fromUtf8("titleLineEdit"));
-
-    gridLayout2->addWidget(titleLineEdit, 0, 1, 1, 3);
-
-    label_22 = new QLabel(tagsWidget);
-    label_22->setObjectName(QString::fromUtf8("label_22"));
-    label_22->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_22, 1, 0, 1, 1);
-
-    artistLineEdit = new QLineEdit(tagsWidget);
-    artistLineEdit->setObjectName(QString::fromUtf8("artistLineEdit"));
-
-    gridLayout2->addWidget(artistLineEdit, 1, 1, 1, 3);
-
-    label_23 = new QLabel(tagsWidget);
-    label_23->setObjectName(QString::fromUtf8("label_23"));
-    label_23->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_23, 2, 0, 1, 1);
-
-    albumLineEdit = new QLineEdit(tagsWidget);
-    albumLineEdit->setObjectName(QString::fromUtf8("albumLineEdit"));
-
-    gridLayout2->addWidget(albumLineEdit, 2, 1, 1, 3);
-
-    label_24 = new QLabel(tagsWidget);
-    label_24->setObjectName(QString::fromUtf8("label_24"));
-    label_24->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_24, 3, 0, 1, 1);
-
-    commentLineEdit = new QLineEdit(tagsWidget);
-    commentLineEdit->setObjectName(QString::fromUtf8("commentLineEdit"));
-
-    gridLayout2->addWidget(commentLineEdit, 3, 1, 1, 3);
-
-    label_25 = new QLabel(tagsWidget);
-    label_25->setObjectName(QString::fromUtf8("label_25"));
-    label_25->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_25, 4, 0, 1, 1);
-
-    yearLineEdit = new QLineEdit(tagsWidget);
-    yearLineEdit->setObjectName(QString::fromUtf8("yearLineEdit"));
-
-    gridLayout2->addWidget(yearLineEdit, 4, 1, 1, 1);
-
-    label_26 = new QLabel(tagsWidget);
-    label_26->setObjectName(QString::fromUtf8("label_26"));
-    label_26->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_26, 4, 2, 1, 1);
-
-    trackLineEdit = new QLineEdit(tagsWidget);
-    trackLineEdit->setObjectName(QString::fromUtf8("trackLineEdit"));
-
-    gridLayout2->addWidget(trackLineEdit, 4, 3, 1, 1);
-
-    label_27 = new QLabel(tagsWidget);
-    label_27->setObjectName(QString::fromUtf8("label_27"));
-    label_27->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    gridLayout2->addWidget(label_27, 5, 0, 1, 1);
-
-    genreLineEdit = new QLineEdit(tagsWidget);
-    genreLineEdit->setObjectName(QString::fromUtf8("genreLineEdit"));
-
-    gridLayout2->addWidget(genreLineEdit, 5, 1, 1, 3);
-
-
-    vboxLayout1->addWidget(tagsWidget);
-
-    hboxLayout2 = new QHBoxLayout();
-    hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
-    createButton = new QPushButton(tagGroupBox);
-    createButton->setObjectName(QString::fromUtf8("createButton"));
-
-    hboxLayout2->addWidget(createButton);
-
-    deleteButton = new QPushButton(tagGroupBox);
-    deleteButton->setObjectName(QString::fromUtf8("deleteButton"));
-
-    hboxLayout2->addWidget(deleteButton);
-
-    saveButton = new QPushButton(tagGroupBox);
-    saveButton->setObjectName(QString::fromUtf8("saveButton"));
-    saveButton->setEnabled(false);
-
-    hboxLayout2->addWidget(saveButton);
-
-
-    vboxLayout1->addLayout(hboxLayout2);
-
-
-    gridLayout->addWidget(tagGroupBox, 1, 1, 1, 2);
-
-    spacerItem = new QSpacerItem(111, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-    gridLayout->addItem(spacerItem, 2, 1, 1, 1);
-
-    pushButton_3 = new QPushButton(DetailsDialog);
-    pushButton_3->setObjectName(QString::fromUtf8("pushButton_3"));
-
-    gridLayout->addWidget(pushButton_3, 2, 2, 1, 1);
-
-
-    retranslateUi(DetailsDialog);
-    QObject::connect(pushButton_3, SIGNAL(clicked()), DetailsDialog, SLOT(close()));
-
-    QMetaObject::connectSlotsByName(DetailsDialog);
-    } // setupUi
-
-    void retranslateUi(QDialog *DetailsDialog)
-    {
-    DetailsDialog->setWindowTitle(QApplication::translate("DetailsDialog", "Details", 0, QApplication::UnicodeUTF8));
-    label_28->setText(QApplication::translate("DetailsDialog", "File path:", 0, QApplication::UnicodeUTF8));
-    groupBox_3->setTitle(QApplication::translate("DetailsDialog", "Tag Choice", 0, QApplication::UnicodeUTF8));
-    id3v1RadioButton->setText(QApplication::translate("DetailsDialog", "ID3v1", 0, QApplication::UnicodeUTF8));
-    id3v2RadioButton->setText(QApplication::translate("DetailsDialog", "ID3v2", 0, QApplication::UnicodeUTF8));
-    apeRadioButton->setText(QApplication::translate("DetailsDialog", "APE", 0, QApplication::UnicodeUTF8));
-    groupBox->setTitle(QApplication::translate("DetailsDialog", "MPEG Info", 0, QApplication::UnicodeUTF8));
-    label->setText(QApplication::translate("DetailsDialog", "MPEG level:", 0, QApplication::UnicodeUTF8));
-    levelLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_2->setText(QApplication::translate("DetailsDialog", "Bit rate:", 0, QApplication::UnicodeUTF8));
-    bitRateLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_3->setText(QApplication::translate("DetailsDialog", "Sample rate:", 0, QApplication::UnicodeUTF8));
-    sampleRateLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_5->setText(QApplication::translate("DetailsDialog", "File size:", 0, QApplication::UnicodeUTF8));
-    fileSizeLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_6->setText(QApplication::translate("DetailsDialog", "Mode:", 0, QApplication::UnicodeUTF8));
-    modeLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_8->setText(QApplication::translate("DetailsDialog", "Copyright:", 0, QApplication::UnicodeUTF8));
-    copyrightLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    label_9->setText(QApplication::translate("DetailsDialog", "Original:", 0, QApplication::UnicodeUTF8));
-    originalLabel->setText(QApplication::translate("DetailsDialog", "-", 0, QApplication::UnicodeUTF8));
-    tagGroupBox->setTitle(QApplication::translate("DetailsDialog", "ID3v1 Tag", 0, QApplication::UnicodeUTF8));
-    label_21->setText(QApplication::translate("DetailsDialog", "Title:", 0, QApplication::UnicodeUTF8));
-    label_22->setText(QApplication::translate("DetailsDialog", "Artist:", 0, QApplication::UnicodeUTF8));
-    label_23->setText(QApplication::translate("DetailsDialog", "Album:", 0, QApplication::UnicodeUTF8));
-    label_24->setText(QApplication::translate("DetailsDialog", "Comment:", 0, QApplication::UnicodeUTF8));
-    label_25->setText(QApplication::translate("DetailsDialog", "Year:", 0, QApplication::UnicodeUTF8));
-    label_26->setText(QApplication::translate("DetailsDialog", "Track number:", 0, QApplication::UnicodeUTF8));
-    label_27->setText(QApplication::translate("DetailsDialog", "Genre:", 0, QApplication::UnicodeUTF8));
-    createButton->setText(QApplication::translate("DetailsDialog", "Create", 0, QApplication::UnicodeUTF8));
-    deleteButton->setText(QApplication::translate("DetailsDialog", "Delete", 0, QApplication::UnicodeUTF8));
-    saveButton->setText(QApplication::translate("DetailsDialog", "Save", 0, QApplication::UnicodeUTF8));
-    pushButton_3->setText(QApplication::translate("DetailsDialog", "Close", 0, QApplication::UnicodeUTF8));
-    Q_UNUSED(DetailsDialog);
-    } // retranslateUi
-
-};
-
-namespace Ui {
-    class DetailsDialog: public Ui_DetailsDialog {};
-} // namespace Ui
-
-#endif // UI_DETAILSDIALOG_H
diff --git a/src/plugins/Input/mad/ui_settingsdialog.h b/src/plugins/Input/mad/ui_settingsdialog.h
deleted file mode 100644
index 47cdac64f..000000000
--- a/src/plugins/Input/mad/ui_settingsdialog.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/********************************************************************************
-** Form generated from reading ui file 'settingsdialog.ui'
-**
-** Created: Thu Feb 7 00:21:43 2008
-**      by: Qt User Interface Compiler version 4.3.0
-**
-** WARNING! All changes made in this file will be lost when recompiling ui file!
-********************************************************************************/
-
-#ifndef UI_SETTINGSDIALOG_H
-#define UI_SETTINGSDIALOG_H
-
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QDialog>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QVBoxLayout>
-
-class Ui_SettingsDialog
-{
-public:
-    QVBoxLayout *vboxLayout;
-    QGroupBox *groupBox_2;
-    QVBoxLayout *vboxLayout1;
-    QHBoxLayout *hboxLayout;
-    QLabel *label_15_2;
-    QComboBox *firstTagComboBox;
-    QHBoxLayout *hboxLayout1;
-    QLabel *label_15_3;
-    QComboBox *secondTagComboBox;
-    QHBoxLayout *hboxLayout2;
-    QLabel *label_15_4;
-    QComboBox *thirdTagComboBox;
-    QGroupBox *groupBox;
-    QVBoxLayout *vboxLayout2;
-    QHBoxLayout *hboxLayout3;
-    QLabel *label_17_2_2;
-    QComboBox *id3v1EncComboBox;
-    QHBoxLayout *hboxLayout4;
-    QLabel *label_18_2_2;
-    QComboBox *id3v2EncComboBox;
-    QHBoxLayout *hboxLayout5;
-    QSpacerItem *spacerItem;
-    QPushButton *okButton;
-    QPushButton *cancelButton;
-
-    void setupUi(QDialog *SettingsDialog)
-    {
-    if (SettingsDialog->objectName().isEmpty())
-        SettingsDialog->setObjectName(QString::fromUtf8("SettingsDialog"));
-    QSize size(242, 303);
-    size = size.expandedTo(SettingsDialog->minimumSizeHint());
-    SettingsDialog->resize(size);
-    vboxLayout = new QVBoxLayout(SettingsDialog);
-    vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-    groupBox_2 = new QGroupBox(SettingsDialog);
-    groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
-    vboxLayout1 = new QVBoxLayout(groupBox_2);
-    vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
-    hboxLayout = new QHBoxLayout();
-    hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-    label_15_2 = new QLabel(groupBox_2);
-    label_15_2->setObjectName(QString::fromUtf8("label_15_2"));
-    QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(label_15_2->sizePolicy().hasHeightForWidth());
-    label_15_2->setSizePolicy(sizePolicy);
-    label_15_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    hboxLayout->addWidget(label_15_2);
-
-    firstTagComboBox = new QComboBox(groupBox_2);
-    firstTagComboBox->setObjectName(QString::fromUtf8("firstTagComboBox"));
-
-    hboxLayout->addWidget(firstTagComboBox);
-
-
-    vboxLayout1->addLayout(hboxLayout);
-
-    hboxLayout1 = new QHBoxLayout();
-    hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
-    label_15_3 = new QLabel(groupBox_2);
-    label_15_3->setObjectName(QString::fromUtf8("label_15_3"));
-    sizePolicy.setHeightForWidth(label_15_3->sizePolicy().hasHeightForWidth());
-    label_15_3->setSizePolicy(sizePolicy);
-    label_15_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    hboxLayout1->addWidget(label_15_3);
-
-    secondTagComboBox = new QComboBox(groupBox_2);
-    secondTagComboBox->setObjectName(QString::fromUtf8("secondTagComboBox"));
-
-    hboxLayout1->addWidget(secondTagComboBox);
-
-
-    vboxLayout1->addLayout(hboxLayout1);
-
-    hboxLayout2 = new QHBoxLayout();
-    hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
-    label_15_4 = new QLabel(groupBox_2);
-    label_15_4->setObjectName(QString::fromUtf8("label_15_4"));
-    sizePolicy.setHeightForWidth(label_15_4->sizePolicy().hasHeightForWidth());
-    label_15_4->setSizePolicy(sizePolicy);
-    label_15_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    hboxLayout2->addWidget(label_15_4);
-
-    thirdTagComboBox = new QComboBox(groupBox_2);
-    thirdTagComboBox->setObjectName(QString::fromUtf8("thirdTagComboBox"));
-
-    hboxLayout2->addWidget(thirdTagComboBox);
-
-
-    vboxLayout1->addLayout(hboxLayout2);
-
-
-    vboxLayout->addWidget(groupBox_2);
-
-    groupBox = new QGroupBox(SettingsDialog);
-    groupBox->setObjectName(QString::fromUtf8("groupBox"));
-    vboxLayout2 = new QVBoxLayout(groupBox);
-    vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
-    hboxLayout3 = new QHBoxLayout();
-    hboxLayout3->setSpacing(6);
-    hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
-    hboxLayout3->setContentsMargins(0, 0, 0, 0);
-    label_17_2_2 = new QLabel(groupBox);
-    label_17_2_2->setObjectName(QString::fromUtf8("label_17_2_2"));
-    label_17_2_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    hboxLayout3->addWidget(label_17_2_2);
-
-    id3v1EncComboBox = new QComboBox(groupBox);
-    id3v1EncComboBox->setObjectName(QString::fromUtf8("id3v1EncComboBox"));
-
-    hboxLayout3->addWidget(id3v1EncComboBox);
-
-
-    vboxLayout2->addLayout(hboxLayout3);
-
-    hboxLayout4 = new QHBoxLayout();
-    hboxLayout4->setSpacing(6);
-    hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
-    hboxLayout4->setContentsMargins(0, 0, 0, 0);
-    label_18_2_2 = new QLabel(groupBox);
-    label_18_2_2->setObjectName(QString::fromUtf8("label_18_2_2"));
-    label_18_2_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-    hboxLayout4->addWidget(label_18_2_2);
-
-    id3v2EncComboBox = new QComboBox(groupBox);
-    id3v2EncComboBox->setObjectName(QString::fromUtf8("id3v2EncComboBox"));
-
-    hboxLayout4->addWidget(id3v2EncComboBox);
-
-
-    vboxLayout2->addLayout(hboxLayout4);
-
-
-    vboxLayout->addWidget(groupBox);
-
-    hboxLayout5 = new QHBoxLayout();
-    hboxLayout5->setSpacing(6);
-    hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
-    hboxLayout5->setContentsMargins(0, 0, 0, 0);
-    spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-    hboxLayout5->addItem(spacerItem);
-
-    okButton = new QPushButton(SettingsDialog);
-    okButton->setObjectName(QString::fromUtf8("okButton"));
-
-    hboxLayout5->addWidget(okButton);
-
-    cancelButton = new QPushButton(SettingsDialog);
-    cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
-
-    hboxLayout5->addWidget(cancelButton);
-
-
-    vboxLayout->addLayout(hboxLayout5);
-
-
-    retranslateUi(SettingsDialog);
-    QObject::connect(cancelButton, SIGNAL(clicked()), SettingsDialog, SLOT(reject()));
-
-    firstTagComboBox->setCurrentIndex(0);
-    secondTagComboBox->setCurrentIndex(0);
-    thirdTagComboBox->setCurrentIndex(0);
-
-
-    QMetaObject::connectSlotsByName(SettingsDialog);
-    } // setupUi
-
-    void retranslateUi(QDialog *SettingsDialog)
-    {
-    SettingsDialog->setWindowTitle(QApplication::translate("SettingsDialog", "MPEG Plugin Settings", 0, QApplication::UnicodeUTF8));
-    groupBox_2->setTitle(QApplication::translate("SettingsDialog", "Tag Priority", 0, QApplication::UnicodeUTF8));
-    label_15_2->setText(QApplication::translate("SettingsDialog", "First:", 0, QApplication::UnicodeUTF8));
-    firstTagComboBox->clear();
-    firstTagComboBox->insertItems(0, QStringList()
-     << QApplication::translate("SettingsDialog", "ID3v1", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "ID3v2", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "APE", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "Disabled", 0, QApplication::UnicodeUTF8)
-    );
-    label_15_3->setText(QApplication::translate("SettingsDialog", "Second:", 0, QApplication::UnicodeUTF8));
-    secondTagComboBox->clear();
-    secondTagComboBox->insertItems(0, QStringList()
-     << QApplication::translate("SettingsDialog", "ID3v1", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "ID3v2", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "APE", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "Disabled", 0, QApplication::UnicodeUTF8)
-    );
-    label_15_4->setText(QApplication::translate("SettingsDialog", "Third:", 0, QApplication::UnicodeUTF8));
-    thirdTagComboBox->clear();
-    thirdTagComboBox->insertItems(0, QStringList()
-     << QApplication::translate("SettingsDialog", "ID3v1", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "ID3v2", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "APE", 0, QApplication::UnicodeUTF8)
-     << QApplication::translate("SettingsDialog", "Disabled", 0, QApplication::UnicodeUTF8)
-    );
-    groupBox->setTitle(QApplication::translate("SettingsDialog", "Encodings", 0, QApplication::UnicodeUTF8));
-    label_17_2_2->setText(QApplication::translate("SettingsDialog", "ID3v1 encoding:", 0, QApplication::UnicodeUTF8));
-    label_18_2_2->setText(QApplication::translate("SettingsDialog", "ID3v2 encoding:", 0, QApplication::UnicodeUTF8));
-    okButton->setText(QApplication::translate("SettingsDialog", "OK", 0, QApplication::UnicodeUTF8));
-    cancelButton->setText(QApplication::translate("SettingsDialog", "Cancel", 0, QApplication::UnicodeUTF8));
-    Q_UNUSED(SettingsDialog);
-    } // retranslateUi
-
-};
-
-namespace Ui {
-    class SettingsDialog: public Ui_SettingsDialog {};
-} // namespace Ui
-
-#endif // UI_SETTINGSDIALOG_H
diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt
index dccd6dd6b..22ed8735e 100644
--- a/src/plugins/Input/mpc/CMakeLists.txt
+++ b/src/plugins/Input/mpc/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libmpc and taglib
 PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt
index 974db398e..b718d6619 100644
--- a/src/plugins/Input/sndfile/CMakeLists.txt
+++ b/src/plugins/Input/sndfile/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libsndfile
 PKGCONFIG(sndfile SNDFILE_INCLUDE_DIR SNDFILE_LINK_DIR SNDFILE_LINK_FLAGS SNDFILE_CFLAGS)
diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt
index baf5bad8c..91187560d 100644
--- a/src/plugins/Input/vorbis/CMakeLists.txt
+++ b/src/plugins/Input/vorbis/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libvorbis and taglib
 PKGCONFIG(ogg OGG_INCLUDE_DIR OGG_LINK_DIR OGG_LINK_FLAGS OGG_CFLAGS)
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt
index 92f7af8d9..f28d63fca 100644
--- a/src/plugins/Output/alsa/CMakeLists.txt
+++ b/src/plugins/Output/alsa/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 SET(libalsa_SRCS
   outputalsa.cpp
diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt
index 665a6fb13..cd7aa59da 100644
--- a/src/plugins/Output/jack/CMakeLists.txt
+++ b/src/plugins/Output/jack/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libjack and taglib
 PKGCONFIG(jack JACK_INCLUDE_DIR JACK_LINK_DIR JACK_LINK_FLAGS JACK_CFLAGS)
diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt
index 8ab6f8d88..67b92bb00 100644
--- a/src/plugins/Output/oss/CMakeLists.txt
+++ b/src/plugins/Output/oss/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 
 
diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt
index 7de2ca687..802819e6d 100644
--- a/src/plugins/Visual/analyzer/CMakeLists.txt
+++ b/src/plugins/Visual/analyzer/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(QT_INCLUDES
 
 # libqmmp
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 SET(libanalyzer_SRCS
     analyzer.cpp
@@ -66,5 +66,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY(analyzer SHARED ${libanalyzer_SRCS} ${libanalyzer_MOC_SRCS} ${libanalyzer_UIS_H}
   ${libanalyzer_RCC_SRCS})
 target_link_libraries(analyzer ${QT_LIBRARIES} -lqmmp)
-install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
-
+install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual)
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt
index 79edd7152..ddabdb1f8 100644
--- a/src/qmmp/CMakeLists.txt
+++ b/src/qmmp/CMakeLists.txt
@@ -65,4 +65,4 @@ EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#endif\"" >> ./config.h)
 
 ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS})
 target_link_libraries(qmmp ${QT_LIBRARIES} curl)
-install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR} PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR})
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
new file mode 100644
index 000000000..87654ddfc
--- /dev/null
+++ b/src/qmmpui/CMakeLists.txt
@@ -0,0 +1,46 @@
+project(libqmmpui)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+include(FindQt4)
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt lib
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(libqmmpui_SRCS
+    general.cpp
+    generalhandler.cpp
+    songinfo.cpp
+)
+
+SET(libqmmpui_MOC_HDRS
+    generalfactory.h
+    general.h
+    generalhandler.h
+    songinfo.h
+)
+
+QT4_WRAP_CPP(libqmmpui_MOC_SRCS ${libqmmpui_MOC_HDRS})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES config.h)
+
+EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#ifndef CONFIG_H\"" > ./config.h)
+EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define CONFIG_H\"" >> ./config.h)
+EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define LIB_DIR \\\"/${LIB_DIR}\\\"\"" >> ./config.h)
+EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#endif\"" >> ./config.h)
+
+ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_MOC_SRCS})
+target_link_libraries(qmmpui ${QT_LIBRARIES})
+
+install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR})
+
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 000000000..a9a9f7bc2
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,169 @@
+project(ui)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+SET(QT_USE_QTXML TRUE)
+SET(QT_USE_QTNETWORK TRUE)
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+
+# libqmmp & libqmmpui
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui)
+
+link_directories(${CMAKE_INSTALL_PREFIX}/lib)
+link_directories(${CMAKE_INSTALL_PREFIX}/lib64)
+
+SET(ui_SRCS
+    fft.c
+    aboutdialog.cpp
+    addurldialog.cpp
+    balancebar.cpp
+    button.cpp
+    commandlineoption.cpp
+    configdialog.cpp
+    display.cpp
+    dock.cpp
+    eqgraph.cpp
+    eqpreset.cpp
+    eqslider.cpp
+    eqtitlebar.cpp
+    eqwidget.cpp
+    filedialog.cpp
+    fileloader.cpp
+    jumptotrackdialog.cpp
+    keyboardmanager.cpp
+    listwidget.cpp
+    logscale.cpp
+    mainvisual.cpp
+    mainwindow.cpp
+    mediafile.cpp
+    monostereo.cpp
+    mp3player.cpp
+    number.cpp
+    pixmapwidget.cpp
+    playlistcontrol.cpp
+    playlist.cpp
+    playlistformat.cpp
+    playlistmodel.cpp
+    playlistslider.cpp
+    playlisttitlebar.cpp
+    playstate.cpp
+    playstatus.cpp
+    pluginitem.cpp
+    positionbar.cpp
+    preseteditor.cpp
+    qmmpstarter.cpp
+    shadedbar.cpp
+    shadedvisual.cpp
+    skin.cpp
+    skinreader.cpp
+    symboldisplay.cpp
+    textscroller.cpp
+    timeindicator.cpp
+    titlebarcontrol.cpp
+    titlebar.cpp
+    togglebutton.cpp
+    unixdomainsocket.cpp
+    visualmenu.cpp
+    volumebar.cpp
+)
+
+SET(ui_MOC_HDRS
+    aboutdialog.h
+    addurldialog.h
+    balancebar.h
+    button.h
+    commandlineoption.h
+    configdialog.h
+    display.h
+    dock.h
+    eqgraph.h
+    eqpreset.h
+    eqslider.h
+    eqtitlebar.h
+    eqwidget.h
+    fft.h
+    filedialog.h
+    fileloader.h
+    inlines.h
+    jumptotrackdialog.h
+    keyboardmanager.h
+    listwidget.h
+    logscale.h
+    mainvisual.h
+    mainwindow.h
+    mediafile.h
+    monostereo.h
+    number.h
+    pixmapwidget.h
+    playlistcontrol.h
+    playlistformat.h
+    playlist.h
+    playlistmodel.h
+    playlistslider.h
+    playlisttitlebar.h
+    playstate.h
+    playstatus.h
+    pluginitem.h
+    positionbar.h
+    preseteditor.h
+    qmmpstarter.h
+    shadedbar.h
+    shadedvisual.h
+    skin.h
+    skinreader.h
+    symboldisplay.h
+    textscroller.h
+    timeindicator.h
+    titlebarcontrol.h
+    titlebar.h
+    togglebutton.h
+    unixdomainsocket.h
+    version.h
+    visualmenu.h
+    volumebar.h
+)
+
+SET(ui_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc)
+
+QT4_ADD_RESOURCES(ui_RCC_SRCS ${ui_RCCS})
+
+QT4_AUTOMOC(${ui_MOC_SRC})
+QT4_WRAP_CPP(ui_MOC_SRCS ${ui_MOC_HDRS})
+
+# user interface
+
+
+SET(ui_UIS
+    forms/aboutdialog.ui
+    forms/addurldialog.ui
+    forms/configdialog.ui
+    forms/jumptotrackdialog.ui
+    forms/preseteditor.ui
+)
+
+QT4_WRAP_UI(ui_UIS_H ${ui_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H}
+  ${ui_RCC_SRCS})
+target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp -lqmmpui)
+install(TARGETS qmmp DESTINATION bin)
+#install(FILES qmmp.desktop DESTINATION share/applications)
+#install(FILES images/qmmp.xpm DESTINATION share/pixmaps)