Added three window decoration flavours:

 - flat from Qtopia 1.6
 - polished from Qtopia 1.6
 - liquid - this was written by me and resembles the KDE3 liquid look

4 files changed, 429 insertions, 0 deletions

diff --git a/noncore/decorations/flat/flat.cpp b/noncore/decorations/flat/flat.cpp
new file mode 100644
index 0000000..b6a81a3
--- a/dev/null
+++ b/noncore/decorations/flat/flat.cpp
@@ -0,0 +1,360 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the 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 "flat.h"
+#include <qpainter.h>
+#include <qapplication.h>
+
+
+/* XPM */
+static const char * ok_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"                                ",
+"                                ",
+"            ++++++++            ",
+"          ++++++++++++          ",
+"        +++++      +++++        ",
+"       +++            +++       ",
+"      +++              +++      ",
+"     +++                +++     ",
+"    +++                  +++    ",
+"    ++                    ++    ",
+"   ++   +++++     ++    ++ ++   ",
+"   ++  ++++++++   ++   +++ ++   ",
+"  +++ +++    +++  ++  +++  +++  ",
+"  ++ +++      ++  ++ +++    ++  ",
+"  ++ ++        ++ ++ ++     ++  ",
+"  ++ ++        ++ +++++     ++  ",
+"  ++ ++        ++ ++++      ++  ",
+"  ++ ++        ++ ++ ++     ++  ",
+"  ++ +++      ++  ++ +++    ++  ",
+"  +++ +++    +++  ++  +++  +++  ",
+"   ++  ++++++++   ++   ++  ++   ",
+"   ++   +++++     ++    ++ ++   ",
+"    ++                    ++    ",
+"    +++                  +++    ",
+"     +++                +++     ",
+"      +++              +++      ",
+"       +++            +++       ",
+"        +++++      +++++        ",
+"          ++++++++++++          ",
+"            ++++++++            ",
+"                                ",
+"                                "};
+
+
+/* XPM */
+static const char * close_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"                                ",
+"                                ",
+"            ++++++++            ",
+"          ++++++++++++          ",
+"        +++++      +++++        ",
+"       +++            +++       ",
+"      +++              +++      ",
+"     +++                +++     ",
+"    +++                  +++    ",
+"    ++   ++          ++   ++    ",
+"   ++    +++        +++    ++   ",
+"   ++     +++      +++     ++   ",
+"  +++      +++    +++      +++  ",
+"  ++        +++  +++        ++  ",
+"  ++         ++++++         ++  ",
+"  ++          ++++          ++  ",
+"  ++          ++++          ++  ",
+"  ++         ++++++         ++  ",
+"  ++        +++  +++        ++  ",
+"  +++      +++    +++      +++  ",
+"   ++     +++      +++     ++   ",
+"   ++    +++        +++    ++   ",
+"    ++   ++          ++   ++    ",
+"    +++                  +++    ",
+"     +++                +++     ",
+"      +++              +++      ",
+"       +++            +++       ",
+"        +++++      +++++        ",
+"          ++++++++++++          ",
+"            ++++++++            ",
+"                                ",
+"                                "};
+
+
+/* XPM */
+static const char * help_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"                                ",
+"                                ",
+"            ++++++++            ",
+"          ++++++++++++          ",
+"        +++++      +++++        ",
+"       +++            +++       ",
+"      +++              +++      ",
+"     +++                +++     ",
+"    +++      +++++       +++    ",
+"    ++      ++++++++      ++    ",
+"   ++      ++++  ++++      ++   ",
+"   ++      +++    +++      ++   ",
+"  +++      +++    +++      +++  ",
+"  ++             ++++       ++  ",
+"  ++            +++++       ++  ",
+"  ++           +++++        ++  ",
+"  ++           ++++         ++  ",
+"  ++          ++++          ++  ",
+"  ++          +++           ++  ",
+"  +++         +++          +++  ",
+"   ++                      ++   ",
+"   ++                      ++   ",
+"    ++        +++         ++    ",
+"    +++       +++        +++    ",
+"     +++                +++     ",
+"      +++              +++      ",
+"       +++            +++       ",
+"        +++++      +++++        ",
+"          ++++++++++++          ",
+"            ++++++++            ",
+"                                ",
+"                                "};
+
+
+/* XPM */
+static const char * maximize_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"                                ",
+"                                ",
+"            ++++++++            ",
+"          ++++++++++++          ",
+"        +++++      +++++        ",
+"       +++            +++       ",
+"      +++              +++      ",
+"     +++                +++     ",
+"    +++  ++++++++++++++  +++    ",
+"    ++   ++++++++++++++   ++    ",
+"   ++    ++++++++++++++    ++   ",
+"   ++    +++        +++    ++   ",
+"  +++    +++        +++    +++  ",
+"  ++     +++        +++     ++  ",
+"  ++     +++        +++     ++  ",
+"  ++     +++        +++     ++  ",
+"  ++     +++        +++     ++  ",
+"  ++     +++        +++     ++  ",
+"  ++     +++        +++     ++  ",
+"  +++    +++        +++    +++  ",
+"   ++    +++        +++    ++   ",
+"   ++    ++++++++++++++    ++   ",
+"    ++   ++++++++++++++   ++    ",
+"    +++  ++++++++++++++  +++    ",
+"     +++                +++     ",
+"      +++              +++      ",
+"       +++            +++       ",
+"        +++++      +++++        ",
+"          ++++++++++++          ",
+"            ++++++++            ",
+"                                ",
+"                                "};
+
+static QImage scaleButton( const QImage &img, int height )
+{
+    if ( img.height() != height ) {
+	return img.smoothScale( img.width()*height/img.height(), height );
+    } else {
+	return img;
+    }
+}
+
+static void colorize( QImage &img, const QColor &c, bool rev )
+{
+    for ( int i = 0; i < img.numColors(); i++ ) {
+	bool sc = (img.color(i) & 0xff000000);
+	if ( rev ) sc = !sc;
+	img.setColor(i, sc ? c.rgb() : 0x00000000 );
+    }
+}
+
+FlatDecoration::FlatDecoration() : ref(0), buttonCache(16)
+{
+    buttonCache.setAutoDelete(TRUE);
+}
+
+FlatDecoration::~FlatDecoration()
+{
+}
+
+int FlatDecoration::metric( Metric m, const WindowData *wd ) const
+{
+    switch ( m ) {
+	case TopBorder:
+	    return 1;
+	    break;
+	case LeftBorder:
+	case RightBorder:
+	    return 2;
+	case BottomBorder:
+	    return 4;
+	case TitleHeight:
+	    if ( QApplication::desktop()->height() > 320 )
+		return 20;
+	    else
+		return 18;
+	case OKWidth:
+	case CloseWidth:
+	case HelpWidth:
+	case MaximizeWidth:
+	    return metric(TitleHeight,wd);
+	    break;
+	default:
+	    return WindowDecorationInterface::metric( m, wd );
+	    break;
+    }
+
+    return 0;
+}
+
+void FlatDecoration::drawArea( Area a, QPainter *p, const WindowData *wd ) const
+{
+    int th = metric( TitleHeight, wd );
+    QRect r = wd->rect;
+
+    switch ( a ) {
+	case Border:
+	    {
+		const QColorGroup &cg = wd->palette.active();
+		if ( wd->flags & WindowData::Active ) {
+		    p->setBrush( cg.color(QColorGroup::Highlight) );
+		} else {
+		    p->setBrush( cg.color(QColorGroup::Background) );
+		}
+		p->setPen( cg.foreground() );
+		int lb = metric(LeftBorder,wd);
+		int rb = metric(RightBorder,wd);
+		int tb = metric(TopBorder,wd);
+		int bb = metric(BottomBorder,wd);
+		p->drawRect( r.x()-lb, r.y()-tb-th, r.width()+lb+rb,
+			     r.height()+th+tb+bb );
+	    }
+	    break;
+	case Title:
+	    if ( r.height() < 2 ) {
+		WindowDecorationInterface::drawArea( a, p, wd );
+	    } else {
+		const QColorGroup &cg = wd->palette.active();
+		QColor c;
+		if ( wd->flags & WindowData::Active )
+		    c = cg.color(QColorGroup::Highlight);
+		else
+		    c = cg.color(QColorGroup::Background);
+		p->fillRect( QRect(r.x(),r.y()-th,r.width(),th), c );
+	    }
+	    break;
+	case TitleText:
+	    p->drawText( r.left()+3+metric(HelpWidth,wd), r.top()-th,
+			 r.width()-metric(HelpWidth,wd)-metric(CloseWidth,wd), th,
+			 Qt::AlignVCenter, wd->caption );
+	    break;
+	default:
+	    FlatDecoration::drawArea( a, p, wd );
+	    break;
+    }
+}
+
+void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, int x, int y, int w, int h, QWSButton::State state ) const
+{
+    QColor c;
+    const QColorGroup &cg = wd->palette.active();
+    if ( wd->flags & WindowDecorationInterface::WindowData::Active )
+	c = cg.color(QColorGroup::HighlightedText);
+    else
+	c = cg.color(QColorGroup::Foreground);
+    bool r = (state & QWSButton::MouseOver) && (state & QWSButton::Clicked);
+    int th = metric(TitleHeight, wd);
+
+    QString key( "%1-%2-%3-%4" );
+    key = key.arg(b).arg(th).arg(c.name()).arg(r ? "1" : "0");
+    QImage *img = buttonCache.find( key );
+    if ( !img ) {
+	QImage tmp;
+	switch ( b ) {
+	    case OK:
+		tmp = QImage( ok_xpm );
+		break;
+	    case Close:
+		tmp = QImage( close_xpm );
+		break;
+	    case Help:
+		tmp = QImage( help_xpm );
+		break;
+	    case Maximize:
+		tmp = QImage( maximize_xpm );
+		break;
+	}
+	colorize( tmp, c, r );
+	img = new QImage( scaleButton(tmp,th) );
+	FlatDecoration *that = (FlatDecoration *)this;
+	that->buttonCache.insert( key, img, 1 );
+    }
+    
+    p->drawImage( x, y, *img );
+}
+
+QRegion FlatDecoration::mask( const WindowData *wd ) const
+{
+    return WindowDecorationInterface::mask( wd );
+}
+
+QString FlatDecoration::name() const
+{
+    return qApp->translate( "Decoration", "Flat" );
+}
+
+QPixmap FlatDecoration::icon() const
+{
+    return QPixmap();
+}
+
+QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+{
+    *iface = 0;
+    if ( uuid == IID_QUnknown )
+	*iface = this;
+    else if ( uuid == IID_WindowDecoration )
+	*iface = this;
+
+    if ( *iface )
+	(*iface)->addRef();
+    return QS_OK;
+}
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( FlatDecoration )
+}
+
diff --git a/noncore/decorations/flat/flat.h b/noncore/decorations/flat/flat.h
new file mode 100644
index 0000000..3d8a18b
--- a/dev/null
+++ b/noncore/decorations/flat/flat.h
@@ -0,0 +1,49 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the 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.
+**
+**********************************************************************/
+
+#ifndef FLAT_H
+#define FLAT_H
+
+#include <qtopia/windowdecorationinterface.h>
+#include <qcache.h>
+#include <qimage.h>
+
+class FlatDecoration : public WindowDecorationInterface
+{
+public:
+    FlatDecoration();
+    virtual ~FlatDecoration();
+
+    virtual int metric( Metric m, const WindowData * ) const;
+    virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
+    virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
+    virtual QRegion mask( const WindowData * ) const;
+    virtual QString name() const;
+    virtual QPixmap icon() const;
+
+    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
+    Q_REFCOUNT
+
+private:
+    ulong ref;
+    QCache<QImage> buttonCache;
+};
+
+#endif
diff --git a/noncore/decorations/flat/flat.pro b/noncore/decorations/flat/flat.pro
new file mode 100644
index 0000000..32bdb59
--- a/dev/null
+++ b/noncore/decorations/flat/flat.pro
@@ -0,0 +1,11 @@
+TEMPLATE	= lib
+CONFIG		+= qt warn_on release
+HEADERS		= flat.h
+SOURCES		= flat.cpp
+TARGET		= flat
+DESTDIR		= $(OPIEDIR)/plugins/decorations
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
+LIBS            += -lqpe
+VERSION		= 1.0.0
+
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
new file mode 100644
index 0000000..93c494c
--- a/dev/null
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -0,0 +1,9 @@
+Files: plugins/decorations/libflat.so*
+Priority: optional
+Section: opie/decorations
+Maintainer: Robert Griebl <sandman@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION.1
+Depends: opie-base ($QPE_VERSION)
+Description: OPIE window decoration style
+ Flat window decoration style for OPIE.