Start to move mainwindow widgets into a subdirectory,

get rid of some unneeded includes

src/Button.cpp

@@ -13,7 +13,6 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
 #include "Button.h"
 
 #include "Skin.h"

src/Display.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "Display.h"
 
 #include "TitleBar.h"

src/NumberDisplay.cpp

@@ -13,7 +13,6 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
 #include "NumberDisplay.h"
 
 #include "TimeDisplay.h"

src/PixWidget.cpp

@@ -13,8 +13,6 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
-
 #include "Skin.h"
 #include "PixWidget.h"
 

src/PosBar.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 
 #include "PosBar.h"
 #include "Skin.h"

src/Skin.cpp

@@ -557,12 +557,12 @@ Skin::BuildSliders (void)
 void
 Skin::BuildNumbers (void)
 {
-	uint num = 11;
+	uint num = 12;
 
-	QPixmap *img = getPixmap("numbers");
+	QPixmap *img = getPixmap("nums_ex");
 	if (!img) {
-		num = 12;
+		num = 11;
-		img = getPixmap ("nums_ex");
+		img = getPixmap ("numbers");
 	}
 
 	if(img)

src/SkinChooser.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "Skin.h"
 #include "SkinChooser.h"
 

src/SkinChooser.h

@@ -13,13 +13,14 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
 
 #include <QListWidget>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QMainWindow>
 
+class MainWindow;
+
 class SkinList : public QListWidget
 {
 	Q_OBJECT

src/TextBar.cpp

@@ -13,10 +13,11 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
 #include "Display.h"
 #include "TextBar.h"
 
+#include <QSettings>
+
 TextScroller::TextScroller (QWidget *parent, uint w, 
 							uint h, const QString &name) : 
 	QWidget (parent)

src/TimeDisplay.cpp

@@ -13,12 +13,11 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainDisplay.h"
+#include "mainwindow.h"
+#include "maindisplay.h"
 #include "TimeDisplay.h"
 #include "NumberDisplay.h"
 
-#include "MainWindow.h"
-
 #include <QPen>
 
 TimeDisplay::TimeDisplay (QWidget *parent, int time) : PixWidget (parent)

src/TitleBar.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "TitleBar.h"
 #include "Display.h"
 #include "SkinChooser.h"

src/equalizer/equalizer.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "TitleBar.h"
 #include "equalizer.h"
 #include "Button.h"

src/main.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "playlist.h"
 #include "equalizer.h"
 #include "Skin.h"

src/mainwindow/clutterbar.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "ClutterBar.h"
+#include "clutterbar.h"
 #include "Skin.h"
 
 ClutterBar::ClutterBar (QWidget *parent) : PixWidget (parent)

src/mainwindow/maindisplay.cpp

@@ -15,8 +15,8 @@
 
 #include <xmmsclient/xmmsclient++.h>
 #include "XMMSHandler.h"
-#include "MainDisplay.h"
+#include "maindisplay.h"
-#include "MainWindow.h"
+#include "mainwindow.h"
 
 #include "TitleBar.h"
 #include "Button.h"
@@ -24,12 +24,12 @@
 #include "NumberDisplay.h"
 #include "TimeDisplay.h"
 #include "SmallNumberDisplay.h"
-#include "StereoMono.h"
+#include "stereomono.h"
 #include "PosBar.h"
 #include "PlayStatus.h"
 #include "VolumeSlider.h"
 #include "playlist.h"
-#include "ClutterBar.h"
+#include "clutterbar.h"
 
 #include <QFileDialog>
 #include <QSettings>

src/mainwindow/mainwindow.cpp

@@ -13,15 +13,15 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 
 #ifdef HAVE_SERVERBROWSER
 #include "ServerBrowser.h"
 #endif
 
 #include "playlist.h"
-#include "MainDisplay.h"
+#include "maindisplay.h"
-#include "ShadedDisplay.h"
+#include "shadeddisplay.h"
 #include "equalizer.h"
 
 #include <QSettings>

src/mainwindow/mainwindow.pri

@@ -0,0 +1,14 @@
+HEADERS += clutterbar.h \
+		   mainwindow.h \
+		   maindisplay.h \
+		   shadeddisplay.h \
+		   stereomono.h
+
+SOURCES += clutterbar.cpp \
+		   mainwindow.cpp \
+		   maindisplay.cpp \
+		   shadeddisplay.cpp \
+		   stereomono.cpp
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/mainwindow/shadeddisplay.cpp

@@ -16,7 +16,7 @@
 #include <xmmsclient/xmmsclient++.h>
 #include "XMMSHandler.h"
 
-#include "ShadedDisplay.h"
+#include "shadeddisplay.h"
 #include "TitleBar.h"
 #include "Button.h"
 

src/mainwindow/stereomono.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "StereoMono.h"
+#include "stereomono.h"
 #include "Skin.h"
 
 StereoMono::StereoMono (QWidget *parent) : PixWidget (parent)

src/playlist/playlist.cpp

@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+#include "mainwindow.h"
 #include "BrowseDialog.h"
 #include "playlist.h"
 #include "playlistview.h"

src/settingsdialog.cpp

@@ -13,7 +13,7 @@
  *  GNU General Public License for more details.
  */
 
-#include "MainWindow.h"
+// #include "mainwindow.h"
 #include "settingsdialog.h"
 
 #include <QSettings>

src/src.pri

@@ -1,12 +1,11 @@
 include($$PWD/widgets/widgets.pri)
+include($$PWD/mainwindow/mainwindow.pri)
 include($$PWD/playlist/playlist.pri)
 include($$PWD/equalizer/equalizer.pri)
 
 HEADERS += PixWidget.h \
            Skin.h \
-           MainWindow.h \
            Display.h \
-           MainDisplay.h \
            TitleBar.h \
            Button.h \
            TextBar.h \
@@ -14,14 +13,11 @@ HEADERS += PixWidget.h \
            TimeDisplay.h \
            XMMSHandler.h \
            SmallNumberDisplay.h \
-           StereoMono.h \
            PosBar.h \
            PlayStatus.h \
-           ShadedDisplay.h \
            SkinChooser.h \
            settingsdialog.h \
            VolumeSlider.h \
-           ClutterBar.h \
            FileDialog.h \
            BrowseModel.h \
            BrowseDialog.h
@@ -29,9 +25,7 @@ HEADERS += PixWidget.h \
 SOURCES += main.cpp \
 		   PixWidget.cpp \
            Skin.cpp \
-           MainWindow.cpp \
            Display.cpp \
-           MainDisplay.cpp \
            TitleBar.cpp \
            Button.cpp \
            TextBar.cpp \
@@ -39,14 +33,11 @@ SOURCES += main.cpp \
            TimeDisplay.cpp \
            XMMSHandler.cpp \
            SmallNumberDisplay.cpp \
-           StereoMono.cpp \
            PosBar.cpp \
            PlayStatus.cpp \
-           ShadedDisplay.cpp \
            SkinChooser.cpp \
            settingsdialog.cpp \
            VolumeSlider.cpp \
-           ClutterBar.cpp \
            FileDialog.cpp \
            BrowseModel.cpp \
            BrowseDialog.cpp