author | simon <simon> | 2002-12-11 13:12:29 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 13:12:29 (UTC) |
commit | cd5e96b40ceae9158e5cb01e71769e895ea7a3c1 (patch) (unidiff) | |
tree | 0a5e1961a31096f995e00215d851c3af8e8ae877 /noncore/multimedia/opieplayer2/mediawidget.cpp | |
parent | 57a776c8345422a0fc32b3fb9d604be1c050d201 (diff) | |
download | opie-cd5e96b40ceae9158e5cb01e71769e895ea7a3c1.zip opie-cd5e96b40ceae9158e5cb01e71769e895ea7a3c1.tar.gz opie-cd5e96b40ceae9158e5cb01e71769e895ea7a3c1.tar.bz2 |
- moved default skin name reading over to skin class
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 0d1c8b6..ab23aa8 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -22,15 +22,12 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | #include "mediawidget.h" | 24 | #include "mediawidget.h" |
25 | #include "playlistwidget.h" | 25 | #include "playlistwidget.h" |
26 | #include "skin.h" | 26 | #include "skin.h" |
27 | 27 | ||
28 | #include <qpe/config.h> | ||
29 | #include <qpe/qpeapplication.h> | ||
30 | |||
31 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | 28 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
32 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) | 29 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) |
33 | { | 30 | { |
34 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 31 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
35 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | 32 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); |
36 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), | 33 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), |
@@ -66,17 +63,13 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, | |||
66 | 63 | ||
67 | return button; | 64 | return button; |
68 | } | 65 | } |
69 | 66 | ||
70 | void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) | 67 | void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) |
71 | { | 68 | { |
72 | Config cfg( "OpiePlayer" ); | 69 | Skin skin( fileNameInfix ); |
73 | cfg.setGroup( "Options" ); | ||
74 | QString name = cfg.readEntry( "Skin","default" ); | ||
75 | |||
76 | Skin skin( name, fileNameInfix ); | ||
77 | loadSkin( skinInfo, buttonCount, skin ); | 70 | loadSkin( skinInfo, buttonCount, skin ); |
78 | } | 71 | } |
79 | 72 | ||
80 | void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ) | 73 | void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ) |
81 | { | 74 | { |
82 | backgroundPixmap = skin.backgroundImage(); | 75 | backgroundPixmap = skin.backgroundImage(); |