1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index 58005b5..acac847 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -88,403 +88,403 @@ public:
         { }
 
         bool hasGroup ( const QString &gname ) const
         {
                 QMap< QString, ConfigGroup>::ConstIterator it = groups. find ( gname );
                 return ( it != groups.end() );
         }
 };
 
 void OThemeBase::generateBorderPix( int i )
 {
         // separate pixmap into separate components
         if ( pbPixmaps[ i ] ) {
                 // evidently I have to do masks manually...
                 const QBitmap * srcMask = pbPixmaps[ i ] ->mask();
                 QBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
                 QPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ],
                         Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, 0, 0, pbWidth[ i ], pbWidth[ i ],
                                 Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::TopLeft, tmp );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0,
                         pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ],
                                 0, pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::TopRight, tmp );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
                         pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
                                 pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::BottomLeft, tmp );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
                         pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
                         Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ],
                                 pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
                                 Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::BottomRight, tmp );
 
                 tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
                 destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0,
                         pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, pbWidth[ i ], 0,
                                 pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ],
                                 Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::Top, tmp );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ],
                         pbPixmaps[ i ] ->height() - pbWidth[ i ],
                         pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, pbWidth[ i ],
                                 pbPixmaps[ i ] ->height() - pbWidth[ i ],
                                 pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::Bottom, tmp );
 
                 tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
                 destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ],
                         pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, 0, pbWidth[ i ], pbWidth[ i ],
                                 pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
 
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::Left, tmp );
 
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
                         pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
                         Qt::CopyROP, false );
                 if ( srcMask ) {
                         bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ],
                                 pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
                                 Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::Right, tmp );
         }
         else
                 qDebug ( "OThemeBase: Tried making border from empty pixmap" );
 }
 
 
 void OThemeBase::copyWidgetConfig( int sourceID, int destID, QString *pixnames,
                                    QString *brdnames )
 {
         scaleHints[ destID ] = scaleHints[ sourceID ];
         gradients[ destID ] = gradients[ sourceID ];
         blends[ destID ] = blends[ sourceID ];
         bContrasts[ destID ] = bContrasts[ sourceID ];
         borders[ destID ] = borders[ sourceID ];
         highlights[ destID ] = highlights[ sourceID ];
 
         if ( grLowColors[ sourceID ] )
                 grLowColors[ destID ] = new QColor( *grLowColors[ sourceID ] );
         else
                 grLowColors[ destID ] = NULL;
 
         if ( grHighColors[ sourceID ] )
                 grHighColors[ destID ] = new QColor( *grHighColors[ sourceID ] );
         else
                 grHighColors[ destID ] = NULL;
 
         if ( colors[ sourceID ] )
                 colors[ destID ] = new QColorGroup( *colors[ sourceID ] );
         else
                 colors[ destID ] = NULL;
 
         // pixmap
         pixnames[ destID ] = pixnames[ sourceID ];
         duplicate[ destID ] = false;
         pixmaps[ destID ] = NULL;
         images[ destID ] = NULL;
         if ( !pixnames[ destID ].isEmpty() ) {
                 if ( scaleHints[ sourceID ] == TileScale && blends[ sourceID ] == 0.0 ) {
                         pixmaps[ destID ] = pixmaps[ sourceID ];
                         duplicate[ destID ] = true;
                 }
                 if ( !duplicate[ destID ] ) {
                         pixmaps[ destID ] = loadPixmap( pixnames[ destID ] );
                         if ( scaleHints[ destID ] == TileScale && blends[ destID ] == 0.0 )
                                 images[ destID ] = NULL;
                         else
                                 images[ destID ] = loadImage( pixnames[ destID ] );
                 }
         }
 
         // border pixmap
         pbDuplicate[ destID ] = false;
         pbPixmaps[ destID ] = NULL;
         pbWidth[ destID ] = pbWidth[ sourceID ];
         brdnames[ destID ] = brdnames[ sourceID ];
         if ( !brdnames[ destID ].isEmpty() ) {
                 pbPixmaps[ destID ] = pbPixmaps[ sourceID ];
                 pbDuplicate[ destID ] = true;
         }
 
         if ( sourceID == ActiveTab && destID == InactiveTab )
                 aTabLine = iTabLine;
         else if ( sourceID == InactiveTab && destID == ActiveTab )
                 iTabLine = aTabLine;
 }
 
 void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
 {
 #define PREBLEND_ITEMS 12
         static WidgetType preBlend[] = {Slider, IndicatorOn, IndicatorOff,
                                         ExIndicatorOn, ExIndicatorOff, HScrollDeco, VScrollDeco, HScrollDecoDown,
                                         VScrollDecoDown, ComboDeco, ComboDecoDown, CheckMark};
 
         int i;
         QString tmpStr;
         QString copyfrom[ WIDGETS ];
         QString pixnames[ WIDGETS ]; // used for duplicate check
         QString brdnames[ WIDGETS ];
         bool loaded[ WIDGETS ]; // used for preloading for CopyWidget
 
         if ( configFileName.isEmpty() ) {
                 Config cfg ( "qpe" );
                 cfg. setGroup ( "Appearance" );
         
                 configFileName = cfg. readEntry ( "Theme", "default" );
         }
         MyConfig config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File );
 
         //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii());
 
         // Are we initalized?
+        applyMiscResourceGroup( &config );
         for ( i = 0; i < INHERIT_ITEMS; ++i ) {
                         applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );         
         //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
         }
         for ( ; i < INHERIT_ITEMS*2; ++i ) {
                 if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) {
                         applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
         //              printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
                 }
                 else {
                         copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ];
         //              printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1());
                 }
         }
         for ( ; i < WIDGETS; ++i ) {
                 applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
         //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
         }
-        applyMiscResourceGroup( &config );
 
         // initalize defaults that may not be read
         for ( i = 0; i < WIDGETS; ++i )
                 loaded[ i ] = false;
         btnXShift = btnYShift = focus3DOffset = 0;
         aTabLine = iTabLine = true;
         roundedButton = roundedCombo = roundedSlider = focus3D = false;
         splitterWidth = 10;
 
         for ( i = 0; i < WIDGETS; ++i ) {
                 readResourceGroup( i, copyfrom, pixnames, brdnames, loaded );
         //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s, colors=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1(), (colors[i]?colors[i]->background().name().latin1():"<none)" ));
         }
 
         // misc items
         readMiscResourceGroup();
 
         // Handle preblend items
         for ( i = 0; i < PREBLEND_ITEMS; ++i ) {
                 if ( pixmaps[ preBlend[ i ] ] != NULL && blends[ preBlend[ i ] ] != 0.0 )
                         blend( preBlend[ i ] );
         }
 }
 
 OThemeBase::OThemeBase( const QString & configFile )
                 : QWindowsStyle()
 {
         configFilePath = QPEApplication::qpeDir ( ) + "/plugins/styles/";
         configFileName = configFile;
 
         readConfig( Qt::WindowsStyle );
         cache = new OThemeCache( cacheSize );
 }
 
 void OThemeBase::applyConfigFile( const QString &/*file*/ )
 {
 #if 0
         // handle std color scheme
         Config inConfig( file, Config::File );
         Config globalConfig ( "qpe" );
         
         globalConfig. setGroup ( "Apperance" );
         inConfig. setGroup( "General" );
         
         if ( inConfig.hasKey( "foreground" ) )
                 globalConfig.writeEntry( "Text",                    inConfig.readEntry( "foreground", " " ) );
         if ( inConfig.hasKey( "background" ) )
                 globalConfig.writeEntry( "Background",                    inConfig.readEntry( "background", " " ) );
         if ( inConfig.hasKey( "selectForeground" ) )
                 globalConfig.writeEntry( "HighlightedText",              inConfig.readEntry( "selectForeground", " " ) );
         if ( inConfig.hasKey( "selectBackground" ) )
                 globalConfig.writeEntry( "Highlight",                     inConfig.readEntry( "selectBackground", " " ) );
         if ( inConfig.hasKey( "windowForeground" ) )
                 globalConfig.writeEntry( "Text",              inConfig.readEntry( "windowForeground", " " ) );
         if ( inConfig.hasKey( "windowBackground" ) )
                 globalConfig.writeEntry( "Base",              inConfig.readEntry( "windowBackground", " " ) );
 
         // Keep track of the current theme so that we can select the right one
         // in the KControl module.
         globalConfig.writeEntry ( "CurrentTheme", file );
 
         globalConfig.write();
 #endif
 }
 
 OThemeBase::~OThemeBase()
 {
         int i;
         for ( i = 0; i < WIDGETS; ++i ) {
                 if ( !duplicate[ i ] ) {
                         if ( images[ i ] )
                                 delete images[ i ];
                         if ( pixmaps[ i ] )
                                 delete pixmaps[ i ];
                 }
                 if ( !pbDuplicate[ i ] && pbPixmaps[ i ] )
                         delete pbPixmaps[ i ];
                 if ( colors[ i ] )
                         delete( colors[ i ] );
                 if ( grLowColors[ i ] )
                         delete( grLowColors[ i ] );
                 if ( grHighColors[ i ] )
                         delete( grHighColors[ i ] );
         }
         delete cache;
 }
 
 QImage* OThemeBase::loadImage( QString &name )
 {
         QImage * image = new QImage;
         QString path = configFilePath + "/pixmaps/" + name;
         image->load( path );
         if ( !image->isNull() )
                 return ( image );
         qDebug ( "OThemeBase: Unable to load image %s\n", name.ascii ( ) );
         delete image;
         return ( NULL );
 }
 
 OThemePixmap* OThemeBase::loadPixmap( QString &name )
 {
         OThemePixmap * pixmap = new OThemePixmap( false );
         QString path = configFilePath + "/pixmaps/" + name;
         pixmap->load( path );
         if ( !pixmap->isNull() )
                 return pixmap;
         qDebug ( "OThemeBase: Unable to load pixmap %s\n", name.ascii() );
         delete pixmap;
         return ( NULL );
 }
 
 OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 {
         if ( scaleHints[ widget ] == FullScale ) {
                 if ( !pixmaps[ widget ] || pixmaps[ widget ] ->width() != w ||
                         pixmaps[ widget ] ->height() != h ) {
                         OThemePixmap * cachePix = cache->pixmap( w, h, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 if ( pixmaps[ widget ] )
                                         cache->insert( pixmaps[ widget ], OThemeCache::FullScale,
                                                        widget );
                                 else
                                         qDebug( "We would have inserted a null pixmap!\n" );
                                 pixmaps[ widget ] = cachePix;
                         }
                         else {
                                 cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget );
                                 QImage tmpImg = images[ widget ] ->smoothScale( w, h );
                                 pixmaps[ widget ] = new OThemePixmap;
                                 pixmaps[ widget ] ->convertFromImage( tmpImg );
                                 if ( blends[ widget ] != 0.0 )
                                         blend( widget );
                         }
                 }
         }
         else if ( scaleHints[ widget ] == HorizontalScale ) {
                 if ( pixmaps[ widget ] ->width() != w ) {
                         OThemePixmap * cachePix = cache->horizontalPixmap( w, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 if ( pixmaps[ widget ] )
                                         cache->insert( pixmaps[ widget ], OThemeCache::HorizontalScale, widget );
                                 else
                                         qDebug ( "We would have inserted a null pixmap!\n" );
                                 pixmaps[ widget ] = cachePix;
                         }
                         else {
                                 cache->insert( pixmaps[ widget ], OThemeCache::HorizontalScale, widget );
                                 QImage tmpImg = images[ widget ] ->
                                                 smoothScale( w, images[ widget ] ->height() );
                                 pixmaps[ widget ] = new OThemePixmap;
                                 pixmaps[ widget ] ->convertFromImage( tmpImg );
                                 if ( blends[ widget ] != 0.0 )
                                         blend( widget );
                         }
                 }
         }
         else if ( scaleHints[ widget ] == VerticalScale ) {
                 if ( pixmaps[ widget ] ->height() != h ) {
                         OThemePixmap * cachePix = cache->verticalPixmap( w, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 if ( pixmaps[ widget ] )
                                         cache->insert( pixmaps[ widget ], OThemeCache::VerticalScale, widget );
                                 else
                                         qDebug ( "We would have inserted a null pixmap!\n" );
                                 pixmaps[ widget ] = cachePix;
                         }
                         else {
                                 cache->insert( pixmaps[ widget ], OThemeCache::VerticalScale, widget );
                                 QImage tmpImg =
                                     images[ widget ] ->smoothScale( images[ widget ] ->width(), h );
                                 pixmaps[ widget ] = new OThemePixmap;
                                 pixmaps[ widget ] ->convertFromImage( tmpImg );
                                 if ( blends[ widget ] != 0.0 )
                                         blend( widget );
                         }
                 }
         }
         // If blended tile here so the blend is scaled properly
         else if ( scaleHints[ widget ] == TileScale && blends[ widget ] != 0.0 ) {
                 if ( !pixmaps[ widget ] || pixmaps[ widget ] ->width() != w ||
                         pixmaps[ widget ] ->height() != h ) {
                         OThemePixmap * cachePix = cache->pixmap( w, h, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget );
                                 pixmaps[ widget ] = cachePix;
                         }
                         else {
                                 cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget );