Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 3b33209..6e9c14a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -79,25 +79,25 @@ void changeTextColor( QWidget * w) { | |||
79 | w->setPalette( p ); | 79 | w->setPalette( p ); |
80 | } | 80 | } |
81 | 81 | ||
82 | } | 82 | } |
83 | 83 | ||
84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
85 | 85 | ||
86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), | 86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), |
87 | audioSliderBeingMoved( false ) | 87 | audioSliderBeingMoved( false ) |
88 | { | 88 | { |
89 | for ( uint i = 0; i < buttonCount; ++i ) { | 89 | for ( uint i = 0; i < buttonCount; ++i ) { |
90 | Button button; | 90 | Button button; |
91 | button.buttonType = skinInfo[ i ].buttonType; | 91 | button.type = skinInfo[ i ].type; |
92 | buttons.push_back( button ); | 92 | buttons.push_back( button ); |
93 | } | 93 | } |
94 | 94 | ||
95 | setCaption( tr("OpiePlayer") ); | 95 | setCaption( tr("OpiePlayer") ); |
96 | 96 | ||
97 | Config cfg("OpiePlayer"); | 97 | Config cfg("OpiePlayer"); |
98 | cfg.setGroup("Options"); | 98 | cfg.setGroup("Options"); |
99 | skin = cfg.readEntry("Skin","default"); | 99 | skin = cfg.readEntry("Skin","default"); |
100 | //skin = "scaleTest"; | 100 | //skin = "scaleTest"; |
101 | // color of background, frame, degree of transparency | 101 | // color of background, frame, degree of transparency |
102 | 102 | ||
103 | QString skinPath = "opieplayer2/skins/" + skin; | 103 | QString skinPath = "opieplayer2/skins/" + skin; |
@@ -378,25 +378,25 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
378 | return; | 378 | return; |
379 | case Back: | 379 | case Back: |
380 | emit backClicked(); | 380 | emit backClicked(); |
381 | return; | 381 | return; |
382 | } | 382 | } |
383 | } else if ( !isOnButton && buttons[i].isHeld ) { | 383 | } else if ( !isOnButton && buttons[i].isHeld ) { |
384 | buttons[i].isHeld = FALSE; | 384 | buttons[i].isHeld = FALSE; |
385 | toggleButton(i); | 385 | toggleButton(i); |
386 | } | 386 | } |
387 | } else { | 387 | } else { |
388 | if ( buttons[i].isHeld ) { | 388 | if ( buttons[i].isHeld ) { |
389 | buttons[i].isHeld = FALSE; | 389 | buttons[i].isHeld = FALSE; |
390 | if ( buttons[i].buttonType != ToggleButton ) { | 390 | if ( buttons[i].type != ToggleButton ) { |
391 | setToggleButton( i, FALSE ); | 391 | setToggleButton( i, FALSE ); |
392 | } | 392 | } |
393 | qDebug("mouseEvent %d", i); | 393 | qDebug("mouseEvent %d", i); |
394 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); | 394 | handleCommand( static_cast<Command>( i ), buttons[ i ].isDown ); |
395 | } | 395 | } |
396 | } | 396 | } |
397 | } | 397 | } |
398 | } | 398 | } |
399 | 399 | ||
400 | 400 | ||
401 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { | 401 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { |
402 | mouseMoveEvent( event ); | 402 | mouseMoveEvent( event ); |