-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index b2c1649..b95c544 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -9,40 +9,45 @@ | |||
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This program is distributed in the hope that it will be useful, | 12 | This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | General Public License for more details. | 15 | General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
18 | along with this program; see the file COPYING. If not, write to | 18 | along with this program; see the file COPYING. If not, write to |
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "skin.h" | 23 | #include "skin.h" |
24 | #include "singleton.h" | 24 | #include "singleton.h" |
25 | |||
26 | /* OPIE */ | ||
25 | #include <opie2/odebug.h> | 27 | #include <opie2/odebug.h> |
28 | #include <opie2/oresource.h> | ||
29 | using namespace Opie::Core; | ||
30 | #include <qpe/config.h> | ||
31 | #include <qpe/global.h> | ||
26 | 32 | ||
33 | /* QT */ | ||
27 | #include <qcache.h> | 34 | #include <qcache.h> |
28 | #include <qtimer.h> | 35 | #include <qtimer.h> |
29 | 36 | ||
30 | #include <qpe/config.h> | 37 | /* STD */ |
31 | #include <qpe/global.h> | ||
32 | |||
33 | #include <assert.h> | 38 | #include <assert.h> |
34 | 39 | ||
35 | struct SkinData | 40 | struct SkinData |
36 | { | 41 | { |
37 | typedef QMap<QString, QImage> ButtonMaskImageMap; | 42 | typedef QMap<QString, QImage> ButtonMaskImageMap; |
38 | 43 | ||
39 | QPixmap backgroundPixmap; | 44 | QPixmap backgroundPixmap; |
40 | QImage buttonUpImage; | 45 | QImage buttonUpImage; |
41 | QImage buttonDownImage; | 46 | QImage buttonDownImage; |
42 | QImage buttonMask; | 47 | QImage buttonMask; |
43 | ButtonMaskImageMap buttonMasks; | 48 | ButtonMaskImageMap buttonMasks; |
44 | }; | 49 | }; |
45 | 50 | ||
46 | class SkinCache : public Singleton<SkinCache> | 51 | class SkinCache : public Singleton<SkinCache> |
47 | { | 52 | { |
48 | public: | 53 | public: |
@@ -148,33 +153,33 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const | |||
148 | QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix ); | 153 | QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix ); |
149 | QString path = prefix + fileName; | 154 | QString path = prefix + fileName; |
150 | it = d->buttonMasks.insert( fileName, loadImage( path ) ); | 155 | it = d->buttonMasks.insert( fileName, loadImage( path ) ); |
151 | } | 156 | } |
152 | return *it; | 157 | return *it; |
153 | } | 158 | } |
154 | 159 | ||
155 | QString Skin::defaultSkinName() | 160 | QString Skin::defaultSkinName() |
156 | { | 161 | { |
157 | Config cfg( "OpiePlayer" ); | 162 | Config cfg( "OpiePlayer" ); |
158 | cfg.setGroup( "Options" ); | 163 | cfg.setGroup( "Options" ); |
159 | return cfg.readEntry( "Skin", "default" ); | 164 | return cfg.readEntry( "Skin", "default" ); |
160 | } | 165 | } |
161 | 166 | ||
162 | QImage Skin::loadImage( const QString &fileName ) | 167 | QImage Skin::loadImage( const QString &fileName ) |
163 | { | 168 | { |
164 | return QImage( Resource::findPixmap( fileName ) ); | 169 | return QImage( OResource::findPixmap( fileName ) ); |
165 | } | 170 | } |
166 | 171 | ||
167 | SkinCache::SkinCache() | 172 | SkinCache::SkinCache() |
168 | { | 173 | { |
169 | // let's say we cache two skins (audio+video) at maximum | 174 | // let's say we cache two skins (audio+video) at maximum |
170 | m_cache.setMaxCost( 2 ); | 175 | m_cache.setMaxCost( 2 ); |
171 | // ... and one background pixmap | 176 | // ... and one background pixmap |
172 | m_backgroundPixmapCache.setMaxCost( 1 ); | 177 | m_backgroundPixmapCache.setMaxCost( 1 ); |
173 | } | 178 | } |
174 | 179 | ||
175 | SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix ) | 180 | SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix ) |
176 | { | 181 | { |
177 | QString key = skinPath + fileNameInfix; | 182 | QString key = skinPath + fileNameInfix; |
178 | 183 | ||
179 | SkinData *data = m_cache.take( key ); | 184 | SkinData *data = m_cache.take( key ); |
180 | if ( !data ) | 185 | if ( !data ) |