author | sandman <sandman> | 2002-12-22 17:19:22 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-22 17:19:22 (UTC) |
commit | d7859bf6df42c36f87ecaa560754b3b3b3c2e78e (patch) (unidiff) | |
tree | 2419e9402ec70fb1e98a908b165c98b67b5b9e9a /noncore/styles/theme | |
parent | 275ce580b85be3b439bbb907efce5036c3282c56 (diff) | |
download | opie-d7859bf6df42c36f87ecaa560754b3b3b3c2e78e.zip opie-d7859bf6df42c36f87ecaa560754b3b3b3c2e78e.tar.gz opie-d7859bf6df42c36f87ecaa560754b3b3b3c2e78e.tar.bz2 |
use the new Config::hasGroup method instead of a custom Config class
-rw-r--r-- | noncore/styles/theme/othemebase.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp index acac847..62b3a11 100644 --- a/noncore/styles/theme/othemebase.cpp +++ b/noncore/styles/theme/othemebase.cpp | |||
@@ -72,36 +72,24 @@ unsigned int height : | |||
72 | 12; | 72 | 12; |
73 | unsigned int border : | 73 | unsigned int border : |
74 | 1; | 74 | 1; |
75 | unsigned int mask : | 75 | unsigned int mask : |
76 | 1; | 76 | 1; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | union kthemeKey{ | 79 | union kthemeKey{ |
80 | kthemeKeyData data; | 80 | kthemeKeyData data; |
81 | unsigned int cacheKey; | 81 | unsigned int cacheKey; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | class MyConfig : public Config | ||
85 | { | ||
86 | public: | ||
87 | MyConfig ( const QString &f, Domain d ) : Config ( f, d ) | ||
88 | { } | ||
89 | |||
90 | bool hasGroup ( const QString &gname ) const | ||
91 | { | ||
92 | QMap< QString, ConfigGroup>::ConstIterator it = groups. find ( gname ); | ||
93 | return ( it != groups.end() ); | ||
94 | } | ||
95 | }; | ||
96 | 84 | ||
97 | void OThemeBase::generateBorderPix( int i ) | 85 | void OThemeBase::generateBorderPix( int i ) |
98 | { | 86 | { |
99 | // separate pixmap into separate components | 87 | // separate pixmap into separate components |
100 | if ( pbPixmaps[ i ] ) { | 88 | if ( pbPixmaps[ i ] ) { |
101 | // evidently I have to do masks manually... | 89 | // evidently I have to do masks manually... |
102 | const QBitmap * srcMask = pbPixmaps[ i ] ->mask(); | 90 | const QBitmap * srcMask = pbPixmaps[ i ] ->mask(); |
103 | QBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); | 91 | QBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); |
104 | QPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); | 92 | QPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); |
105 | 93 | ||
106 | bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ], | 94 | bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ], |
107 | Qt::CopyROP, false ); | 95 | Qt::CopyROP, false ); |
@@ -263,25 +251,25 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) | |||
263 | QString tmpStr; | 251 | QString tmpStr; |
264 | QString copyfrom[ WIDGETS ]; | 252 | QString copyfrom[ WIDGETS ]; |
265 | QString pixnames[ WIDGETS ]; // used for duplicate check | 253 | QString pixnames[ WIDGETS ]; // used for duplicate check |
266 | QString brdnames[ WIDGETS ]; | 254 | QString brdnames[ WIDGETS ]; |
267 | bool loaded[ WIDGETS ]; // used for preloading for CopyWidget | 255 | bool loaded[ WIDGETS ]; // used for preloading for CopyWidget |
268 | 256 | ||
269 | if ( configFileName.isEmpty() ) { | 257 | if ( configFileName.isEmpty() ) { |
270 | Config cfg ( "qpe" ); | 258 | Config cfg ( "qpe" ); |
271 | cfg. setGroup ( "Appearance" ); | 259 | cfg. setGroup ( "Appearance" ); |
272 | 260 | ||
273 | configFileName = cfg. readEntry ( "Theme", "default" ); | 261 | configFileName = cfg. readEntry ( "Theme", "default" ); |
274 | } | 262 | } |
275 | MyConfig config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); | 263 | Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); |
276 | 264 | ||
277 | //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii()); | 265 | //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii()); |
278 | 266 | ||
279 | // Are we initalized? | 267 | // Are we initalized? |
280 | applyMiscResourceGroup( &config ); | 268 | applyMiscResourceGroup( &config ); |
281 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { | 269 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { |
282 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 270 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
283 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | 271 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); |
284 | } | 272 | } |
285 | for ( ; i < INHERIT_ITEMS*2; ++i ) { | 273 | for ( ; i < INHERIT_ITEMS*2; ++i ) { |
286 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { | 274 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { |
287 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 275 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |