author | simon <simon> | 2002-12-11 13:06:35 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 13:06:35 (UTC) |
commit | 84d92e2298605f4d4f9a9209731f62c2b10e54e4 (patch) (unidiff) | |
tree | 9742dc8490da1a2ff1b2af2484fc87b1f218ca36 /noncore | |
parent | aa9623e53bd86c2645103ebacc81262f372b73d7 (diff) | |
download | opie-84d92e2298605f4d4f9a9209731f62c2b10e54e4.zip opie-84d92e2298605f4d4f9a9209731f62c2b10e54e4.tar.gz opie-84d92e2298605f4d4f9a9209731f62c2b10e54e4.tar.bz2 |
- minor cleanup
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 6b304ec..0d1c8b6 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -50,58 +50,56 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount | |||
50 | 50 | ||
51 | buttons.clear(); | 51 | buttons.clear(); |
52 | buttons.reserve( buttonCount ); | 52 | buttons.reserve( buttonCount ); |
53 | 53 | ||
54 | for ( uint i = 0; i < buttonCount; ++i ) { | 54 | for ( uint i = 0; i < buttonCount; ++i ) { |
55 | Button button = setupButton( skinInfo[ i ], skin ); | 55 | Button button = setupButton( skinInfo[ i ], skin ); |
56 | buttons.push_back( button ); | 56 | buttons.push_back( button ); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ) | 60 | MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ) |
61 | { | 61 | { |
62 | Button button; | 62 | Button button; |
63 | button.command = buttonInfo.command; | 63 | button.command = buttonInfo.command; |
64 | button.type = buttonInfo.type; | 64 | button.type = buttonInfo.type; |
65 | button.mask = skin.buttonMaskImage( buttonInfo.fileName ); | 65 | button.mask = skin.buttonMaskImage( buttonInfo.fileName ); |
66 | 66 | ||
67 | return button; | 67 | return button; |
68 | } | 68 | } |
69 | 69 | ||
70 | void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) | 70 | void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix ) |
71 | { | 71 | { |
72 | Config cfg( "OpiePlayer" ); | 72 | Config cfg( "OpiePlayer" ); |
73 | cfg.setGroup( "Options" ); | 73 | cfg.setGroup( "Options" ); |
74 | QString skin = cfg.readEntry( "Skin","default" ); | 74 | QString name = cfg.readEntry( "Skin","default" ); |
75 | 75 | ||
76 | loadSkin( skinInfo, buttonCount, skin, fileNameInfix ); | 76 | Skin skin( name, fileNameInfix ); |
77 | loadSkin( skinInfo, buttonCount, skin ); | ||
77 | } | 78 | } |
78 | 79 | ||
79 | void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix ) | 80 | void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ) |
80 | { | 81 | { |
81 | Skin skin( name, fileNameInfix ); | ||
82 | |||
83 | QString skinPath = "opieplayer2/skins/" + name; | ||
84 | backgroundPixmap = skin.backgroundImage(); | 82 | backgroundPixmap = skin.backgroundImage(); |
85 | buttonUpImage = skin.buttonUpImage(); | 83 | buttonUpImage = skin.buttonUpImage(); |
86 | buttonDownImage = skin.buttonDownImage(); | 84 | buttonDownImage = skin.buttonDownImage(); |
87 | 85 | ||
88 | setupButtons( skinInfo, buttonCount, skin ); | 86 | setupButtons( skinInfo, buttonCount, skin ); |
89 | } | 87 | } |
90 | 88 | ||
91 | void MediaWidget::closeEvent( QCloseEvent * ) | 89 | void MediaWidget::closeEvent( QCloseEvent * ) |
92 | { | 90 | { |
93 | mediaPlayerState.setList(); | 91 | mediaPlayerState.setList(); |
94 | } | 92 | } |
95 | 93 | ||
96 | void MediaWidget::paintEvent( QPaintEvent *pe ) | 94 | void MediaWidget::paintEvent( QPaintEvent *pe ) |
97 | { | 95 | { |
98 | QPainter p( this ); | 96 | QPainter p( this ); |
99 | 97 | ||
100 | if ( mediaPlayerState.isFullscreen() ) { | 98 | if ( mediaPlayerState.isFullscreen() ) { |
101 | // Clear the background | 99 | // Clear the background |
102 | p.setBrush( QBrush( Qt::black ) ); | 100 | p.setBrush( QBrush( Qt::black ) ); |
103 | return; | 101 | return; |
104 | } | 102 | } |
105 | 103 | ||
106 | if ( !pe->erased() ) { | 104 | if ( !pe->erased() ) { |
107 | // Combine with background and double buffer | 105 | // Combine with background and double buffer |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 0fe4772..9f13677 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -85,49 +85,49 @@ public: | |||
85 | 85 | ||
86 | public slots: | 86 | public slots: |
87 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | 87 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; |
88 | virtual void setLength( long length ) = 0; | 88 | virtual void setLength( long length ) = 0; |
89 | virtual void setPlaying( bool playing ) = 0; | 89 | virtual void setPlaying( bool playing ) = 0; |
90 | 90 | ||
91 | virtual void loadSkin() = 0; | 91 | virtual void loadSkin() = 0; |
92 | 92 | ||
93 | signals: | 93 | signals: |
94 | void moreReleased(); | 94 | void moreReleased(); |
95 | void lessReleased(); | 95 | void lessReleased(); |
96 | void forwardReleased(); | 96 | void forwardReleased(); |
97 | void backReleased(); | 97 | void backReleased(); |
98 | void forwardClicked(); | 98 | void forwardClicked(); |
99 | void backClicked(); | 99 | void backClicked(); |
100 | void moreClicked(); | 100 | void moreClicked(); |
101 | void lessClicked(); | 101 | void lessClicked(); |
102 | 102 | ||
103 | protected: | 103 | protected: |
104 | void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, | 104 | void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, |
105 | const Skin &skin ); | 105 | const Skin &skin ); |
106 | Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ); | 106 | Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin ); |
107 | 107 | ||
108 | void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null ); | 108 | void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null ); |
109 | void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix ); | 109 | void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin ); |
110 | 110 | ||
111 | virtual void closeEvent( QCloseEvent * ); | 111 | virtual void closeEvent( QCloseEvent * ); |
112 | 112 | ||
113 | virtual void paintEvent( QPaintEvent *pe ); | 113 | virtual void paintEvent( QPaintEvent *pe ); |
114 | 114 | ||
115 | Button *buttonAt( const QPoint &position ); | 115 | Button *buttonAt( const QPoint &position ); |
116 | 116 | ||
117 | virtual void mousePressEvent( QMouseEvent *event ); | 117 | virtual void mousePressEvent( QMouseEvent *event ); |
118 | virtual void mouseReleaseEvent( QMouseEvent *event ); | 118 | virtual void mouseReleaseEvent( QMouseEvent *event ); |
119 | 119 | ||
120 | virtual void makeVisible(); | 120 | virtual void makeVisible(); |
121 | 121 | ||
122 | void handleCommand( Command command, bool buttonDown ); | 122 | void handleCommand( Command command, bool buttonDown ); |
123 | 123 | ||
124 | bool isOverButton( const QPoint &position, int buttonId ) const; | 124 | bool isOverButton( const QPoint &position, int buttonId ) const; |
125 | 125 | ||
126 | void paintAllButtons( QPainter &p ); | 126 | void paintAllButtons( QPainter &p ); |
127 | void paintButton( const Button &button ); | 127 | void paintButton( const Button &button ); |
128 | void paintButton( QPainter &p, const Button &button ); | 128 | void paintButton( QPainter &p, const Button &button ); |
129 | 129 | ||
130 | void setToggleButton( Button &button, bool down ); | 130 | void setToggleButton( Button &button, bool down ); |
131 | void setToggleButton( Command command, bool down ); | 131 | void setToggleButton( Command command, bool down ); |
132 | void toggleButton( Button &button ); | 132 | void toggleButton( Button &button ); |
133 | 133 | ||