diff --git a/src/Button.cpp b/src/Button.cpp index f187a9d..329674f 100644 --- a/src/Button.cpp +++ b/src/Button.cpp @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" #include "Button.h" #include "Skin.h" diff --git a/src/Display.cpp b/src/Display.cpp index 30f9817..74f6ac9 100644 --- a/src/Display.cpp +++ b/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" diff --git a/src/NumberDisplay.cpp b/src/NumberDisplay.cpp index 77518a4..0456b0e 100644 --- a/src/NumberDisplay.cpp +++ b/src/NumberDisplay.cpp @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" #include "NumberDisplay.h" #include "TimeDisplay.h" diff --git a/src/PixWidget.cpp b/src/PixWidget.cpp index 7d0da0d..f8c74e4 100644 --- a/src/PixWidget.cpp +++ b/src/PixWidget.cpp @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" - #include "Skin.h" #include "PixWidget.h" diff --git a/src/PosBar.cpp b/src/PosBar.cpp index d272284..36fb9f1 100644 --- a/src/PosBar.cpp +++ b/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" diff --git a/src/Skin.cpp b/src/Skin.cpp index 14b8e45..3a3e915 100644 --- a/src/Skin.cpp +++ b/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; - img = getPixmap ("nums_ex"); + num = 11; + img = getPixmap ("numbers"); } if(img) diff --git a/src/SkinChooser.cpp b/src/SkinChooser.cpp index dd44641..a3f7bed 100644 --- a/src/SkinChooser.cpp +++ b/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" diff --git a/src/SkinChooser.h b/src/SkinChooser.h index bc96e64..39a1845 100644 --- a/src/SkinChooser.h +++ b/src/SkinChooser.h @@ -13,13 +13,14 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" #include #include #include #include +class MainWindow; + class SkinList : public QListWidget { Q_OBJECT diff --git a/src/TextBar.cpp b/src/TextBar.cpp index 316630c..6d4d121 100644 --- a/src/TextBar.cpp +++ b/src/TextBar.cpp @@ -13,10 +13,11 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" #include "Display.h" #include "TextBar.h" +#include + TextScroller::TextScroller (QWidget *parent, uint w, uint h, const QString &name) : QWidget (parent) diff --git a/src/TimeDisplay.cpp b/src/TimeDisplay.cpp index a2cdd65..191fff7 100644 --- a/src/TimeDisplay.cpp +++ b/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 TimeDisplay::TimeDisplay (QWidget *parent, int time) : PixWidget (parent) diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp index aebcd01..1790989 100644 --- a/src/TitleBar.cpp +++ b/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" diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp index 78b1206..d461f1a 100644 --- a/src/equalizer/equalizer.cpp +++ b/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" diff --git a/src/main.cpp b/src/main.cpp index 38d5475..c476879 100644 --- a/src/main.cpp +++ b/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" diff --git a/src/ClutterBar.cpp b/src/mainwindow/clutterbar.cpp similarity index 98% rename from src/ClutterBar.cpp rename to src/mainwindow/clutterbar.cpp index 4cd2b24..e92fcde 100644 --- a/src/ClutterBar.cpp +++ b/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) diff --git a/src/ClutterBar.h b/src/mainwindow/clutterbar.h similarity index 100% rename from src/ClutterBar.h rename to src/mainwindow/clutterbar.h diff --git a/src/MainDisplay.cpp b/src/mainwindow/maindisplay.cpp similarity index 98% rename from src/MainDisplay.cpp rename to src/mainwindow/maindisplay.cpp index f8f7f12..b63657c 100644 --- a/src/MainDisplay.cpp +++ b/src/mainwindow/maindisplay.cpp @@ -15,8 +15,8 @@ #include #include "XMMSHandler.h" -#include "MainDisplay.h" -#include "MainWindow.h" +#include "maindisplay.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 #include diff --git a/src/MainDisplay.h b/src/mainwindow/maindisplay.h similarity index 100% rename from src/MainDisplay.h rename to src/mainwindow/maindisplay.h diff --git a/src/MainWindow.cpp b/src/mainwindow/mainwindow.cpp similarity index 97% rename from src/MainWindow.cpp rename to src/mainwindow/mainwindow.cpp index 49a462b..5540901 100644 --- a/src/MainWindow.cpp +++ b/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 "ShadedDisplay.h" +#include "maindisplay.h" +#include "shadeddisplay.h" #include "equalizer.h" #include diff --git a/src/MainWindow.h b/src/mainwindow/mainwindow.h similarity index 100% rename from src/MainWindow.h rename to src/mainwindow/mainwindow.h diff --git a/src/mainwindow/mainwindow.pri b/src/mainwindow/mainwindow.pri new file mode 100644 index 0000000..badaec4 --- /dev/null +++ b/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 diff --git a/src/ShadedDisplay.cpp b/src/mainwindow/shadeddisplay.cpp similarity index 99% rename from src/ShadedDisplay.cpp rename to src/mainwindow/shadeddisplay.cpp index 24fb55d..850a49e 100644 --- a/src/ShadedDisplay.cpp +++ b/src/mainwindow/shadeddisplay.cpp @@ -16,7 +16,7 @@ #include #include "XMMSHandler.h" -#include "ShadedDisplay.h" +#include "shadeddisplay.h" #include "TitleBar.h" #include "Button.h" diff --git a/src/ShadedDisplay.h b/src/mainwindow/shadeddisplay.h similarity index 100% rename from src/ShadedDisplay.h rename to src/mainwindow/shadeddisplay.h diff --git a/src/StereoMono.cpp b/src/mainwindow/stereomono.cpp similarity index 98% rename from src/StereoMono.cpp rename to src/mainwindow/stereomono.cpp index 99599f2..d538920 100644 --- a/src/StereoMono.cpp +++ b/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) diff --git a/src/StereoMono.h b/src/mainwindow/stereomono.h similarity index 100% rename from src/StereoMono.h rename to src/mainwindow/stereomono.h diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index fd55be9..6b7c447 100644 --- a/src/playlist/playlist.cpp +++ b/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" diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 990cd3e..4388560 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include "MainWindow.h" +// #include "mainwindow.h" #include "settingsdialog.h" #include diff --git a/src/src.pri b/src/src.pri index 18f0c2b..e4b8123 100644 --- a/src/src.pri +++ b/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