summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-03-26 14:44:01 (UTC)
committer llornkcor <llornkcor>2003-03-26 14:44:01 (UTC)
commit86f5b1b916949da47d23549ffcff68e039d38ebb (patch) (unidiff)
treedbc9f78f514af7c6e64218b9cfcb256d2bc4143e
parent2b040bc1d3fafccfcb1d7773f005f038e1032277 (diff)
downloadopie-86f5b1b916949da47d23549ffcff68e039d38ebb.zip
opie-86f5b1b916949da47d23549ffcff68e039d38ebb.tar.gz
opie-86f5b1b916949da47d23549ffcff68e039d38ebb.tar.bz2
part implement of new qcop massages
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp46
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h4
2 files changed, 50 insertions, 0 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index a0bf4db..5e1be2f 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -121,48 +121,51 @@ public:
121 121
122 122
123class MenuItem : public QAction { 123class MenuItem : public QAction {
124public: 124public:
125 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) 125 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
126 : QAction( text, QString::null, 0, 0 ) { 126 : QAction( text, QString::null, 0, 0 ) {
127 connect( this, SIGNAL( activated() ), handler, slot ); 127 connect( this, SIGNAL( activated() ), handler, slot );
128 addTo( parent ); 128 addTo( parent );
129 } 129 }
130}; 130};
131 131
132 132
133PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 133PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
134 : QMainWindow( parent, name, fl ) { 134 : QMainWindow( parent, name, fl ) {
135 135
136 d = new PlayListWidgetPrivate; 136 d = new PlayListWidgetPrivate;
137 d->setDocumentUsed = FALSE; 137 d->setDocumentUsed = FALSE;
138 d->current = NULL; 138 d->current = NULL;
139 fromSetDocument = FALSE; 139 fromSetDocument = FALSE;
140 insanityBool=FALSE; 140 insanityBool=FALSE;
141 audioScan = FALSE; 141 audioScan = FALSE;
142 videoScan = FALSE; 142 videoScan = FALSE;
143// menuTimer = new QTimer( this ,"menu timer"), 143// menuTimer = new QTimer( this ,"menu timer"),
144// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); 144// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
145 channel = new QCopChannel( "QPE/Application/opieplayer", this );
146 connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
147 this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
145 148
146 setBackgroundMode( PaletteButton ); 149 setBackgroundMode( PaletteButton );
147 150
148 setCaption( tr("OpiePlayer") ); 151 setCaption( tr("OpiePlayer") );
149 setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); 152 setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
150 153
151 setToolBarsMovable( FALSE ); 154 setToolBarsMovable( FALSE );
152 155
153 // Create Toolbar 156 // Create Toolbar
154 QPEToolBar *toolbar = new QPEToolBar( this ); 157 QPEToolBar *toolbar = new QPEToolBar( this );
155 toolbar->setHorizontalStretchable( TRUE ); 158 toolbar->setHorizontalStretchable( TRUE );
156 159
157 // Create Menubar 160 // Create Menubar
158 QPEMenuBar *menu = new QPEMenuBar( toolbar ); 161 QPEMenuBar *menu = new QPEMenuBar( toolbar );
159 menu->setMargin( 0 ); 162 menu->setMargin( 0 );
160 163
161 QPEToolBar *bar = new QPEToolBar( this ); 164 QPEToolBar *bar = new QPEToolBar( this );
162 bar->setLabel( tr( "Play Operations" ) ); 165 bar->setLabel( tr( "Play Operations" ) );
163// d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", 166// d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list",
164// this , SLOT( addSelected()) ); 167// this , SLOT( addSelected()) );
165 tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); 168 tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
166 tbDeletePlaylist->setFlat(TRUE); 169 tbDeletePlaylist->setFlat(TRUE);
167 tbDeletePlaylist->setFixedSize(20,20); 170 tbDeletePlaylist->setFixedSize(20,20);
168 171
@@ -1399,24 +1402,67 @@ void PlayListWidget::populateSkinsMenu() {
1399// qDebug( fi->fileName() ); 1402// qDebug( fi->fileName() );
1400 if( skinName != "." && skinName != ".." && skinName !="CVS" ) { 1403 if( skinName != "." && skinName != ".." && skinName !="CVS" ) {
1401 item = skinsMenu->insertItem( fi->fileName() ) ; 1404 item = skinsMenu->insertItem( fi->fileName() ) ;
1402 } 1405 }
1403 if( skinName == "default" ) { 1406 if( skinName == "default" ) {
1404 defaultSkinIndex = item; 1407 defaultSkinIndex = item;
1405 } 1408 }
1406 if( skinName == skin ) { 1409 if( skinName == skin ) {
1407 skinsMenu->setItemChecked( item, TRUE ); 1410 skinsMenu->setItemChecked( item, TRUE );
1408 } 1411 }
1409 ++it; 1412 ++it;
1410 } 1413 }
1411} 1414}
1412 1415
1413void PlayListWidget::skinsMenuActivated( int item ) { 1416void PlayListWidget::skinsMenuActivated( int item ) {
1414 for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { 1417 for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
1415 skinsMenu->setItemChecked( i, FALSE ); 1418 skinsMenu->setItemChecked( i, FALSE );
1416 } 1419 }
1417 skinsMenu->setItemChecked( item, TRUE ); 1420 skinsMenu->setItemChecked( item, TRUE );
1418 1421
1419 Config cfg( "OpiePlayer" ); 1422 Config cfg( "OpiePlayer" );
1420 cfg.setGroup("Options"); 1423 cfg.setGroup("Options");
1421 cfg.writeEntry("Skin", skinsMenu->text( item ) ); 1424 cfg.writeEntry("Skin", skinsMenu->text( item ) );
1422} 1425}
1426
1427void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
1428 qDebug("qcop message "+msg );
1429 QDataStream stream ( data, IO_ReadOnly );
1430 if ( msg == "play()" ) { //plays current selection
1431 btnPlay( true);
1432 } else if ( msg == "stop()" ) {
1433 mediaPlayerState->setPlaying( false);
1434 } else if ( msg == "togglePause()" ) {
1435 mediaPlayerState->togglePaused();
1436 } else if ( msg == "next()" ) { //select next in list
1437 mediaPlayerState->setNext();
1438 } else if ( msg == "prev()" ) { //select previous in list
1439 mediaPlayerState->setPrev();
1440 } else if ( msg == "toggleLooping()" ) { //loop or not loop
1441 mediaPlayerState->toggleLooping();
1442 } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled
1443 mediaPlayerState->toggleShuffled();
1444 } else if ( msg == "volUp()" ) { //volume more
1445// emit moreClicked();
1446// emit moreReleased();
1447 } else if ( msg == "volDown()" ) { //volume less
1448// emit lessClicked();
1449// emit lessReleased();
1450 } else if ( msg == "play(QString)" ) { //play this now
1451 QString file;
1452 stream >> file;
1453 setDocument( (const QString &) file);
1454 } else if ( msg == "add(QString)" ) { //add to playlist
1455 QString file;
1456 stream >> file;
1457 QFileInfo fileInfo(file);
1458 DocLnk lnk;
1459 lnk.setName( fileInfo.baseName() ); //sets name
1460 lnk.setFile( file ); //sets file name
1461 addToSelection( lnk );
1462 } else if ( msg == "rem(QString)" ) { //remove from playlist
1463 QString file;
1464 stream >> file;
1465
1466 }
1467
1468}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 1118b76..e66bcb9 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -5,112 +5,116 @@
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef PLAY_LIST_WIDGET_H 20#ifndef PLAY_LIST_WIDGET_H
21#define PLAY_LIST_WIDGET_H 21#define PLAY_LIST_WIDGET_H
22 22
23#include <qmainwindow.h> 23#include <qmainwindow.h>
24#include <qpe/applnk.h> 24#include <qpe/applnk.h>
25#include <qtabwidget.h> 25#include <qtabwidget.h>
26#include <qpe/fileselector.h> 26#include <qpe/fileselector.h>
27#include <qpushbutton.h> 27#include <qpushbutton.h>
28 28
29#include <qpe/qcopenvelope_qws.h>
30
29#include "om3u.h" 31#include "om3u.h"
30/* #include <qtimer.h> */ 32/* #include <qtimer.h> */
31 33
32 34
33class PlayListWidgetPrivate; 35class PlayListWidgetPrivate;
34class Config; 36class Config;
35class QListViewItem; 37class QListViewItem;
36class QListView; 38class QListView;
37class QPoint; 39class QPoint;
38class QAction; 40class QAction;
39class QLabel; 41class QLabel;
40class QPopupMenu; 42class QPopupMenu;
41 43
42class PlayListWidget : public QMainWindow { 44class PlayListWidget : public QMainWindow {
43 Q_OBJECT 45 Q_OBJECT
44public: 46public:
45 PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); 47 PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
46 ~PlayListWidget(); 48 ~PlayListWidget();
47 QTabWidget * tabWidget; 49 QTabWidget * tabWidget;
48 QAction *fullScreenButton, *scaleButton; 50 QAction *fullScreenButton, *scaleButton;
49 DocLnkSet files; 51 DocLnkSet files;
50 DocLnkSet vFiles; 52 DocLnkSet vFiles;
51 QListView *audioView, *videoView, *playlistView; 53 QListView *audioView, *videoView, *playlistView;
52 QLabel *libString; 54 QLabel *libString;
53 bool fromSetDocument; 55 bool fromSetDocument;
54 bool insanityBool; 56 bool insanityBool;
55 QString setDocFileRef, currentPlayList; 57 QString setDocFileRef, currentPlayList;
56 // retrieve the current playlist entry (media file link) 58 // retrieve the current playlist entry (media file link)
57 const DocLnk *current(); 59 const DocLnk *current();
58 void useSelectedDocument(); 60 void useSelectedDocument();
59/* QTimer * menuTimer; */ 61/* QTimer * menuTimer; */
60 FileSelector* playLists; 62 FileSelector* playLists;
61 QPushButton *tbDeletePlaylist; 63 QPushButton *tbDeletePlaylist;
62 int fd, selected; 64 int fd, selected;
63public slots: 65public slots:
64 bool first(); 66 bool first();
65 bool last(); 67 bool last();
66 bool next(); 68 bool next();
67 bool prev(); 69 bool prev();
68/* void setFullScreen(); */ 70/* void setFullScreen(); */
69/* void setScaled(); */ 71/* void setScaled(); */
70protected: 72protected:
73 QCopChannel * channel;
71 QPopupMenu *skinsMenu; 74 QPopupMenu *skinsMenu;
72/* void contentsMousePressEvent( QMouseEvent * e ); */ 75/* void contentsMousePressEvent( QMouseEvent * e ); */
73/* void contentsMouseReleaseEvent( QMouseEvent * e ); */ 76/* void contentsMouseReleaseEvent( QMouseEvent * e ); */
74void keyReleaseEvent( QKeyEvent *e); 77void keyReleaseEvent( QKeyEvent *e);
75void keyPressEvent( QKeyEvent *e); 78void keyPressEvent( QKeyEvent *e);
76private: 79private:
77 int defaultSkinIndex; 80 int defaultSkinIndex;
78 bool audioScan, videoScan; 81 bool audioScan, videoScan;
79 void doBlank(); 82 void doBlank();
80 void doUnblank(); 83 void doUnblank();
81 void readm3u(const QString &); 84 void readm3u(const QString &);
82 void readPls(const QString &); 85 void readPls(const QString &);
83 86
84 87
85 void initializeStates(); 88 void initializeStates();
86 void readConfig( Config& cfg ); 89 void readConfig( Config& cfg );
87 void writeConfig( Config& cfg ) const; 90 void writeConfig( Config& cfg ) const;
88 PlayListWidgetPrivate *d; // Private implementation data 91 PlayListWidgetPrivate *d; // Private implementation data
89 void populateAudioView(); 92 void populateAudioView();
90 void populateVideoView(); 93 void populateVideoView();
91private slots: 94private slots:
92 95
96 void qcopReceive(const QCString&, const QByteArray&);
93 void populateSkinsMenu(); 97 void populateSkinsMenu();
94 void skinsMenuActivated(int); 98 void skinsMenuActivated(int);
95 void writem3u(); 99 void writem3u();
96 void writeCurrentM3u(); 100 void writeCurrentM3u();
97 void scanForAudio(); 101 void scanForAudio();
98 void scanForVideo(); 102 void scanForVideo();
99 void openFile(); 103 void openFile();
100 void setDocument( const QString& fileref ); 104 void setDocument( const QString& fileref );
101 void addToSelection( const DocLnk& ); // Add a media file to the playlist 105 void addToSelection( const DocLnk& ); // Add a media file to the playlist
102 void addToSelection( QListViewItem* ); // Add a media file to the playlist 106 void addToSelection( QListViewItem* ); // Add a media file to the playlist
103 void setActiveWindow(); // need to handle this to show the right view 107 void setActiveWindow(); // need to handle this to show the right view
104 void setPlaylist( bool ); // Show/Hide the playlist 108 void setPlaylist( bool ); // Show/Hide the playlist
105 void setView( char ); 109 void setView( char );
106 void clearList(); 110 void clearList();
107 void addAllToList(); 111 void addAllToList();
108 void addAllMusicToList(); 112 void addAllMusicToList();
109 void addAllVideoToList(); 113 void addAllVideoToList();
110 void saveList(); // Save the playlist 114 void saveList(); // Save the playlist
111 void loadList( const DocLnk &); // Load a playlist 115 void loadList( const DocLnk &); // Load a playlist
112 void playIt( QListViewItem *); 116 void playIt( QListViewItem *);
113 117
114 void btnPlay(bool); 118 void btnPlay(bool);
115 void deletePlaylist(); 119 void deletePlaylist();
116 void addSelected(); 120 void addSelected();