summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-03 16:53:41 (UTC)
committer simon <simon>2002-12-03 16:53:41 (UTC)
commitb92f6e69e5c243363c0f285dcf1f0d47bbc2cc17 (patch) (unidiff)
tree6dd69ef8a0ce4079afe7ee3b23cedb13ad8d642c
parenta06817e1b4d8db570b87873610efefb55b0ab429 (diff)
downloadopie-b92f6e69e5c243363c0f285dcf1f0d47bbc2cc17.zip
opie-b92f6e69e5c243363c0f285dcf1f0d47bbc2cc17.tar.gz
opie-b92f6e69e5c243363c0f285dcf1f0d47bbc2cc17.tar.bz2
- starting to factor out the playlist file views into separate classes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.h16
-rw-r--r--noncore/multimedia/opieplayer2/playlistview.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/playlistview.h16
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp5
6 files changed, 65 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index dbc21b1..8d549b6 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -2,20 +2,20 @@ TEMPLATE = app
2#CONFIG = qt warn_on release 2#CONFIG = qt warn_on release
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ 5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
6 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ 6 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
7 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ 7 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
8 alphablend.h yuv2rgb.h threadutil.h mediawidget.h 8 alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h
9SOURCES = main.cpp \ 9SOURCES = main.cpp \
10 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ 10 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
11 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ 11 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
12 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ 12 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
13 playlistwidgetgui.cpp\ 13 playlistwidgetgui.cpp\
14 alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \ 14 alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
15 threadutil.cpp mediawidget.cpp 15 threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp
16TARGET = opieplayer2 16TARGET = opieplayer2
17INCLUDEPATH += $(OPIEDIR)/include 17INCLUDEPATH += $(OPIEDIR)/include
18DEPENDPATH += $(OPIEDIR)/include 18DEPENDPATH += $(OPIEDIR)/include
19LIBS += -lqpe -lpthread -lopie -lxine 19LIBS += -lqpe -lpthread -lopie -lxine
20MOC_DIR = qpeobj 20MOC_DIR = qpeobj
21OBJECTS_DIR = qpeobj 21OBJECTS_DIR = qpeobj
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
new file mode 100644
index 0000000..bdd38e0
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -0,0 +1,14 @@
1
2#include "playlistfileview.h"
3
4PlayListFileView::PlayListFileView( QWidget *parent, const char *name )
5 : PlayListView( parent, name )
6{
7}
8
9PlayListFileView::~PlayListFileView()
10{
11}
12
13/* vim: et sw=4 ts=4
14 */
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
new file mode 100644
index 0000000..eef4bd1
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -0,0 +1,16 @@
1#ifndef PLAYLISTFILEVIEW_H
2#define PLAYLISTFILEVIEW_H
3
4#include "playlistview.h"
5
6class PlayListFileView : public PlayListView
7{
8 Q_OBJECT
9public:
10 PlayListFileView( QWidget *parent, const char *name = 0 );
11 virtual ~PlayListFileView();
12};
13
14#endif // PLAYLISTFILEVIEW_H
15/* vim: et sw=4 ts=4
16 */
diff --git a/noncore/multimedia/opieplayer2/playlistview.cpp b/noncore/multimedia/opieplayer2/playlistview.cpp
new file mode 100644
index 0000000..ebe1492
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/playlistview.cpp
@@ -0,0 +1,14 @@
1
2#include "playlistview.h"
3
4PlayListView::PlayListView( QWidget *parent, const char *name )
5 : QListView( parent, name )
6{
7}
8
9PlayListView::~PlayListView()
10{
11}
12
13/* vim: et sw=4 ts=4
14 */
diff --git a/noncore/multimedia/opieplayer2/playlistview.h b/noncore/multimedia/opieplayer2/playlistview.h
new file mode 100644
index 0000000..f1abb07
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/playlistview.h
@@ -0,0 +1,16 @@
1#ifndef PLAYLISTVIEW_H
2#define PLAYLISTVIEW_H
3
4#include <qlistview.h>
5
6class PlayListView : public QListView
7{
8 Q_OBJECT
9public:
10 PlayListView( QWidget *parent, const char *name );
11 virtual ~PlayListView();
12};
13
14#endif // PLAYLISTVIEW_H
15/* vim: et sw=4 ts=4
16 */
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index f47ddcc..de7b6d5 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -48,12 +48,13 @@
48#include <qlayout.h> 48#include <qlayout.h>
49 49
50#include "playlistselection.h" 50#include "playlistselection.h"
51#include "playlistwidget.h" 51#include "playlistwidget.h"
52#include "mediaplayerstate.h" 52#include "mediaplayerstate.h"
53#include "inputDialog.h" 53#include "inputDialog.h"
54#include "playlistfileview.h"
54 55
55//only needed for the random play 56//only needed for the random play
56#include <stdlib.h> 57#include <stdlib.h>
57 58
58#include "audiowidget.h" 59#include "audiowidget.h"
59#include "videowidget.h" 60#include "videowidget.h"
@@ -146,13 +147,13 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
146 QWidget *aTab; 147 QWidget *aTab;
147 aTab = new QWidget( tabWidget, "aTab" ); 148 aTab = new QWidget( tabWidget, "aTab" );
148 149
149 QGridLayout *Alayout = new QGridLayout( aTab ); 150 QGridLayout *Alayout = new QGridLayout( aTab );
150 Alayout->setSpacing( 2 ); 151 Alayout->setSpacing( 2 );
151 Alayout->setMargin( 2 ); 152 Alayout->setMargin( 2 );
152 audioView = new QListView( aTab, "Audioview" ); 153 audioView = new PlayListFileView( aTab, "Audioview" );
153 audioView->addColumn( tr( "Title" ), 140 ); 154 audioView->addColumn( tr( "Title" ), 140 );
154 audioView->addColumn( tr( "Size" ), -1 ); 155 audioView->addColumn( tr( "Size" ), -1 );
155 audioView->addColumn( tr( "Media" ), 0 ); 156 audioView->addColumn( tr( "Media" ), 0 );
156 audioView->addColumn( tr( "Path" ), -1 ); 157 audioView->addColumn( tr( "Path" ), -1 );
157 audioView->setColumnAlignment( 1, Qt::AlignRight ); 158 audioView->setColumnAlignment( 1, Qt::AlignRight );
158 audioView->setColumnAlignment( 2, Qt::AlignRight ); 159 audioView->setColumnAlignment( 2, Qt::AlignRight );
@@ -168,13 +169,13 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
168 QWidget *vTab; 169 QWidget *vTab;
169 vTab = new QWidget( tabWidget, "vTab" ); 170 vTab = new QWidget( tabWidget, "vTab" );
170 171
171 QGridLayout *Vlayout = new QGridLayout( vTab ); 172 QGridLayout *Vlayout = new QGridLayout( vTab );
172 Vlayout->setSpacing( 2 ); 173 Vlayout->setSpacing( 2 );
173 Vlayout->setMargin( 2 ); 174 Vlayout->setMargin( 2 );
174 videoView = new QListView( vTab, "Videoview" ); 175 videoView = new PlayListFileView( vTab, "Videoview" );
175 videoView->addColumn( tr( "Title" ), 140); 176 videoView->addColumn( tr( "Title" ), 140);
176 videoView->addColumn( tr( "Size" ), -1 ); 177 videoView->addColumn( tr( "Size" ), -1 );
177 videoView->addColumn(tr( "Media" ), 0 ); 178 videoView->addColumn(tr( "Media" ), 0 );
178 videoView->addColumn(tr( "Path" ), -1 ); 179 videoView->addColumn(tr( "Path" ), -1 );
179 videoView->setColumnAlignment( 1, Qt::AlignRight ); 180 videoView->setColumnAlignment( 1, Qt::AlignRight );
180 videoView->setColumnAlignment( 2, Qt::AlignRight ); 181 videoView->setColumnAlignment( 2, Qt::AlignRight );