merge noncore/styles/*

1 files changed, 0 insertions, 1 deletions

diff --git a/noncore/styles/metal/metal.cpp b/noncore/styles/metal/metal.cpp
index 5cb2d22..e13a249 100644
--- a/noncore/styles/metal/metal.cpp
+++ b/noncore/styles/metal/metal.cpp
@@ -1,98 +1,97 @@
 /****************************************************************************
-** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include "metal.h"
 #include <qapplication.h>
 #include <qpushbutton.h>
 #include <qscrollbar.h>
 #include <limits.h>
 
 
 /////////////////////////////////////////////////////////
 #include "stonedark.xpm"
 #include "stone1.xpm"
 #include "marble.xpm"
 ///////////////////////////////////////////////////////
 
 
 
 MetalStyle::MetalStyle() : QWindowsStyle() { }
 
 /*!
   Reimplementation from QStyle
  */
 void MetalStyle::polish( QApplication *app)
 {
     oldPalette = app->palette();
 
     // we simply create a nice QColorGroup with a couple of fancy
     // pixmaps here and apply to it all widgets
 
     QFont f("times", app->font().pointSize() );
     f.setBold( TRUE );
     f.setItalic( TRUE );
     app->setFont( f, TRUE, "QMenuBar");
     app->setFont( f, TRUE, "QPopupMenu");
 
 
     //QPixmap button( stone1_xpm );
     QPixmap button( stonedark_xpm );
     QPixmap background(marble_xpm);
 #if 0
 
     int i;
     for (i=0; i<img.numColors(); i++) {
   QRgb rgb = img.color(i);
   QColor c(rgb);
   rgb = c.dark().rgb();
   img.setColor(i,rgb);
     }
     QPixmap mid;
     mid.convertFromImage(img);
 
     img = orig;
     for (i=0; i<img.numColors(); i++) {
   QRgb rgb = img.color(i);
   QColor c(rgb);
   rgb = c.light().rgb();
   img.setColor(i,rgb);
     }
     QPixmap light;
     light.convertFromImage(img);
 
     img = orig;
     for (i=0; i<img.numColors(); i++) {
   QRgb rgb = img.color(i);
   QColor c(rgb);
   rgb = c.dark().rgb();
   img.setColor(i,rgb);
     }
     QPixmap dark;
     dark.convertFromImage(img);
 #else
     QPixmap dark( 1, 1 ); dark.fill( red.dark() );
     QPixmap mid( stone1_xpm );
     QPixmap light( stone1_xpm );//1, 1 ); light.fill( green );
 #endif
     QPalette op = app->palette();
 
     QColor backCol( 227,227,227 );
 
     // QPalette op(white);
     QColorGroup active (op.normal().foreground(),
          QBrush(op.normal().button(),button),
          QBrush(op.normal().light(), light),
          QBrush(op.normal().dark(), dark),
          QBrush(op.normal().mid(), mid),
          op.normal().text(),
          Qt::white,
          op.normal().base(),//         QColor(236,182,120),
          QBrush(backCol, background)
          );