1 files changed, 15 insertions, 17 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 4013981..eb1ec6e 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1,672 +1,670 @@
 /*-
  * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
  */
 
 
 
 #ifndef INCLUDE_MENUITEM_DEF
 #define INCLUDE_MENUITEM_DEF
 #endif
 
 #include <qmenudata.h>
 #include "liquid.h"
 //#include "liquiddeco.h"
 #include <qapplication.h>
 #include <qpe/config.h>
 #include "effects.h"
 #include <qpalette.h>
 #include <qbitmap.h>
 #include <qtabbar.h>
 #include <qpopupmenu.h>
 #include <qobjectlist.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpixmapcache.h>
 #include <qradiobutton.h>
 #include <qcombobox.h>
 #include <qdrawutil.h>
 #include <qwidgetlist.h>
 #include <qtoolbutton.h>
 #include <qheader.h>
 #include <unistd.h>
 #include <qmenubar.h>
 #include <qprogressbar.h>
 
 #include <stdio.h>
 
 #include "htmlmasks.h"
 #include "embeddata.h"
 
 typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
                           QColorGroup &, bool, bool);
 
 QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
 
 void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
 {
     QImage img(pix.convertToImage());
     QImageEffect::fade(img, 0.9, color);
     int x, y;
     int r, g, b;
     for(y=0; y < img.height(); y+=3){
         unsigned int *data = (unsigned int  *) img.scanLine(y);
         for(x=0; x < img.width(); ++x){
             r = qRed(data[x]);
             g = qGreen(data[x]);
             b = qBlue(data[x]);
             if(r-10)
                 r-=10;
             if(g-10)
                 g-=10;
             if(b-10)
                 b-=10;
             data[x] = qRgb(r, g, b);
         }
     }
     pix.convertFromImage(img);
 }
 
 TransMenuHandler::TransMenuHandler(QObject *parent)
     : QObject(parent)
 {
     pixDict.setAutoDelete(true);
     reloadSettings();
 }
 
 void TransMenuHandler::reloadSettings()
 {
     pixDict.clear();
 
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
     type = config. readNumEntry("Type", TransStippleBg);
     color = QColor ( config. readEntry("Color",  QApplication::palette().active().button().name()));
     fgColor = QColor ( config. readEntry("TextColor", QApplication::palette().active().text().name()));
     opacity = config. readNumEntry("Opacity", 10);
     if ( opacity < -20 )
             opacity = 20;
     else if ( opacity > 20 )
             opacity = 20;
     
     shadowText = config. readBoolEntry("ShadowText", true);
 }
 
 bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 {
     QWidget *p = (QWidget *)obj;
 
     if(ev->type() == QEvent::Show){
         if(type == TransStippleBg || type == TransStippleBtn ||
            type == Custom){
             QApplication::syncX();
             QPixmap *pix = new QPixmap;
             if(p->testWFlags(Qt::WType_Popup)){
                 QRect r(p->x(), p->y(), p->width(), p->height());
                 QRect deskR = QApplication::desktop()->rect();
                 if(r.right() > deskR.right() || r.bottom() > deskR.bottom()){
                     r.setBottom(deskR.bottom());
                     r.setRight(deskR.right());
                 }
                 *pix = QPixmap::grabWindow(QApplication::desktop()-> winId(), r.x(), r.y(),
                                            r.width(), r.height());
             }
             else{ // tear off menu
                 pix->resize(p->width(), p->height());
                 pix->fill(Qt::black.rgb());
             }
             if(type == TransStippleBg){
                 stripePixmap(*pix, p->colorGroup().background());
             }
             else if(type == TransStippleBtn){
                 stripePixmap(*pix, p->colorGroup().button());
             }
             else{
                 QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
             }
 
             pixDict.insert(p->winId(), pix);
             
-            if (!p->inherits("QPopupMenu")) {
+            if ( !p->inherits("QPopupMenu")) 
                     p->setBackgroundPixmap(*pix);
                     
-                    QObjectList *ol = p-> queryList("QWidget");
-                                for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
-                                        QWidget *wid = (QWidget *) it.current ( );
+            QObjectList *ol = p-> queryList("QWidget");
+                        for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
+                                QWidget *wid = (QWidget *) it.current ( );
                                         
-                                        wid-> setBackgroundPixmap(*pix);
-                                        wid-> setBackgroundOrigin(QWidget::ParentOrigin);                               
-                }
-                                delete ol;
-                        }
+                                wid-> setBackgroundPixmap(*pix);
+                                        wid-> setBackgroundOrigin(QWidget::ParentOrigin);                               
+            }
+                        delete ol;
         }
     }
     else if(ev->type() == QEvent::Hide){
         if(type == TransStippleBg || type == TransStippleBtn ||
            type == Custom){
 //            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
 
             pixDict.remove(p->winId());
-            if (!p->inherits("QPopupMenu")) {
+            if ( !p->inherits("QPopupMenu")) 
                 p->setBackgroundMode(QWidget::PaletteBackground);
 
-                    QObjectList *ol = p-> queryList("QWidget");
-                                for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
-                                        QWidget *wid = (QWidget *) it.current ( );
-                                        
-                                        wid-> setBackgroundMode( QWidget::PaletteBackground );
-                }
-                                delete ol;
+                  QObjectList *ol = p-> queryList("QWidget");
+                        for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
+                                QWidget *wid = (QWidget *) it.current ( );
+                                
+                                wid-> setBackgroundMode( QWidget::PaletteBackground );
             }
+                        delete ol;
         }
     }
     return(false);
 }
 
 
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
         flatTBButtons = false;
 
     btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
     btnMaskBmp.setMask(btnMaskBmp);
     htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
     htmlBtnMaskBmp.setMask(htmlBtnMaskBmp);
     headerHoverID = -1;
     highlightWidget = NULL;
     setButtonDefaultIndicatorWidth(0);
     btnDict.setAutoDelete(true);
     bevelFillDict.setAutoDelete(true);
     smallBevelFillDict.setAutoDelete(true);
     customBtnColorList.setAutoDelete(true);
     customBtnIconList.setAutoDelete(true);
     customBtnLabelList.setAutoDelete(true);
 
     rMatrix.rotate(270.0);
     highcolor = QPixmap::defaultDepth() > 8;
     btnBorderPix = new QPixmap;
     btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
     btnBlendPix = new QPixmap;
     btnBlendPix->convertFromImage(qembed_findImage("buttonborder"));
     bevelFillPix = new QPixmap;
     bevelFillPix->convertFromImage(qembed_findImage("clear_fill_large"));
     smallBevelFillPix = new QPixmap;
     smallBevelFillPix->convertFromImage(qembed_findImage("clear_fill_small"));
     // new stuff
     vsbSliderFillPix = menuPix = NULL;
     menuHandler = new TransMenuHandler(this);
     setScrollBarExtent(15, 15);
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         pixmaps[i] = NULL;
     }
     oldSliderThickness = sliderThickness();
     setSliderThickness(11);
 }
 
 LiquidStyle::~LiquidStyle()
 {
     if(btnBorderPix)
         delete btnBorderPix;
     if(btnBlendPix)
         delete btnBlendPix;
     if(bevelFillPix)
         delete bevelFillPix;
     if(smallBevelFillPix)
         delete smallBevelFillPix;
     if(vsbSliderFillPix)
         delete vsbSliderFillPix;
     if(menuPix)
         delete menuPix;
 
     setScrollBarExtent(16, 16);
     setSliderThickness(oldSliderThickness);
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         if(pixmaps[i])
             delete pixmaps[i];
     }
 }
 
 void LiquidStyle::drawClearBevel(QPainter *p, int x, int y, int w, int h,
                                 const QColor &c, const QColor &bg)
 {
 
     QPen oldPen = p->pen(); // headers need this
     int x2 = x+w-1;
     int y2 = y+h-1;
     // outer dark rect
     p->setPen(c.dark(130));
     p->drawLine(x, y+2, x, y2-2); // l
     p->drawLine(x2, y+2, x2, y2-2); // r
     p->drawLine(x+2, y, x2-2, y); // t
     p->drawLine(x+2, y2, x2-2, y2); // b
     p->drawPoint(x+1, y+1); // tl
     p->drawPoint(x2-1, y+1); // tr
     p->drawPoint(x+1, y2-1); // bl
     p->drawPoint(x2-1, y2-1); // br
 
     // inner top light lines
     p->setPen(c.light(105));
     p->drawLine(x+2, y+1, x2-2, y+1);
     p->drawLine(x+1, y+2, x2-1, y+2);
     p->drawLine(x+1, y+3, x+2, y+3);
     p->drawLine(x2-2, y+3, x2-1, y+3);
     p->drawPoint(x+1, y+4);
     p->drawPoint(x2-1, y+4);
 
     // inner bottom light lines
     p->setPen(c.light(110));
     p->drawLine(x+2, y2-1, x2-2, y2-1);
     p->drawLine(x+1, y2-2, x2-1, y2-2);
     p->drawLine(x+1, y2-3, x+2, y2-3);
     p->drawLine(x2-2, y2-3, x2-1, y2-3);
     p->drawPoint(x+1, y2-4);
     p->drawPoint(x2-1, y2-4);
 
     // inner left mid lines
     //p->setPen(c.light(105));
     p->setPen(c);
     p->drawLine(x+1, y+5, x+1, y2-5);
     p->drawLine(x+2, y+4, x+2, y2-4);
 
     // inner right mid lines
     p->drawLine(x2-1, y+5, x2-1, y2-5);
     p->drawLine(x2-2, y+4, x2-2, y2-4);
 
     // fill
     QPixmap *pix;
     if(h >= 32){
         pix = bevelFillDict.find(c.rgb());
         if(!pix){
             int h, s, v;
             c.hsv(&h, &s, &v);
             pix = new QPixmap(*bevelFillPix);
             adjustHSV(*pix, h, s, v);
             bevelFillDict.insert(c.rgb(), pix);
         }
     }
     else{
         pix = smallBevelFillDict.find(c.rgb());
         if(!pix){
             int h, s, v;
             c.hsv(&h, &s, &v);
             pix = new QPixmap(*smallBevelFillPix);
             adjustHSV(*pix, h, s, v);
             smallBevelFillDict.insert(c.rgb(), pix);
         }
     }
     p->drawTiledPixmap(x+3, y+3, w-6, h-6, *pix);
     // blend
     int red, green, blue;
     QColor btnColor(c.dark(130));
     red = (btnColor.red() >> 1) + (bg.red() >> 1);
     green = (btnColor.green() >> 1) + (bg.green() >> 1);
     blue = (btnColor.blue() >> 1) + (bg.blue() >> 1);
     btnColor.setRgb(red, green, blue);
 
     p->setPen(btnColor);
     p->drawPoint(x+1, y);
     p->drawPoint(x, y+1);
     p->drawPoint(x+1, y2);
     p->drawPoint(x, y2-1);
 
     p->drawPoint(x2-1, y);
     p->drawPoint(x2, y+1);
     p->drawPoint(x2-1, y2);
     p->drawPoint(x2, y2-1);
 
     p->setPen(oldPen);
 
 }
 
 void LiquidStyle::drawRoundButton(QPainter *painter, const QColor &c,
                                   const QColor &back, int x, int y, int w, int h,
                                   bool supportPushDown, bool pushedDown,
                                   bool autoDefault, bool isMasked)
 {
     if(w < 21 || h < 21){
         drawClearBevel(painter, x, y, w, h, c, back);
         return;
     }
     if(supportPushDown){
         --w, --h;
     }
     /* We don't make the round buttons smaller, since they don't look as good
     if(autoDefault){
         w = w-buttonDefaultIndicatorWidth()*2;
         h = h-buttonDefaultIndicatorWidth()*2;
     }*/
 
 
     QPixmap *pix = btnDict.find(c.rgb());
     if(!pix){
         int h, s, v;
         c.hsv(&h, &s, &v);
         pix = new QPixmap(*btnBorderPix);
         adjustHSV(*pix, h, s, v);
         btnDict.insert(c.rgb(), pix);
     }
     int x2 = x+w-1;
     int y2 = y+h-1;
     int bx2 = pix->width()-1;
     int by2 = pix->height()-1;
 
     QPixmap tmpPix(w, h);
     QPixmap tilePix;
     QPainter p;
     p.begin(&tmpPix);
 
     // do the fill
     p.drawPixmap(0, 0, *pix, 0, 0, 10, 10); // tl
     p.drawPixmap(x2-9, 0, *pix, bx2-9, 0, 10, 10); // tr
     p.drawPixmap(0, y2-9, *pix, 0, by2-9, 10, 10); // bl
     p.drawPixmap(x2-9, y2-9, *pix, bx2-9, by2-9, 10, 10); // br
 
     // edges
     tilePix.resize(pix->width()-20, 10);
     // top
     bitBlt(&tilePix, 0, 0, pix, 10, 0, pix->width()-20, 10);
     p.drawTiledPixmap(10, 0, w-20, 10, tilePix);
     // bottom
     bitBlt(&tilePix, 0, 0, pix, 10, by2-9, pix->width()-20, 20);
     p.drawTiledPixmap(10, y2-9, w-20, 10, tilePix);
     // left
     tilePix.resize(10, pix->height()-20);
     bitBlt(&tilePix, 0, 0, pix, 0, 10, 10, pix->height()-20);
     p.drawTiledPixmap(0, 10, 10, h-20, tilePix);
     // right
     bitBlt(&tilePix, 0, 0, pix, bx2-9, 10, 10, pix->height()-20);
     p.drawTiledPixmap(x2-9, 10, 10, h-20, tilePix);
 
     // middle
     tilePix.resize(pix->width()-20, pix->height()-20);
     bitBlt(&tilePix, 0, 0, pix, 10, 10, pix->width()-20, pix->height()-20);
     p.drawTiledPixmap(10, 10, w-20, h-20, tilePix);
 
 
     // do the blend
     QBitmap blendMask;
     if(!isMasked){
         //QRgb bgRgb = back.rgb();
         //QRgb fgRgb = c.rgb();
         //int r, g, b;
 
         //r = (int)(qRed(bgRgb)*0.75 + qRed(fgRgb)*0.25);
         //g = (int)(qGreen(bgRgb)*0.75 + qGreen(fgRgb)*0.25);
         //b = (int)(qBlue(bgRgb)*0.75 + qBlue(fgRgb)*0.25);
         //QColor blendColor(r, g, b);
         int hue, sat, v1, v2;
         QColor blendColor(autoDefault ? c : back);
         back.hsv(&hue, &sat, &v1);
         blendColor.hsv(&hue, &sat, &v2);
         if(v2 > v1)
             blendColor.setHsv(hue, sat, (int)(v1*0.75 + v2*0.25));
 
         pix = btnBorderDict.find(blendColor.rgb());
         if(!pix){
             int h, s, v;
             blendColor.hsv(&h, &s, &v);
             pix = new QPixmap(*btnBlendPix);
             adjustHSV(*pix, h, s, v);
             btnBorderDict.insert(blendColor.rgb(), pix);
         }
     }
     else{
         pix = pushedDown ? getPixmap(HTMLBtnBorderDown) :
             getPixmap(HTMLBtnBorder);
     }
     p.drawPixmap(0, 0, *pix, 0, 0, 10, 10); // tl
     p.drawPixmap(x2-9, 0, *pix, bx2-9, 0, 10, 10); // tr
     p.drawPixmap(0, y2-9, *pix, 0, by2-9, 10, 10); // bl
     p.drawPixmap(x2-9, y2-9, *pix, bx2-9, by2-9, 10, 10); // br
 
     // edges
     tilePix.resize(pix->width()-20, 10);
     blendMask.resize(pix->width()-20, 10);
     // top
     bitBlt(&tilePix, 0, 0, pix, 10, 0, pix->width()-20, 10);
     bitBlt(&blendMask, 0, 0, pix->mask(), 10, 0, pix->width()-20, 10);
     tilePix.setMask(blendMask);
     p.drawTiledPixmap(10, 0, w-20, 10, tilePix);
     // bottom
     bitBlt(&tilePix, 0, 0, pix, 10, by2-9, pix->width()-20, 20);
     bitBlt(&blendMask, 0, 0, pix->mask(), 10, by2-9, pix->width()-20, 20);
     tilePix.setMask(blendMask);
     p.drawTiledPixmap(10, y2-9, w-20, 10, tilePix);
     // left
     tilePix.resize(10, pix->height()-20);
     blendMask.resize(10, pix->height()-20);
     bitBlt(&tilePix, 0, 0, pix, 0, 10, 10, pix->height()-20);
     bitBlt(&blendMask, 0, 0, pix->mask(), 0, 10, 10, pix->height()-20);
     tilePix.setMask(blendMask);
     p.drawTiledPixmap(0, 10, 10, h-20, tilePix);
     // right
     bitBlt(&tilePix, 0, 0, pix, bx2-9, 10, 10, pix->height()-20);
     bitBlt(&blendMask, 0, 0, pix->mask(), bx2-9, 10, 10, pix->height()-20);
     tilePix.setMask(blendMask);
     p.drawTiledPixmap(x2-9, 10, 10, h-20, tilePix);
 
     p.end();
 
     // do the button mask - we don't automask buttons
     QBitmap btnMask(w, h);
     QBitmap *mask = isMasked ? &htmlBtnMaskBmp : &btnMaskBmp;
     p.begin(&btnMask);
     p.fillRect(0, 0, w, h, Qt::color0);
     p.drawPixmap(0, 0, *mask, 0, 0, 10, 10); // tl
     p.drawPixmap(x2-9, 0, *mask, bx2-9, 0, 10, 10); // tr
     p.drawPixmap(0, y2-9, *mask, 0, by2-9, 10, 10); // bl
     p.drawPixmap(x2-9, y2-9, *mask, bx2-9, by2-9, 10, 10); // br
     // fills
     p.fillRect(10, 0, w-20, 10, Qt::color1); // top
     p.fillRect(10, y2-9, w-20, 10, Qt::color1); // bottom
     p.fillRect(0, 10, w, h-20, Qt::color1); // middle
     p.end();
     tmpPix.setMask(btnMask);
     /*if(autoDefault){
         if(supportPushDown && pushedDown){
             painter->drawPixmap(x+3, y+3, tmpPix);
         }
         else{
             painter->drawPixmap(x+2, y+2, tmpPix);
         }
     }
     else */if(supportPushDown && pushedDown)
         painter->drawPixmap(x+1, y+1, tmpPix);
     else
         painter->drawPixmap(x, y, tmpPix);
 
 
 
 }
 
 
 QPixmap* LiquidStyle::processEmbedded(const char *label, int h, int s, int v,
                                       bool blend)
 {
     QImage img(qembed_findImage(label));
     img.detach();
     if(img.isNull()){ // shouldn't happen, been tested
         qWarning("Invalid embedded label %s", label);
         return(NULL);
     }
     if(img.depth() != 32)
         img = img.convertDepth(32);
     unsigned int *data = (unsigned int *)img.bits();
     int total = img.width()*img.height();
     int current;
     QColor c;
     int oldH, oldS, oldV;
     int alpha;
     if(v < 235)
         v += 20;
     else
         v = 255;
     float intensity = v/255.0;
 
     for(current=0; current<total; ++current){
         alpha = qAlpha(data[current]);
         c.setRgb(data[current]);
         c.hsv(&oldH, &oldS, &oldV);
         oldV = (int)(oldV*intensity);
         c.setHsv(h, s, oldV);
         if(blend && alpha != 255 && alpha != 0){
             float srcPercent = ((float)alpha)/255.0;
             float destPercent = 1.0-srcPercent;
             oldH = (int)((srcPercent*h) + (destPercent*bH));
             oldS = (int)((srcPercent*s) + (destPercent*bS));
             oldV = (int)((srcPercent*oldV) + (destPercent*bV));
             c.setHsv(oldH, oldS, oldV);
             alpha = 255;
         }
         data[current] = qRgba(c.red(), c.green(), c.blue(), alpha);
     }
     QPixmap *pix = new QPixmap;
     pix->convertFromImage(img);
     return(pix);
 }
 
 
 
 
 QPixmap* LiquidStyle::getPixmap(BitmapData item)
 {
 
     if(pixmaps[item])
         return(pixmaps[item]);
 
     switch(item){
     case HTMLBtnBorder:
         pixmaps[HTMLBtnBorder] = processEmbedded("htmlbtnborder", btnH, btnS, btnV);
         break;
     case HTMLBtnBorderDown:
         pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV);
         break;
     case HTMLCB:
         pixmaps[HTMLCB] = processEmbedded("htmlcheckbox", bH, bS, bV);
         break;
     case HTMLCBDown:
         pixmaps[HTMLCBDown] = processEmbedded("htmlcheckboxdown", btnH, btnS, btnV);
         break;
     case HTMLCBHover:
         pixmaps[HTMLCBHover] = processEmbedded("htmlcheckbox", btnH, btnS, btnV);
         break;
     case HTMLCBDownHover:
         pixmaps[HTMLCBDownHover] = processEmbedded("htmlcheckboxdown",
                                                    btnHoverH, btnHoverS,
                                                    btnHoverV);
         break;
     case HTMLRadio:
         pixmaps[HTMLRadio] = processEmbedded("htmlradio", bH, bS, bV);
     case HTMLRadioDown:
         pixmaps[HTMLRadioDown] = processEmbedded("htmlradiodown", btnH, btnS, btnV);
     case HTMLRadioHover:
         pixmaps[HTMLRadioHover] = processEmbedded("htmlradio", btnH, btnS, btnV);
     case HTMLRadioDownHover:
         pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", 
                                                       btnHoverH, btnHoverS,
                                                       btnHoverV);
     case RadioOn:
         pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV, true);
         break;
     case RadioOnHover:
         pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS,
                                                 btnHoverV, true);
         break;
     case RadioOffHover:
         pixmaps[RadioOffHover] = processEmbedded("radio", btnH, btnS, btnV, true);
         break;
     case TabDown:
         pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV, true);
         break;
     case TabFocus:
         pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS,
                                             btnHoverS, true);
         break;
     case CBDown:
         pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV, true);
         break;
     case CBDownHover:
         pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH,
                                                btnHoverS, btnHoverV, true);
         break;
     case CBHover:
         pixmaps[CBHover] = processEmbedded("checkbox", btnH, btnS, btnV, true);
         break;
     case HSlider:
         pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
         break;
     case VSlider:
         pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
         *pixmaps[VSlider] = pixmaps[VSlider]->xForm(rMatrix);
         break;
     case RadioOff:
         pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV, true);
         break;
     case Tab:
         pixmaps[Tab] = processEmbedded("tab", bH, bS, bV, true);
         break;
     case CB:
         pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV, true);
         break;
     case VSBSliderTop:
         pixmaps[VSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
         break;
     case VSBSliderBtm:
         pixmaps[VSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
         break;
     case VSBSliderMid:
         pixmaps[VSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
         break;
     case VSBSliderTopHover:
         pixmaps[VSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
         break;
     case VSBSliderBtmHover:
         pixmaps[VSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
         break;
     case VSBSliderMidHover:
         pixmaps[VSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
         break;
 
     case HSBSliderTop:
         pixmaps[HSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
         *pixmaps[HSBSliderTop] = pixmaps[HSBSliderTop]->xForm(rMatrix);
         break;
     case HSBSliderBtm:
         pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
         *pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix);
         break;
     case HSBSliderMid:
         pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
         *pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix);
         break;
     case HSBSliderTopHover:
         pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
         *pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix);
         break;
     case HSBSliderBtmHover:
         pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
         *pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix);
         break;
     case HSBSliderMidHover:
         pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
         *pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix);
         break;
     case VSBSliderTopBg:
         pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
         break;
     case VSBSliderBtmBg:
         pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
         break;
     case VSBSliderMidBg:
         pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
         break;
     case HSBSliderTopBg:
         pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
         *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
         break;
     case HSBSliderBtmBg: