summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 17:16:17 (UTC)
committer simon <simon>2002-12-11 17:16:17 (UTC)
commit94461696cfdcf8cdbaabec1400300e546edc447e (patch) (unidiff)
treebacef808031edb254214d04489d4a8e4df53cdb9
parent9f5e007f4859027eaeb989c620ec62fc698b44cc (diff)
downloadopie-94461696cfdcf8cdbaabec1400300e546edc447e.zip
opie-94461696cfdcf8cdbaabec1400300e546edc447e.tar.gz
opie-94461696cfdcf8cdbaabec1400300e546edc447e.tar.bz2
- expose information about the buttons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
4 files changed, 28 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 78079dd..4db444a 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -108,12 +108,22 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
108 108
109AudioWidget::~AudioWidget() { 109AudioWidget::~AudioWidget() {
110 110
111// mediaPlayerState->setPlaying(false); 111// mediaPlayerState->setPlaying(false);
112} 112}
113 113
114const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo()
115{
116 return ::skinInfo;
117}
118
119const uint AudioWidget::buttonCount()
120{
121 return ::buttonCount;
122}
123
114void AudioWidget::resizeEvent( QResizeEvent *e ) { 124void AudioWidget::resizeEvent( QResizeEvent *e ) {
115 int h = height(); 125 int h = height();
116 int w = width(); 126 int w = width();
117 127
118 songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) ); 128 songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) );
119 slider.setFixedWidth( w - 110 ); 129 slider.setFixedWidth( w - 110 );
@@ -161,13 +171,13 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
161 killTimers(); 171 killTimers();
162 hide(); 172 hide();
163} 173}
164 174
165void AudioWidget::loadSkin() 175void AudioWidget::loadSkin()
166{ 176{
167 loadDefaultSkin( skinInfo, buttonCount ); 177 loadDefaultSkin( ::skinInfo, ::buttonCount );
168 178
169 setBackgroundPixmap( backgroundPixmap ); 179 setBackgroundPixmap( backgroundPixmap );
170 180
171 songInfo.setFocusPolicy( QWidget::NoFocus ); 181 songInfo.setFocusPolicy( QWidget::NoFocus );
172// changeTextColor( &songInfo ); 182// changeTextColor( &songInfo );
173// songInfo.setBackgroundColor( QColor( 167, 212, 167 )); 183// songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 670fb45..75d4857 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -52,12 +52,16 @@ class QPixmap;
52class AudioWidget : public MediaWidget { 52class AudioWidget : public MediaWidget {
53 Q_OBJECT 53 Q_OBJECT
54public: 54public:
55 AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); 55 AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
56 ~AudioWidget(); 56 ~AudioWidget();
57 void setTickerText( const QString &text ) { songInfo.setText( text ); } 57 void setTickerText( const QString &text ) { songInfo.setText( text ); }
58
59 static const MediaWidget::SkinButtonInfo *skinInfo();
60 static const uint buttonCount();
61
58public slots: 62public slots:
59 void updateSlider( long, long ); 63 void updateSlider( long, long );
60 void sliderPressed( ); 64 void sliderPressed( );
61 void sliderReleased( ); 65 void sliderReleased( );
62 void setLooping( bool b) { setToggleButton( Loop, b ); } 66 void setLooping( bool b) { setToggleButton( Loop, b ); }
63 void setPosition( long ); 67 void setPosition( long );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a8ff540..058730f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -96,12 +96,22 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
96 96
97 97
98VideoWidget::~VideoWidget() 98VideoWidget::~VideoWidget()
99{ 99{
100} 100}
101 101
102const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo()
103{
104 return ::skinInfo;
105}
106
107const uint VideoWidget::buttonCount()
108{
109 return ::buttonCount;
110}
111
102void VideoWidget::resizeEvent( QResizeEvent *e ) { 112void VideoWidget::resizeEvent( QResizeEvent *e ) {
103 int h = height(); 113 int h = height();
104 int w = width(); 114 int w = width();
105 //int Vh = 160; 115 //int Vh = 160;
106 //int Vw = 220; 116 //int Vw = 220;
107 117
@@ -154,13 +164,13 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
154 scaledHeight = 0; 164 scaledHeight = 0;
155 hide(); 165 hide();
156} 166}
157 167
158void VideoWidget::loadSkin() 168void VideoWidget::loadSkin()
159{ 169{
160 loadDefaultSkin( skinInfo, buttonCount, "V" ); 170 loadDefaultSkin( ::skinInfo, ::buttonCount, "V" );
161 171
162 setBackgroundPixmap( backgroundPixmap ); 172 setBackgroundPixmap( backgroundPixmap );
163 173
164 delete slider; 174 delete slider;
165 slider = new QSlider( Qt::Horizontal, this ); 175 slider = new QSlider( Qt::Horizontal, this );
166 slider->setMinValue( 0 ); 176 slider->setMinValue( 0 );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index f434945..80e9356 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -47,12 +47,14 @@ class QSlider;
47class VideoWidget : public MediaWidget { 47class VideoWidget : public MediaWidget {
48 Q_OBJECT 48 Q_OBJECT
49public: 49public:
50 VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); 50 VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
51 ~VideoWidget(); 51 ~VideoWidget();
52 52
53 static const MediaWidget::SkinButtonInfo *skinInfo();
54 static const uint buttonCount();
53 55
54 XineVideoWidget* vidWidget(); 56 XineVideoWidget* vidWidget();
55public slots: 57public slots:
56 void updateSlider( long, long ); 58 void updateSlider( long, long );
57 void sliderPressed( ); 59 void sliderPressed( );
58 void sliderReleased( ); 60 void sliderReleased( );