summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Settings/Liquid.desktop7
-rw-r--r--noncore/styles/liquid/liquid.cpp57
-rw-r--r--noncore/styles/liquid/opie-liquid.control2
-rw-r--r--noncore/styles/liquid/settings/liquidset.cpp199
-rw-r--r--noncore/styles/liquid/settings/liquidset.h39
-rw-r--r--noncore/styles/liquid/settings/main.cpp34
-rw-r--r--noncore/styles/liquid/settings/settings.pro24
-rw-r--r--pics/liquid/Liquid.pngbin0 -> 2771 bytes
8 files changed, 357 insertions, 5 deletions
diff --git a/apps/Settings/Liquid.desktop b/apps/Settings/Liquid.desktop
new file mode 100644
index 0000000..8a1727f
--- a/dev/null
+++ b/apps/Settings/Liquid.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Exec=liquid-settings
+Icon=liquid/Liquid
+Name=Liquid-Settings
+Name[de]=Liquid-Einstellungen
+
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 5f014ad..4653639 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1,1272 +1,1321 @@
/*-
* 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 <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 <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 ( "MosfetMenus" );
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)
{
- QPopupMenu *p = (QPopupMenu *)obj;
+ 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"))
+ pixDict.insert(p->winId(), pix);
+ else {
+ p->setBackgroundPixmap(*pix);
+
+ 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;
+ }
}
}
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"))
+ pixDict.remove(p->winId());
+ else {
+ 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;
+ }
+ }
+ }
+ else if(ev->type() == QEvent::Paint){
+ if(type == TransStippleBg || type == TransStippleBtn ||
+ type == Custom){
+// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+
+ if (!p->inherits("QPopupMenu"))
+ p->erase();
}
}
return(false);
}
LiquidStyle::LiquidStyle()
:QWindowsStyle()
{
setName ( "LiquidStyle" );
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:
pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
*pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
break;
case HSBSliderMidBg:
pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
*pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix);
break;
default:
break;
}
return(pixmaps[item]);
}
void LiquidStyle::polish(QPalette &appPal)
{
int i;
for(i=0; i < BITMAP_ITEMS; ++i){
if(pixmaps[i]){
delete pixmaps[i];
pixmaps[i] = NULL;
}
}
QWidgetList *list = QApplication::allWidgets();
QWidgetListIt it( *list );
QWidget *w;
while ((w=it.current()) != 0 ){
++it;
if(w->inherits("QPushButton")){
unapplyCustomAttributes((QPushButton *)w);
}
}
loadCustomButtons();
lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
btnDict.clear();
btnBorderDict.clear();
bevelFillDict.clear();
smallBevelFillDict.clear();
Config config ( "qpe" );
QPalette pal = QApplication::palette();
// button color stuff
config. setGroup ( "Appearance" );
QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( )));
if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) {
// force button color to be different from background
QBrush btnBrush(QColor(200, 202, 228));
appPal.setBrush(QColorGroup::Button, btnBrush);
}
c.hsv(&btnH, &btnS, &btnV);
c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV);
// menu pixmap
if(!menuPix){
menuPix = new QPixmap;
menuPix->resize(64, 64);
}
QPainter painter;
menuPix->fill(c.rgb());
painter.begin(menuPix);
painter.setPen(c.dark(105));
for(i=0; i < 63; i+=4){
painter.drawLine(0, i, 63, i);
painter.drawLine(0, i+1, 63, i+1);
};
painter.end();
menuBrush.setColor(c);
menuBrush.setPixmap(*menuPix);
// pager brush
c = c.dark(120);
QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
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);
}
pagerHoverBrush.setColor(c);
pagerHoverBrush.setPixmap(*pix);
c = c.dark(120);
pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
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);
}
pagerBrush.setColor(c);
pagerBrush.setPixmap(*pix);
// background color stuff
c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));
c.hsv(&bH, &bS, &bV);
c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
// FIXME?
if(vsbSliderFillPix)
delete vsbSliderFillPix;
vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix));
adjustHSV(*vsbSliderFillPix, bH, bS, bV);
// background brush
QPixmap wallPaper(32, 32);
wallPaper.fill(c.rgb());
painter.begin(&wallPaper);
for(i=0; i < 32; i+=4){
painter.setPen(c.dark(105));
painter.drawLine(0, i, 32, i);
painter.setPen(c.dark(103));
painter.drawLine(0, i+1, 32, i+1);
};
painter.end();
bgBrush.setColor(c);
bgBrush.setPixmap(wallPaper);
appPal.setBrush(QColorGroup::Background, bgBrush);
// lineedits
c = QColor ( config. readEntry("Base", ( Qt::white). name ( )));
QPixmap basePix;
basePix.resize(32, 32);
basePix.fill(c.rgb());
painter.begin(&basePix);
painter.setPen(c.dark(105));
for(i=0; i < 32; i+=4){
painter.drawLine(0, i, 32, i);
painter.drawLine(0, i+1, 32, i+1);
};
painter.end();
baseBrush.setColor(c);
baseBrush.setPixmap(basePix);
it.toFirst();
while ((w=it.current()) != 0 ){
++it;
if(w->inherits("QLineEdit")){
QPalette pal = w->palette();
pal.setBrush(QColorGroup::Base, baseBrush);
w->setPalette(pal);
}
else if(w->inherits("QPushButton")){
applyCustomAttributes((QPushButton *)w);
}
}
}
void LiquidStyle::polish(QWidget *w)
{
if(w->inherits("QMenuBar")){
//((QFrame*)w)->setLineWidth(0);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QPopupMenu"))
w->setBackgroundMode(QWidget::NoBackground);
-
+ else if(w-> testWFlags(Qt::WType_Popup)) {
+ printf("install popup: %s\n", w-> className ( ));
+ w->installEventFilter(menuHandler);
+ }
+
if(w->isTopLevel()){
return;
}
+
w-> setBackgroundOrigin ( QWidget::ParentOrigin );
if(w->inherits("QComboBox") ||
w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
w->installEventFilter(this);
}
if(w->inherits("QLineEdit")){
QPalette pal = w->palette();
pal.setBrush(QColorGroup::Base, baseBrush);
w->setPalette(pal);
}
if(w->inherits("QPushButton")){
applyCustomAttributes((QPushButton *)w);
w->installEventFilter(this);
}
if(w->inherits("QButton") || w-> inherits("QComboBox")){
w-> setBackgroundMode ( QWidget::PaletteBackground );
}
bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
qstrcmp(w->name(), "qt_clipped_viewport") == 0;
bool isViewportChild = w->parent() &&
((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
(qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
if(isViewport && w->parent() && qstrcmp(w->parent()->name(), "proxyview") == 0){
w->setBackgroundMode(QWidget::X11ParentRelative);
return;
}
if(isViewportChild){
if(w->inherits("QButton") || w->inherits("QComboBox")){
if(w->parent()){ // heh, only way to test for KHTML children ;-)
if(w->parent()->parent()){
if(w->parent()->parent()->parent() &&
w->parent()->parent()->parent()->inherits("KHTMLView")){
w->setAutoMask(true);
w->setBackgroundMode(QWidget::NoBackground);
}
}
}
return;
}
}
if(w->inherits("QHeader")){
w->setMouseTracking(true);
w->installEventFilter(this);
}
if(w-> inherits("QToolButton")) {
((QToolButton*)w)->setAutoRaise (false);
}
if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
return;
}
if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
palette().active().brush(QColorGroup::Background).pixmap()){
qWarning("No parent pixmap for child widget %s", w->className());
return;
}
if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
!( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
if(w->backgroundMode() == QWidget::PaletteBackground ||
w->backgroundMode() == QWidget::PaletteButton){
w->setBackgroundMode(QWidget::X11ParentRelative);
}
}
if(w->inherits("QToolBar")){
w->installEventFilter(this);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
}
void LiquidStyle::unPolish(QWidget *w)
{
if(w->inherits("QMenuBar")){
((QFrame *)w)->setLineWidth(1);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QPopupMenu"))
w->setBackgroundMode(QWidget::PaletteButton);
+ else if(w-> testWFlags(Qt::WType_Popup)) {
+ w->removeEventFilter(menuHandler);
+ }
if(w->isTopLevel())
return;
// for viewport children, don't just check for NoBackground....
bool isViewportChild = w->parent() &&
((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
(qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
w->setPalette(QApplication::palette());
if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
if(w->inherits("QPushButton"))
w->setBackgroundMode(QWidget::PaletteButton);
else
w->setBackgroundMode(QWidget::PaletteBackground);
}
if(isViewportChild)
w->setAutoMask(false);
if(w->inherits("QPushButton")){
unapplyCustomAttributes((QPushButton *)w);
w->removeEventFilter(this);
}
/*
if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
w-> setBackgroundMode ( PaletteBackground );
}
*/
if(w->inherits("QComboBox") ||
w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
w->removeEventFilter(this);
}
if(w->inherits("QButton") || w->inherits("QComboBox")){
if(w->parent() && w->parent()->inherits("KHTMLPart")){
w->setAutoMask(false);
}
}
if(w->inherits("QToolBar")){
w->removeEventFilter(this);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QHeader")){
w->setMouseTracking(false);
w->removeEventFilter(this);
}
}
void LiquidStyle::polish(QApplication *app)
{
QWindowsStyle::polish(app);
menuAni = app->isEffectEnabled(UI_AnimateMenu);
menuFade = app->isEffectEnabled(UI_FadeMenu);
if(menuAni)
app->setEffectEnabled(UI_AnimateMenu, false);
if(menuFade)
app->setEffectEnabled(UI_FadeMenu, false);
qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
}
void LiquidStyle::unPolish(QApplication *app)
{
QWindowsStyle::unPolish(app);
app->setEffectEnabled(UI_AnimateMenu, menuAni);
app->setEffectEnabled(UI_FadeMenu, menuFade);
qt_set_draw_menu_bar_impl ( 0 );
}
/*
* This is a fun method ;-) Here's an overview. KToolBar grabs resize to
* force everything to erase and repaint on resize. This is going away, I'm
* trying to get shaped widgets to work right without masking. QPushButton,
* QComboBox, and Panel applet handles capture mouse enter and leaves in order
* to set the highlightwidget and repaint for mouse hovers. CheckBoxes and
* RadioButtons need to do this differently. Qt buffers these in pixmaps and
* caches them in QPixmapCache, which is bad for doing things like hover
* because the style methods aren't called in paintEvents if everything
* is cached. We use our own Paint event handler instead. Taskbuttons and
* pager buttons draw into a pixmap buffer, so we handle those with palette
* modifications. For QHeader, different header items are actually one widget
* that draws multiple items, so we need to check which ID is hightlighted
* and draw it. Finally, we also check enter and leave events for QLineEdit,
* since if it's inside a combobox we want to highlight the combobox during
* hovering in the edit.
*/
bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
{
if(obj->inherits("QToolBar")){
if(ev->type() == QEvent::Resize){
const QObjectList *tbChildList = obj->children();
QObjectListIt it(*tbChildList);
QObject *child;
while((child = it.current()) != NULL){
++it;
if(child->isWidgetType())
((QWidget *)child)->repaint(true);
}
}
}
else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
QWidget *btn = (QWidget *)obj;
if(ev->type() == QEvent::Enter){
if(btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if(btn == highlightWidget){
highlightWidget = NULL;
btn->repaint(false);
}
}
}
else if(obj->inherits("QToolButton")){
QToolButton *btn = (QToolButton *)btn;
if(!btn->autoRaise()){
if(btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
QWidget *btn = (QWidget *)obj;
if(btn == highlightWidget){
highlightWidget = NULL;
btn->repaint(false);
}
}
else
highlightWidget = NULL;
}
else if(obj->inherits("QScrollBar")){
QScrollBar *sb = (QScrollBar *)obj;
if(ev->type() == QEvent::Enter){
if(sb->isEnabled()){
highlightWidget = sb;
sb->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if(sb == highlightWidget && !sb->draggingSlider()){
highlightWidget = NULL;
sb->repaint(false);
}
}
else if(ev->type() == QEvent::MouseButtonRelease){
QMouseEvent *me = (QMouseEvent *)ev;
if(sb == highlightWidget && !sb->rect().contains(me->pos())){
highlightWidget = NULL;
sb->repaint(false);
}
}
}
else if(obj->inherits("QLineEdit")){
if(obj->parent() && obj->parent()->inherits("QComboBox")){
QWidget *btn = (QComboBox *)obj->parent();
if(ev->type() == QEvent::Enter){
if (btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if (btn == highlightWidget)
highlightWidget = NULL;
btn->repaint(false);
}
}
}
else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
QButton *btn = (QButton *)obj;
bool isRadio = obj->inherits("QRadioButton");
if(ev->type() == QEvent::Paint){
//if(btn->autoMask())
btn->erase();
QPainter p;
p.begin(btn);
QFontMetrics fm = btn->fontMetrics();
QSize lsz = fm.size(ShowPrefix, btn->text());
QSize sz = isRadio ? exclusiveIndicatorSize()
: indicatorSize();
if(btn->hasFocus()){
QRect r = QRect(0, 0, btn->width(), btn->height());
p.setPen(btn->colorGroup().button().dark(140));
p.drawLine(r.x()+1, r.y(), r.right()-1, r.y());
p.drawLine(r.x(), r.y()+1, r.x(), r.bottom()-1);
p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
}
int x = 0;
int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
if(isRadio)
drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->isOn(),
btn->isDown(), btn->isEnabled());
else
drawIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->state(), btn->isDown(),
btn->isEnabled());
x = sz.width() + 6;
y = 0;
drawItem(&p, sz.width()+6+1, 0, btn->width()-(sz.width()+6+1),
btn->height(), AlignLeft|AlignVCenter|ShowPrefix,
btn->colorGroup(), btn->isEnabled(),
btn->pixmap(), btn->text());
p.end();
return(true);
}
// for hover, just redraw the indicator (not the text)
else if((ev->type() == QEvent::Enter && btn->isEnabled()) ||
(ev->type() == QEvent::Leave && btn == highlightWidget)){
QButton *btn = (QButton *)obj;
bool isRadio = obj->inherits("QRadioButton");
if(ev->type() == QEvent::Enter)
highlightWidget = btn;
else
highlightWidget = NULL;
QFontMetrics fm = btn->fontMetrics();
QSize lsz = fm.size(ShowPrefix, btn->text());
QSize sz = isRadio ? exclusiveIndicatorSize()
: indicatorSize();
int x = 0;
int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
//if(btn->autoMask())
// btn->erase(x+1, y+1, sz.width()-2, sz.height()-2);
QPainter p;
p.begin(btn);
if(isRadio)
drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->isOn(),
btn->isDown(), btn->isEnabled());
else
drawIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->state(), btn->isDown(),
btn->isEnabled());
p.end();
}
}
else if(obj->inherits("QHeader")){
QHeader *hw = (QHeader *)obj;
if(ev->type() == QEvent::Enter){
currentHeader = hw;
headerHoverID = -1;
}
else if(ev->type() == QEvent::Leave){
currentHeader = NULL;
if(headerHoverID != -1){
hw->repaint(hw->sectionPos(headerHoverID), 0,
hw->sectionSize(headerHoverID), hw->height());
}
headerHoverID = -1;
}
else if(ev->type() == QEvent::MouseMove){
QMouseEvent *me = (QMouseEvent *)ev;
int oldHeader = headerHoverID;
headerHoverID = hw->sectionAt(me->x());
if(oldHeader != headerHoverID){
// reset old header
if(oldHeader != -1){
hw->repaint(hw->sectionPos(oldHeader), 0,
hw->sectionSize(oldHeader), hw->height());
}
if(headerHoverID != -1){
hw->repaint(hw->sectionPos(headerHoverID), 0,
hw->sectionSize(headerHoverID), hw->height());
}
}
}
}
return(false);
}
void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h,
const QColorGroup &g, bool sunken,
const QBrush *)
{
drawRoundButton(p, sunken ? g.background() : g.button(), g.background(),
x, y, w, h);
}
void LiquidStyle::drawToolButton(QPainter *p, int x, int y, int w, int h,
const QColorGroup &g, bool sunken,
const QBrush *)
{
if(p->device()->devType() != QInternal::Widget){
// drawing into a temp pixmap, don't use mask
QColor c = sunken ? g.button() : g.background();
p->setPen(c.dark(130));
p->drawRect(x, y, w, h);
p->setPen(c.light(105));
p->drawRect(x+1, y+1, w-2, h-2);
// fill
QPixmap *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);
}
p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
}
else{
drawClearBevel(p, x, y, w, h, sunken ? g.button() :
highlightWidget == p->device() ? g.button().light(110) :
g.background(), g.background());
}
}
void LiquidStyle::drawPushButton(QPushButton *btn, QPainter *p)
{
QRect r = btn->rect();
bool sunken = btn->isOn() || btn->isDown();
QColorGroup g = btn->colorGroup();
//int dw = buttonDefaultIndicatorWidth();
if(btn->hasFocus() || btn->isDefault()){
QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
QPixmap *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);
}
p->setPen(c.dark(150));
p->drawLine(r.x()+1, r.y(), r.right()-1, r.y());
p->drawLine(r.x(), r.y()+1, r.x(), r.bottom()-1);
p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
p->drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
p->drawTiledPixmap(r.x()+1, r.y()+1, r.width()-2, r.height()-2, *pix);
}
QColor newColor = btn == highlightWidget || sunken ?
g.button().light(120) : g.button();
drawRoundButton(p, newColor, g.background(),
r.x(), r.y(), r.width(), r.height(), !btn->autoMask(),
sunken, btn->isDefault() || btn->autoDefault() || btn->hasFocus(),
btn->autoMask());
}
void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
{
int x1, y1, x2, y2, w, h;
btn->rect().coords(&x1, &y1, &x2, &y2);
w = btn->width();
h = btn->height();
bool act = btn->isOn() || btn->isDown();
if(act){
++x1, ++y1;
}
// Draw iconset first, if any
if ( btn->iconSet() && !btn->iconSet()->isNull() )
{
QIconSet::Mode mode = btn->isEnabled()
? QIconSet::Normal : QIconSet::Disabled;
if ( mode == QIconSet::Normal && btn->hasFocus() )
mode = QIconSet::Active;
QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
int pixw = pixmap.width();
int pixh = pixmap.height();
p->drawPixmap( x1+6, y1+h/2-pixh/2, pixmap );
x1 += pixw + 8;
w -= pixw + 8;
}
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 7b6ae71..6311dee 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -1,10 +1,10 @@
-Files: plugins/styles/libliquid.so*
+Files: plugins/styles/libliquid.so* bin/liquid-settings apps/Settings/Liquid.desktop pics/liquid/Liquid.png
Priority: optional
Section: opie/system
Maintainer: Robert Griebl <sandman@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
Depends: opie-base ($QPE_VERSION)
Description: Liquid style by Mosfet.
Mosfet's well known Liquid GUI style from KDE,
ported to OPIE.
diff --git a/noncore/styles/liquid/settings/liquidset.cpp b/noncore/styles/liquid/settings/liquidset.cpp
new file mode 100644
index 0000000..0ef5dbe
--- a/dev/null
+++ b/noncore/styles/liquid/settings/liquidset.cpp
@@ -0,0 +1,199 @@
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS. All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+
+
+#include "liquidset.h"
+#include "../liquid.h"
+
+#include <qpe/qpeapplication.h>
+#include <qpe/global.h>
+
+#include <qslider.h>
+#include <qtoolbutton.h>
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
+#include <qcheckbox.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpalette.h>
+
+#include <qpe/config.h>
+
+#include <opie/colorpopupmenu.h>
+
+
+static void changeButtonColor ( QWidget *btn, const QColor &col )
+{
+ QPalette pal = btn-> palette ( );
+
+ pal. setColor ( QPalette::Active, QColorGroup::Button, col );
+ pal. setColor ( QPalette::Disabled, QColorGroup::Button, col );
+ pal. setColor ( QPalette::Inactive, QColorGroup::Button, col );
+
+ btn-> setPalette ( pal );
+}
+
+
+LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl )
+ : QDialog ( parent, name, fl )
+{
+ setCaption ( tr( "Liquid Style" ) );
+
+ Config config ( "qpe" );
+ config. setGroup ( "MosfetMenus" );
+
+ m_type = config. readNumEntry ( "Type", TransStippleBg );
+ m_menucol = QColor ( config. readEntry ( "Color", QApplication::palette ( ). active ( ). button ( ). name ( )));
+ m_textcol = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
+ int opacity = config. readNumEntry ( "Opacity", 10 );
+ m_shadow = config. readBoolEntry ( "ShadowText", true );
+
+ QVBoxLayout *vbox = new QVBoxLayout ( this );
+ vbox-> setSpacing ( 3 );
+ vbox-> setMargin ( 6 );
+
+ QButtonGroup *btngrp = new QButtonGroup ( this );
+ btngrp-> hide ( );
+
+ QRadioButton *rad;
+
+ rad = new QRadioButton ( tr( "No translucency" ), this );
+ btngrp-> insert ( rad, None );
+ vbox-> addWidget ( rad );
+
+ rad = new QRadioButton ( tr( "Stippled, background color" ), this );
+ btngrp-> insert ( rad, StippledBg );
+ vbox-> addWidget ( rad );
+
+ rad = new QRadioButton ( tr( "Stippled, button color" ), this );
+ btngrp-> insert ( rad, StippledBtn );
+ vbox-> addWidget ( rad );
+
+ rad = new QRadioButton ( tr( "Translucent stippled, background color" ), this );
+ btngrp-> insert ( rad, TransStippleBg );
+ vbox-> addWidget ( rad );
+
+ rad = new QRadioButton ( tr( "Translucent stippled, button color" ), this );
+ btngrp-> insert ( rad, TransStippleBtn );
+ vbox-> addWidget ( rad );
+
+ rad = new QRadioButton ( tr( "Custom translucency" ), this );
+ btngrp-> insert ( rad, Custom );
+ vbox-> addWidget ( rad );
+
+ btngrp-> setExclusive ( true );
+ btngrp-> setButton ( m_type );
+
+ QGridLayout *grid = new QGridLayout ( vbox );
+ grid-> addColSpacing ( 0, 16 );
+ grid-> addColSpacing ( 3, 8 );
+
+ grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
+ grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
+ grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
+
+ m_menubtn = new QToolButton ( this );
+ grid-> addWidget ( m_menubtn, 0, 2 );
+
+ QPopupMenu *popup;
+
+ popup = new ColorPopupMenu ( m_menucol, this );
+ m_menubtn-> setPopup ( popup );
+ m_menubtn-> setPopupDelay ( 0 );
+ connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeMenuColor ( const QColor & )));
+ changeMenuColor ( m_menucol );
+
+ m_textbtn = new QToolButton ( this );
+ grid-> addWidget ( m_textbtn, 0, 5 );
+
+ popup = new ColorPopupMenu ( m_textcol, this );
+ m_textbtn-> setPopup ( popup );
+ m_textbtn-> setPopupDelay ( 0 );
+ connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeTextColor ( const QColor & )));
+ changeTextColor ( m_textcol );
+
+ m_opacsld = new QSlider ( Horizontal, this );
+ m_opacsld-> setRange ( -20, 20 );
+ m_opacsld-> setValue ( opacity );
+ m_opacsld-> setTickmarks ( QSlider::Below );
+ grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
+
+ vbox-> addSpacing ( 4 );
+
+ QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed text" ), this );
+ shadow-> setChecked ( m_shadow );
+ vbox-> addWidget ( shadow );
+
+ vbox-> addStretch ( 10 );
+
+ connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) );
+ connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) );
+}
+
+void LiquidSet::changeType ( int t )
+{
+ bool custom = ( t == Custom );
+
+ m_menulbl-> setEnabled ( custom );
+ m_textlbl-> setEnabled ( custom );
+ m_opaclbl-> setEnabled ( custom );
+ m_menubtn-> setEnabled ( custom );
+ m_textbtn-> setEnabled ( custom );
+ m_opacsld-> setEnabled ( custom );
+
+ m_type = t;
+}
+
+void LiquidSet::changeMenuColor ( const QColor &col )
+{
+ m_menubtn-> setPalette ( col );
+ m_menucol = col;
+}
+
+void LiquidSet::changeTextColor ( const QColor &col )
+{
+ m_textbtn-> setPalette ( col );
+ m_textcol = col;
+}
+
+void LiquidSet::changeShadow ( bool b )
+{
+ m_shadow = b;
+}
+
+
+void LiquidSet::accept ( )
+{
+ Config config ( "qpe" );
+ config. setGroup ( "MosfetMenus" );
+
+ config. writeEntry ( "Type", m_type );
+ config. writeEntry ( "Color", m_menucol. name ( ));
+ config. writeEntry ( "TextColor", m_textcol. name ( ));
+ config. writeEntry ( "Opacity", m_opacsld-> value ( ));
+ config. writeEntry ( "ShadowText", m_shadow );
+ config. write ( );
+
+ Global::applyStyle ( );
+
+ QDialog::accept ( );
+}
+
diff --git a/noncore/styles/liquid/settings/liquidset.h b/noncore/styles/liquid/settings/liquidset.h
new file mode 100644
index 0000000..944b1ec
--- a/dev/null
+++ b/noncore/styles/liquid/settings/liquidset.h
@@ -0,0 +1,39 @@
+#ifndef __OPIE_LIQUID_SET_H__
+#define __OPIE_LIQUID_SET_H__
+
+#include <qdialog.h>
+#include <qcolor.h>
+
+class QLabel;
+class QToolButton;
+class QSlider;
+
+class LiquidSet : public QDialog {
+ Q_OBJECT
+
+public:
+ LiquidSet ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
+
+public slots:
+ void changeType ( int t );
+ void changeMenuColor ( const QColor &col );
+ void changeTextColor ( const QColor &col );
+ void changeShadow ( bool b );
+
+protected:
+ virtual void accept ( );
+
+private:
+ QColor m_menucol;
+ QColor m_textcol;
+ int m_type;
+ bool m_shadow;
+
+ QSlider * m_opacsld;
+ QLabel * m_menulbl;
+ QLabel * m_textlbl;
+ QLabel * m_opaclbl;
+ QToolButton *m_menubtn;
+ QToolButton *m_textbtn;
+};
+#endif
diff --git a/noncore/styles/liquid/settings/main.cpp b/noncore/styles/liquid/settings/main.cpp
new file mode 100644
index 0000000..fd69007
--- a/dev/null
+++ b/noncore/styles/liquid/settings/main.cpp
@@ -0,0 +1,34 @@
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS. All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+#include "liquidset.h"
+
+#include <qpe/qpeapplication.h>
+
+
+int main ( int argc, char** argv )
+{
+ QPEApplication a ( argc, argv );
+
+ LiquidSet dlg;
+ a. showMainWidget ( &dlg );
+
+ return a. exec ( );
+}
diff --git a/noncore/styles/liquid/settings/settings.pro b/noncore/styles/liquid/settings/settings.pro
new file mode 100644
index 0000000..b385d92
--- a/dev/null
+++ b/noncore/styles/liquid/settings/settings.pro
@@ -0,0 +1,24 @@
+TEMPLATE = app
+CONFIG += qt warn_on release
+DESTDIR = $(OPIEDIR)/bin
+HEADERS = liquidset.h
+SOURCES = liquidset.cpp main.cpp
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
+LIBS += -lqpe -lopie
+TARGET = liquid-settings
+
+TRANSLATIONS = ../../../i18n/de/liquid-settings.ts \
+ ../../../i18n/en/liquid-settings.ts \
+ ../../../i18n/es/liquid-settings.ts \
+ ../../../i18n/fr/liquid-settings.ts \
+ ../../../i18n/hu/liquid-settings.ts \
+ ../../../i18n/ja/liquid-settings.ts \
+ ../../../i18n/ko/liquid-settings.ts \
+ ../../../i18n/no/liquid-settings.ts \
+ ../../../i18n/pl/liquid-settings.ts \
+ ../../../i18n/pt/liquid-settings.ts \
+ ../../../i18n/pt_BR/liquid-settings.ts \
+ ../../../i18n/sl/liquid-settings.ts \
+ ../../../i18n/zh_CN/liquid-settings.ts \
+ ../../../i18n/zh_TW/liquid-settings.ts
diff --git a/pics/liquid/Liquid.png b/pics/liquid/Liquid.png
new file mode 100644
index 0000000..67647d0
--- a/dev/null
+++ b/pics/liquid/Liquid.png
Binary files differ