Moved some files and minor cleanups

TODO

@@ -13,6 +13,7 @@ Todo:
 	* jump to entry when it's played.
 	* accept drops from other applications
 * Skin
+	+ Numbers in playtime display can have variable height
 	* Compressed file reader
 	* Manage with faulty skins
 	* make cool effects when switching skin?

src/MainDisplay.cpp

@@ -13,7 +13,7 @@
 #include "PosBar.h"
 #include "PlayStatus.h"
 #include "VolumeSlider.h"
-#include "Playlist.h"
+#include "playlist.h"
 #include "ClutterBar.h"
 
 #include <QFileDialog>

src/MainWindow.cpp

@@ -4,10 +4,10 @@
 #include "ServerBrowser.h"
 #endif
 
-#include "Playlist.h"
+#include "playlist.h"
 #include "MainDisplay.h"
 #include "ShadedDisplay.h"
-#include "Equalizer.h"
+#include "equalizer.h"
 
 #include <QSettings>
 #include <QIcon>

src/Skin.cpp

@@ -553,7 +553,7 @@ Skin::BuildNumbers (void)
 	if(img)
 	{
 		for (uint i = 0; i < num; i++) {
-			m_numbers[i] = img->copy (i*9, 0, 9, 13);
+			m_numbers[i] = img->copy (i*9, 0, 9, qMin (13, img->height ()));
 		}
 		delete img;
 	}

src/TitleBar.cpp

@@ -2,7 +2,7 @@
 #include "TitleBar.h"
 #include "Display.h"
 #include "SkinChooser.h"
-#include "MedialibWindow.h"
+// #include "MedialibWindow.h"
 #include "SettingsWindow.h"
 #include "Button.h"
 #include "BrowseDialog.h"

src/attic/README

@@ -0,0 +1,2 @@
+The files in this directory are not used at the moment.
+They might be included again at a later time or removed

src/equalizer/equalizer.cpp

@@ -1,6 +1,6 @@
 #include "MainWindow.h"
 #include "TitleBar.h"
-#include "Equalizer.h"
+#include "equalizer.h"
 #include "Button.h"
 #include "VolumeSlider.h"
 
@@ -17,8 +17,6 @@ EqualizerWindow::EqualizerWindow (QWidget *parent) : QMainWindow (parent)
 	setCentralWidget (m_equalizer);
 
 	setFixedSize (275, 116);
-//	setMinimumSize (275, 116);
-//	setMaximumSize (275, 116);
 }
 
 EqualizerWindow::~EqualizerWindow (void)

src/equalizer/equalizer.pri

@@ -0,0 +1,6 @@
+HEADERS += equalizer.h
+
+SOURCES += equalizer.cpp
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/playlist/playlist.cpp

@@ -1,11 +1,11 @@
 #include "MainWindow.h"
 #include "BrowseDialog.h"
-#include "Playlist.h"
+#include "playlist.h"
-#include "PlaylistView.h"
+#include "playlistview.h"
 #include "playlistmodel.h"
 
-#include "PlaylistShade.h"
+#include "playlistshade.h"
-#include "PlaylistMenu.h"
+#include "playlistmenu.h"
 #include "FileDialog.h"
 
 #include <QMouseEvent>
@@ -311,8 +311,8 @@ PlaylistWidget::PlaylistWidget (QWidget *parent) : QWidget (parent)
 	/*
 	 * This is a hack to make PlaylistScrollBar work with PlaylistView.
 	 * It is necessery because of limitations and at least one Bug in the
-	 *  QT library (as of Version 4.3
+	 *  QT library (as of Version 4.3)
-	 * TODO: This might in a future Qt version. Try to find a better solution
+	 * TODO: This might break in a future Qt version. Try to find a better solution
 	 */
 	m_scrollBar = new PlaylistScrollBar (this);
 	m_view->setVerticalScrollBar (m_scrollBar);

src/playlist/playlist.pri

@@ -0,0 +1,12 @@
+HEADERS += playlist.h \
+		   playlistmenu.h \
+		   playlistshade.h \
+		   playlistview.h
+
+SOURCES += playlist.cpp \
+		   playlistmenu.cpp \
+		   playlistshade.cpp \
+		   playlistview.cpp
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/playlist/playlistmenu.cpp

@@ -1,4 +1,4 @@
-#include "PlaylistMenu.h"
+#include "playlistmenu.h"
 
 #include <QMouseEvent>
 #include <QWidget>

src/playlist/playlistshade.cpp

@@ -1,8 +1,8 @@
 #include "XMMSHandler.h"
 #include <xmmsclient/xmmsclient++.h>
 
-#include "PlaylistShade.h"
+#include "playlistshade.h"
-#include "Playlist.h"
+#include "playlist.h"
 
 #include <QSettings>
 

src/playlist/playlistview.cpp

@@ -2,9 +2,9 @@
 #include <xmmsclient/xmmsclient++.h>
 #include "XMMSHandler.h"
 
-#include "PlaylistView.h"
+#include "playlistview.h"
 #include "playlistmodel.h"
-#include "Playlist.h"
+#include "playlist.h"
 
 #include <QColor>
 #include <QMenu>

src/src.pri

@@ -0,0 +1,53 @@
+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 \
+           NumberDisplay.h \
+           TimeDisplay.h \
+           XMMSHandler.h \
+           SmallNumberDisplay.h \
+           StereoMono.h \
+           PosBar.h \
+           PlayStatus.h \
+           ShadedDisplay.h \
+           SkinChooser.h \
+           SettingsWindow.h \
+           VolumeSlider.h \
+           ClutterBar.h \
+           FileDialog.h \
+           BrowseModel.h \
+           BrowseDialog.h
+
+SOURCES += PixWidget.cpp \
+           Skin.cpp \
+           MainWindow.cpp \
+           Display.cpp \
+           MainDisplay.cpp \
+           TitleBar.cpp \
+           Button.cpp \
+           TextBar.cpp \
+           NumberDisplay.cpp \
+           TimeDisplay.cpp \
+           XMMSHandler.cpp \
+           SmallNumberDisplay.cpp \
+           StereoMono.cpp \
+           PosBar.cpp \
+           PlayStatus.cpp \
+           ShadedDisplay.cpp \
+           SkinChooser.cpp \
+           SettingsWindow.cpp \
+           VolumeSlider.cpp \
+           ClutterBar.cpp \
+           FileDialog.cpp \
+           BrowseModel.cpp \
+           BrowseDialog.cpp
+
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/src.pro

@@ -6,71 +6,15 @@ COMPONENTS+=../lib/liblib.a
 LIBS += $$COMPONENTS
 PRE_TARGETDEPS = $$COMPONENTS
 
-SOURCES += PixWidget.cpp \
+MOC_DIR     = .moc
-		   Skin.cpp \
+OBJECTS_DIR = .obj
-		   MainWindow.cpp \
-		   Display.cpp \
-		   MainDisplay.cpp \
-		   TitleBar.cpp \
-		   Button.cpp \
-		   TextBar.cpp \
-		   NumberDisplay.cpp \
-		   TimeDisplay.cpp \
-		   XMMSHandler.cpp \
-		   SmallNumberDisplay.cpp \
-		   StereoMono.cpp \
-		   PosBar.cpp \
-		   PlayStatus.cpp \
-		   ShadedDisplay.cpp \
-		   Playlist.cpp \
-		   PlaylistView.cpp \
-		   SkinChooser.cpp \
-		   PlaylistShade.cpp \
-		   qtmd5.cpp \
-		   SettingsWindow.cpp \
-		   PlaylistMenu.cpp \
-		   VolumeSlider.cpp \
-		   ClutterBar.cpp \
-		   Equalizer.cpp \
-		   FileDialog.cpp \
-		   BrowseModel.cpp \
-		   BrowseDialog.cpp
 
-
+include(src.pri)
-HEADERS += PixWidget.h \
-		   Skin.h \
-		   MainWindow.h \
-		   Display.h \
-		   MainDisplay.h \
-		   TitleBar.h \
-		   Button.h \
-		   TextBar.h \
-		   NumberDisplay.h \
-		   TimeDisplay.h \
-		   XMMSHandler.h \
-		   SmallNumberDisplay.h \
-		   StereoMono.h \
-		   PosBar.h \
-		   PlayStatus.h \
-		   ShadedDisplay.h \
-		   Playlist.h \
-		   PlaylistView.h \
-		   SkinChooser.h \
-		   PlaylistShade.h \
-		   qtmd5.h \
-		   SettingsWindow.h \
-		   PlaylistMenu.h \
-		   VolumeSlider.h \
-		   ClutterBar.h \
-		   Equalizer.h \
-		   FileDialog.h \
-		   BrowseModel.h \
-		   BrowseDialog.h
 
 TARGET = promoe
 DESTDIR = $$PWD/..
 
-RESOURCES = promoe.qrc
+RESOURCES += ../data/promoe.qrc
 macx:RC_FILE = promoe.icns
 macx:INCLUDEPATH = /sw/include