[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kcontrol
From:       Jonathan Riddell <jr () jriddell ! org>
Date:       2005-01-31 19:06:56
Message-ID: 20050131190656.638D01D1A4 () office ! kde ! org
[Download RAW message or body]

CVS commit by jriddell: 

New about screen by Lokheed <lokheed @gmail.com> and me


  A            pics/top-right.png   1.1
  M +11 -5     aboutwidget.cpp   1.56
  M +1 -0      aboutwidget.h   1.16
  M +28 -112   pics/part1.png   1.4
  M +1 -7      pics/part2.png   1.3


--- kdebase/kcontrol/kcontrol/aboutwidget.cpp  #1.55:1.56
@@ -77,4 +77,5 @@ QPixmap *AboutWidget::_part2 = 0L;
 QPixmap *AboutWidget::_part3 = 0L;
 KPixmap *AboutWidget::_part3Effect = 0L;
+QPixmap *AboutWidget::_part4TopRight = 0L;
 
 AboutWidget::AboutWidget(QWidget *parent , const char *name, QListViewItem* \
category, const QString &caption) @@ -99,9 +100,10 @@ \
AboutWidget::AboutWidget(QWidget *parent  _part2 = new QPixmap;
       _part3 = new QPixmap;
+      _part4TopRight = new QPixmap;
       _part3Effect = new KPixmap;
     }
 
     // sanity check
-    if(_part1->isNull() || _part2->isNull() || _part3->isNull()) {
+    if(_part1->isNull() || _part2->isNull() || _part3->isNull() || \
                _part4TopRight->isNull()) {
         kdError() << "AboutWidget::AboutWidget: Image loading error!" << endl;
         setBackgroundColor(QColor(49,121,172));
@@ -134,4 +136,5 @@ void AboutWidget::initPixmaps()
   _part2 = new QPixmap( locate( "data", "kcontrol/pics/part2.png" ) );
   _part3 = new QPixmap( locate( "data", "kcontrol/pics/part3.png" ) );
+  _part4TopRight = new QPixmap( locate( "data", "kcontrol/pics/top-right.png" ) );
 
   _part3Effect = new KPixmap( _part3->size() );
@@ -153,8 +156,10 @@ void AboutWidget::freePixmaps()
   delete _part3;
   delete _part3Effect;
+  delete _part4TopRight;
   _part1 = 0L;
   _part2 = 0L;
   _part3 = 0L;
   _part3Effect = 0L;
+  _part4TopRight = 0L;
 }
 
@@ -185,5 +190,5 @@ void AboutWidget::resizeEvent(QResizeEve
 void AboutWidget::updatePixmap()
 {
-    if(_part1->isNull() || _part2->isNull() || _part3->isNull())
+    if(_part1->isNull() || _part2->isNull() || _part3->isNull() || \
_part4TopRight->isNull())  return;
 
@@ -193,4 +198,5 @@ void AboutWidget::updatePixmap()
 
     // draw part1
+    p.drawPixmap(width() - _part4TopRight->width(), 0, *_part4TopRight);
     p.drawPixmap(0, 0, *_part1);
 
@@ -201,5 +207,5 @@ void AboutWidget::updatePixmap()
     int xpos = xoffset;
     if(width() > xpos)
-        p.drawTiledPixmap(xpos, 0, width() - xpos, _part2->height(), *_part2);
+        p.drawTiledPixmap(xpos, 0, width() - xpos - _part4TopRight->width(), \
_part2->height(), *_part2);  
     QFont f1 = font();
@@ -223,5 +229,5 @@ void AboutWidget::updatePixmap()
     //draw the caption text
     p.setFont(f3);
-    p.setPen(gray);
+    p.setPen(QColor(139, 163, 198));
     p.drawText(220, 60, caption);
     p.setPen(black);
@@ -233,5 +239,5 @@ void AboutWidget::updatePixmap()
     
     // draw title text
-    p.setPen(white);
+    p.setPen(black);
     p.drawText(150, 84, width() - 160, 108 - 84, hAlign | AlignVCenter, title);
 

--- kdebase/kcontrol/kcontrol/aboutwidget.h  #1.15:1.16
@@ -76,4 +76,5 @@ private:
     static QPixmap *_part2;
     static QPixmap *_part3;
+    static QPixmap *_part4TopRight;
 
     // Also for performance reasons we apply the KPixmapEffect only once


[prev in list] [next in list] [prev in thread] [next in thread]