diff --git a/TODO b/TODO index d338dea..91e1c5b 100644 --- a/TODO +++ b/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? diff --git a/src/CleanAMP/Eq_ex.png b/data/CleanAMP/Eq_ex.png similarity index 100% rename from src/CleanAMP/Eq_ex.png rename to data/CleanAMP/Eq_ex.png diff --git a/src/CleanAMP/GENEX.png b/data/CleanAMP/GENEX.png similarity index 100% rename from src/CleanAMP/GENEX.png rename to data/CleanAMP/GENEX.png diff --git a/src/CleanAMP/Gen.png b/data/CleanAMP/Gen.png similarity index 100% rename from src/CleanAMP/Gen.png rename to data/CleanAMP/Gen.png diff --git a/src/CleanAMP/PLEDIT.TXT b/data/CleanAMP/PLEDIT.TXT similarity index 100% rename from src/CleanAMP/PLEDIT.TXT rename to data/CleanAMP/PLEDIT.TXT diff --git a/src/CleanAMP/ReadMe.txt b/data/CleanAMP/ReadMe.txt similarity index 100% rename from src/CleanAMP/ReadMe.txt rename to data/CleanAMP/ReadMe.txt diff --git a/src/CleanAMP/Thumbs.db b/data/CleanAMP/Thumbs.db similarity index 100% rename from src/CleanAMP/Thumbs.db rename to data/CleanAMP/Thumbs.db diff --git a/src/CleanAMP/VIDEO.png b/data/CleanAMP/VIDEO.png similarity index 100% rename from src/CleanAMP/VIDEO.png rename to data/CleanAMP/VIDEO.png diff --git a/src/CleanAMP/Volume.png b/data/CleanAMP/Volume.png similarity index 100% rename from src/CleanAMP/Volume.png rename to data/CleanAMP/Volume.png diff --git a/src/CleanAMP/balance.png b/data/CleanAMP/balance.png similarity index 100% rename from src/CleanAMP/balance.png rename to data/CleanAMP/balance.png diff --git a/src/CleanAMP/cbuttons.png b/data/CleanAMP/cbuttons.png similarity index 100% rename from src/CleanAMP/cbuttons.png rename to data/CleanAMP/cbuttons.png diff --git a/src/CleanAMP/eqmain.png b/data/CleanAMP/eqmain.png similarity index 100% rename from src/CleanAMP/eqmain.png rename to data/CleanAMP/eqmain.png diff --git a/src/CleanAMP/main.png b/data/CleanAMP/main.png similarity index 100% rename from src/CleanAMP/main.png rename to data/CleanAMP/main.png diff --git a/src/CleanAMP/mb.png b/data/CleanAMP/mb.png similarity index 100% rename from src/CleanAMP/mb.png rename to data/CleanAMP/mb.png diff --git a/src/CleanAMP/monoster.png b/data/CleanAMP/monoster.png similarity index 100% rename from src/CleanAMP/monoster.png rename to data/CleanAMP/monoster.png diff --git a/src/CleanAMP/numbers.png b/data/CleanAMP/numbers.png similarity index 100% rename from src/CleanAMP/numbers.png rename to data/CleanAMP/numbers.png diff --git a/src/CleanAMP/playpaus.png b/data/CleanAMP/playpaus.png similarity index 100% rename from src/CleanAMP/playpaus.png rename to data/CleanAMP/playpaus.png diff --git a/src/CleanAMP/pledit.png b/data/CleanAMP/pledit.png similarity index 100% rename from src/CleanAMP/pledit.png rename to data/CleanAMP/pledit.png diff --git a/src/CleanAMP/posbar.png b/data/CleanAMP/posbar.png similarity index 100% rename from src/CleanAMP/posbar.png rename to data/CleanAMP/posbar.png diff --git a/src/CleanAMP/shufrep.png b/data/CleanAMP/shufrep.png similarity index 100% rename from src/CleanAMP/shufrep.png rename to data/CleanAMP/shufrep.png diff --git a/src/CleanAMP/text.png b/data/CleanAMP/text.png similarity index 100% rename from src/CleanAMP/text.png rename to data/CleanAMP/text.png diff --git a/src/CleanAMP/titlebar.png b/data/CleanAMP/titlebar.png similarity index 100% rename from src/CleanAMP/titlebar.png rename to data/CleanAMP/titlebar.png diff --git a/src/CleanAMP/viscolor.txt b/data/CleanAMP/viscolor.txt similarity index 100% rename from src/CleanAMP/viscolor.txt rename to data/CleanAMP/viscolor.txt diff --git a/src/icon.png b/data/icon.png similarity index 100% rename from src/icon.png rename to data/icon.png diff --git a/src/noalbum.png b/data/noalbum.png similarity index 100% rename from src/noalbum.png rename to data/noalbum.png diff --git a/src/noartist.png b/data/noartist.png similarity index 100% rename from src/noartist.png rename to data/noartist.png diff --git a/src/nocover.png b/data/nocover.png similarity index 100% rename from src/nocover.png rename to data/nocover.png diff --git a/src/nosong.png b/data/nosong.png similarity index 100% rename from src/nosong.png rename to data/nosong.png diff --git a/src/promoe.qrc b/data/promoe.qrc similarity index 100% rename from src/promoe.qrc rename to data/promoe.qrc diff --git a/src/MainDisplay.cpp b/src/MainDisplay.cpp index 41da137..7b0f1ea 100644 --- a/src/MainDisplay.cpp +++ b/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 diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index c7eb697..0b61bfe 100644 --- a/src/MainWindow.cpp +++ b/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 #include diff --git a/src/Skin.cpp b/src/Skin.cpp index 31789fe..d89718a 100644 --- a/src/Skin.cpp +++ b/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; } diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp index c0d6248..2d3b3b3 100644 --- a/src/TitleBar.cpp +++ b/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" diff --git a/src/MedialibItem.h b/src/attic/MedialibItem.h similarity index 100% rename from src/MedialibItem.h rename to src/attic/MedialibItem.h diff --git a/src/MedialibTreeModel.cpp b/src/attic/MedialibTreeModel.cpp similarity index 100% rename from src/MedialibTreeModel.cpp rename to src/attic/MedialibTreeModel.cpp diff --git a/src/MedialibTreeModel.h b/src/attic/MedialibTreeModel.h similarity index 100% rename from src/MedialibTreeModel.h rename to src/attic/MedialibTreeModel.h diff --git a/src/MedialibView.cpp b/src/attic/MedialibView.cpp similarity index 100% rename from src/MedialibView.cpp rename to src/attic/MedialibView.cpp diff --git a/src/MedialibView.h b/src/attic/MedialibView.h similarity index 100% rename from src/MedialibView.h rename to src/attic/MedialibView.h diff --git a/src/MedialibWindow.cpp b/src/attic/MedialibWindow.cpp similarity index 100% rename from src/MedialibWindow.cpp rename to src/attic/MedialibWindow.cpp diff --git a/src/MedialibWindow.h b/src/attic/MedialibWindow.h similarity index 100% rename from src/MedialibWindow.h rename to src/attic/MedialibWindow.h diff --git a/src/PlaylistList.cpp b/src/attic/PlaylistList.cpp similarity index 100% rename from src/PlaylistList.cpp rename to src/attic/PlaylistList.cpp diff --git a/src/PlaylistList.h b/src/attic/PlaylistList.h similarity index 100% rename from src/PlaylistList.h rename to src/attic/PlaylistList.h diff --git a/src/attic/README b/src/attic/README new file mode 100644 index 0000000..fb97c94 --- /dev/null +++ b/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 diff --git a/src/qtmd5.cpp b/src/attic/qtmd5.cpp similarity index 100% rename from src/qtmd5.cpp rename to src/attic/qtmd5.cpp diff --git a/src/qtmd5.h b/src/attic/qtmd5.h similarity index 100% rename from src/qtmd5.h rename to src/attic/qtmd5.h diff --git a/src/xmmsclient_methods.h b/src/attic/xmmsclient_methods.h similarity index 100% rename from src/xmmsclient_methods.h rename to src/attic/xmmsclient_methods.h diff --git a/src/xmmsclient_promoe.cpp b/src/attic/xmmsclient_promoe.cpp similarity index 100% rename from src/xmmsclient_promoe.cpp rename to src/attic/xmmsclient_promoe.cpp diff --git a/src/xmmsclient_promoe.h b/src/attic/xmmsclient_promoe.h similarity index 100% rename from src/xmmsclient_promoe.h rename to src/attic/xmmsclient_promoe.h diff --git a/src/Equalizer.cpp b/src/equalizer/equalizer.cpp similarity index 97% rename from src/Equalizer.cpp rename to src/equalizer/equalizer.cpp index 875e214..b046cbb 100644 --- a/src/Equalizer.cpp +++ b/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) diff --git a/src/Equalizer.h b/src/equalizer/equalizer.h similarity index 100% rename from src/Equalizer.h rename to src/equalizer/equalizer.h diff --git a/src/equalizer/equalizer.pri b/src/equalizer/equalizer.pri new file mode 100644 index 0000000..57f96a0 --- /dev/null +++ b/src/equalizer/equalizer.pri @@ -0,0 +1,6 @@ +HEADERS += equalizer.h + +SOURCES += equalizer.cpp + +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD diff --git a/src/Playlist.cpp b/src/playlist/playlist.cpp similarity index 98% rename from src/Playlist.cpp rename to src/playlist/playlist.cpp index 174e5af..c8d2d49 100644 --- a/src/Playlist.cpp +++ b/src/playlist/playlist.cpp @@ -1,11 +1,11 @@ #include "MainWindow.h" #include "BrowseDialog.h" -#include "Playlist.h" -#include "PlaylistView.h" +#include "playlist.h" +#include "playlistview.h" #include "playlistmodel.h" -#include "PlaylistShade.h" -#include "PlaylistMenu.h" +#include "playlistshade.h" +#include "playlistmenu.h" #include "FileDialog.h" #include @@ -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 - * TODO: This might in a future Qt version. Try to find a better solution + * QT library (as of Version 4.3) + * 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); diff --git a/src/Playlist.h b/src/playlist/playlist.h similarity index 100% rename from src/Playlist.h rename to src/playlist/playlist.h diff --git a/src/playlist/playlist.pri b/src/playlist/playlist.pri new file mode 100644 index 0000000..ceee4ea --- /dev/null +++ b/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 diff --git a/src/PlaylistMenu.cpp b/src/playlist/playlistmenu.cpp similarity index 99% rename from src/PlaylistMenu.cpp rename to src/playlist/playlistmenu.cpp index f1c9122..7da4bea 100644 --- a/src/PlaylistMenu.cpp +++ b/src/playlist/playlistmenu.cpp @@ -1,4 +1,4 @@ -#include "PlaylistMenu.h" +#include "playlistmenu.h" #include #include diff --git a/src/PlaylistMenu.h b/src/playlist/playlistmenu.h similarity index 100% rename from src/PlaylistMenu.h rename to src/playlist/playlistmenu.h diff --git a/src/PlaylistShade.cpp b/src/playlist/playlistshade.cpp similarity index 98% rename from src/PlaylistShade.cpp rename to src/playlist/playlistshade.cpp index b88fd50..99b3b91 100644 --- a/src/PlaylistShade.cpp +++ b/src/playlist/playlistshade.cpp @@ -1,8 +1,8 @@ #include "XMMSHandler.h" #include -#include "PlaylistShade.h" -#include "Playlist.h" +#include "playlistshade.h" +#include "playlist.h" #include diff --git a/src/PlaylistShade.h b/src/playlist/playlistshade.h similarity index 100% rename from src/PlaylistShade.h rename to src/playlist/playlistshade.h diff --git a/src/PlaylistView.cpp b/src/playlist/playlistview.cpp similarity index 99% rename from src/PlaylistView.cpp rename to src/playlist/playlistview.cpp index 3736732..d70974b 100644 --- a/src/PlaylistView.cpp +++ b/src/playlist/playlistview.cpp @@ -2,9 +2,9 @@ #include #include "XMMSHandler.h" -#include "PlaylistView.h" +#include "playlistview.h" #include "playlistmodel.h" -#include "Playlist.h" +#include "playlist.h" #include #include diff --git a/src/PlaylistView.h b/src/playlist/playlistview.h similarity index 100% rename from src/PlaylistView.h rename to src/playlist/playlistview.h diff --git a/src/src.pri b/src/src.pri new file mode 100644 index 0000000..2b99cb9 --- /dev/null +++ b/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 diff --git a/src/src.pro b/src/src.pro index e424a62..8605324 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,71 +6,15 @@ COMPONENTS+=../lib/liblib.a LIBS += $$COMPONENTS PRE_TARGETDEPS = $$COMPONENTS -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 \ - 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 +MOC_DIR = .moc +OBJECTS_DIR = .obj - -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 +include(src.pri) TARGET = promoe DESTDIR = $$PWD/.. -RESOURCES = promoe.qrc +RESOURCES += ../data/promoe.qrc macx:RC_FILE = promoe.icns macx:INCLUDEPATH = /sw/include