fixed cmake scripts

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

6 files changed, 200 insertions, 127 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 471e26443..cf1353f63 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -28,153 +28,32 @@ link_directories(${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
 
-# X11
-include_directories(${X11_INCLUDE_DIRS})
-link_directories(${X11_LIBRARY_DIRS})
-
 SET(ui_SRCS
-    fft.c
-    aboutdialog.cpp
-    addurldialog.cpp
-    balancebar.cpp
-    button.cpp
     builtincommandlineoption.cpp
-    configdialog.cpp
-    display.cpp
-    dock.cpp
-    eqgraph.cpp
-    eqpreset.cpp
-    eqslider.cpp
-    eqtitlebar.cpp
-    eqwidget.cpp
-    jumptotrackdialog.cpp
-    keyboardmanager.cpp
-    listwidget.cpp
-    mainvisual.cpp
-    mainwindow.cpp
-    monostereo.cpp
-    mp3player.cpp
-    number.cpp
-    pixmapwidget.cpp
-    playlistcontrol.cpp
-    playlist.cpp
-    playlistslider.cpp
-    playlisttitlebar.cpp
-    playstatus.cpp
-    pluginitem.cpp
-    positionbar.cpp
-    preseteditor.cpp
+    main.cpp
     qmmpstarter.cpp
-    shadedbar.cpp
-    shadedvisual.cpp
-    skin.cpp
-    skinreader.cpp
-    symboldisplay.cpp
-    textscroller.cpp
-    timeindicator.cpp
-    titlebarcontrol.cpp
-    titlebar.cpp
-    togglebutton.cpp
-    visualmenu.cpp
-    volumebar.cpp
-    cursorimage.cpp
-    playlistbrowser.cpp
-    playlistselector.cpp
-    popupwidget.cpp
-    popupsettings.cpp
-    windowsystem.cpp
     lxdesupport.cpp
-    actionmanager.cpp
-    shortcutitem.cpp
-    shortcutdialog.cpp
 )
 
 SET(ui_MOC_HDRS
-    aboutdialog.h
-    addurldialog.h
-    balancebar.h
-    button.h
     builtincommandlineoption.h
-    configdialog.h
-    display.h
-    dock.h
-    eqgraph.h
-    eqpreset.h
-    eqslider.h
-    eqtitlebar.h
-    eqwidget.h
-    fft.h
-    inlines.h
-    jumptotrackdialog.h
-    keyboardmanager.h
-    listwidget.h
-    mainvisual.h
-    mainwindow.h
-    monostereo.h
-    number.h
-    pixmapwidget.h
-    playlistcontrol.h
-    playlist.h
-    playlistslider.h
-    playlisttitlebar.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
-    visualmenu.h
-    volumebar.h
-    cursorimage.h
-    playlistbrowser.h
-    playlistselector.h
-    popupwidget.h
-    popupsettings.h
-    windowsystem.h
-    lxdesupport.h
-    shortcutitem.h
-    actionmanager.h
-    shortcutdialog.h
+    lxdesupport.h    
 )
 
-SET(ui_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc)
+SET(ui_RCCS images/images.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
-    forms/playlistbrowser.ui
-    forms/popupsettings.ui
-    forms/shortcutdialog.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} libqmmp qmmpui ${X11_LDFLAGS})
+ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_RCC_SRCS})
+target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui)
 add_dependencies(qmmp qmmpui libqmmp)
 install(TARGETS qmmp DESTINATION bin)
 install(FILES qmmp.desktop DESTINATION share/applications)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 6498c727c..83328daf0 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -11,3 +11,4 @@ add_subdirectory(CommandLineOptions)
 add_subdirectory(FileDialogs)
 add_subdirectory(Transports)
 add_subdirectory(Engines)
+add_subdirectory(Ui)
diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt
new file mode 100644
index 000000000..667d0763c
--- /dev/null
+++ b/src/plugins/Ui/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface")
+
+IF(USE_SKINNED)
+add_subdirectory(skinned)
+ENDIF(USE_SKINNED)
diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
new file mode 100644
index 000000000..ecb2dd38d
--- /dev/null
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -0,0 +1,181 @@
+project(ui)
+
+cmake_minimum_required(VERSION 2.4.7)
+
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy) 
+
+SET(QT_USE_QTNETWORK TRUE)
+
+INCLUDE(FindQt4)
+
+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_SOURCE_DIR}/../../../
+)
+
+
+# libqmmpui & libqmmp
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+
+# X11
+include_directories(${X11_INCLUDE_DIRS})
+link_directories(${X11_LIBRARY_DIRS})
+
+SET(ui_SRCS
+    fft.c
+    aboutdialog.cpp
+    addurldialog.cpp
+    balancebar.cpp
+    button.cpp
+    configdialog.cpp
+    display.cpp
+    dock.cpp
+    eqgraph.cpp
+    eqpreset.cpp
+    eqslider.cpp
+    eqtitlebar.cpp
+    eqwidget.cpp
+    jumptotrackdialog.cpp
+    keyboardmanager.cpp
+    listwidget.cpp
+    mainvisual.cpp
+    mainwindow.cpp
+    monostereo.cpp
+    number.cpp
+    pixmapwidget.cpp
+    playlistcontrol.cpp
+    playlist.cpp
+    playlistslider.cpp
+    playlisttitlebar.cpp
+    playstatus.cpp
+    pluginitem.cpp
+    positionbar.cpp
+    preseteditor.cpp
+    shadedbar.cpp
+    shadedvisual.cpp
+    skin.cpp
+    skinreader.cpp
+    symboldisplay.cpp
+    textscroller.cpp
+    timeindicator.cpp
+    titlebarcontrol.cpp
+    titlebar.cpp
+    togglebutton.cpp
+    visualmenu.cpp
+    volumebar.cpp
+    cursorimage.cpp
+    playlistbrowser.cpp
+    playlistselector.cpp
+    popupwidget.cpp
+    popupsettings.cpp
+    windowsystem.cpp
+    actionmanager.cpp
+    shortcutitem.cpp
+    shortcutdialog.cpp
+    skinnedfactory.cpp
+)
+
+SET(ui_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
+    inlines.h
+    jumptotrackdialog.h
+    keyboardmanager.h
+    listwidget.h
+    mainvisual.h
+    mainwindow.h
+    monostereo.h
+    number.h
+    pixmapwidget.h
+    playlistcontrol.h
+    playlist.h
+    playlistslider.h
+    playlisttitlebar.h
+    playstatus.h
+    pluginitem.h
+    positionbar.h
+    preseteditor.h
+    shadedbar.h
+    shadedvisual.h
+    skin.h
+    skinreader.h
+    symboldisplay.h
+    textscroller.h
+    timeindicator.h
+    titlebarcontrol.h
+    titlebar.h
+    togglebutton.h
+    visualmenu.h
+    volumebar.h
+    cursorimage.h
+    playlistbrowser.h
+    playlistselector.h
+    popupwidget.h
+    popupsettings.h
+    windowsystem.h
+    shortcutitem.h
+    actionmanager.h
+    shortcutdialog.h
+    skinnedfactory.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
+    forms/playlistbrowser.ui
+    forms/popupsettings.ui
+    forms/shortcutdialog.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})
+
+IF(X11_FOUND)
+ADD_LIBRARY(skinned MODULE ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H} ${ui_RCC_SRCS})
+target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS})
+add_dependencies(skinned qmmpui libqmmp)
+target_link_libraries(skinned ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
+install(TARGETS skinned DESTINATION ${LIB_DIR}/qmmp/Ui)
+ENDIF(X11_FOUND)
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 60535cda8..f4692e4fd 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -40,6 +40,7 @@ SET(libqmmpui_SRCS
     playlistmanager.cpp
     metadataformatter.cpp
     templateeditor.cpp
+    uiloader.cpp
 )
 
 SET(libqmmpui_MOC_HDRS
@@ -64,6 +65,8 @@ SET(libqmmpui_MOC_HDRS
     playlistmanager.h
     metadataformatter.h
     templateeditor.h
+    uiloader.h
+    uifactory.h
 )
 
 SET(libqmmpui_DEVEL_HDRS
@@ -83,6 +86,8 @@ SET(libqmmpui_DEVEL_HDRS
     playlistmanager.h
     metadataformatter.h
     templateeditor.h
+    uiloader.h
+    uifactory.h
 )
 
 
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index b32bdf587..b5fa05251 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -94,7 +94,9 @@ unix {
                    detailsdialog.h \
                    playlistmanager.h \
                    metadataformatter.h \
-                   templateeditor.h
+                   templateeditor.h \
+                   uifactory.h \
+                   uiloader.h
     devel.path = /include/qmmpui
     INSTALLS += target \
         devel