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

List:       kde-commits
Subject:    kdesdk/kbugbuster
From:       Jonathan Riddell <jr () jriddell ! org>
Date:       2005-02-11 15:49:02
Message-ID: 20050211154902.F1A7A1D199 () office ! kde ! org
[Download RAW message or body]

CVS commit by jriddell: 

Fix beastie 99101 KBugBuster needs new background images similar to those of kde control centre
BUG:99101


  A            pics/top-right.png   1.1
  M +18 -11    gui/cwloadingwidget.cpp   1.6
  M +1 -0      gui/cwloadingwidget.h   1.4
  M +1 -1      pics/Makefile.am   1.2
  M +1 -7      pics/bars.png   1.2
  M +28 -112   pics/logo.png   1.2


--- kdesdk/kbugbuster/gui/cwloadingwidget.cpp  #1.5:1.6
@@ -67,4 +67,6 @@ void CWLoadingWidget::init( WidgetMode m
         m_logoPixmap =
                 new QPixmap( locate( "data", "kbugbuster/pics/logo.png" ) );
+        m_topRightPixmap =
+                new QPixmap( locate( "data", "kbugbuster/pics/top-right.png" ) );
         m_barsPixmap =
                 new QPixmap( locate( "data", "kbugbuster/pics/bars.png" ) );
@@ -89,4 +91,5 @@ void CWLoadingWidget::init( WidgetMode m
 
         m_logoPixmap = 0L;
+        m_topRightPixmap = 0L;
         m_barsPixmap = 0L;
     }
@@ -126,7 +129,4 @@ void CWLoadingWidget::updatePixmap()
                                28, QFont::Bold, true );
     
-        // Draw logo
-        p.drawPixmap( 0, 0, *m_logoPixmap );
-
         int xoffset = m_logoPixmap->width();
 
@@ -137,6 +137,10 @@ void CWLoadingWidget::updatePixmap()
                                m_barsPixmap->height(), *m_barsPixmap );
 
+        // Draw logo
+        p.drawPixmap(width() - m_topRightPixmap->width(), 0, *m_topRightPixmap);
+        p.drawPixmap( 0, 0, *m_logoPixmap );
+
         // Draw title text
-        p.setPen( white );
+        p.setPen( black );
         p.drawText( 150, 84, cr.width() - 150, 108 - 84,
                     AlignAuto | AlignVCenter, m_text );
@@ -154,5 +158,5 @@ void CWLoadingWidget::updatePixmap()
         QString caption = i18n( "KBugBuster" );
         p.setFont( bigFont );
-        p.setPen( gray );
+        p.setPen( QColor(139, 163, 198) );
         p.drawText( 220, 60, caption );
         p.setPen( black );
@@ -217,4 +221,6 @@ CWLoadingWidget::~CWLoadingWidget()
     if( m_logoPixmap )
         delete m_logoPixmap;
+    if( m_topRightPixmap )
+        delete m_topRightPixmap;
     if( m_barsPixmap )
         delete m_barsPixmap;
@@ -226,4 +232,5 @@ CWLoadingWidget::~CWLoadingWidget()
     m_toolsPixmap = 0L;
     m_logoPixmap = 0L;
+    m_topRightPixmap = 0L;
     m_barsPixmap = 0L;
     m_toolsPixmapEffect = 0L;

--- kdesdk/kbugbuster/gui/cwloadingwidget.h  #1.3:1.4
@@ -70,4 +70,5 @@ private:
     QPixmap *m_toolsPixmap;
     QPixmap *m_logoPixmap;
+    QPixmap *m_topRightPixmap;
     QPixmap *m_barsPixmap;
 

--- kdesdk/kbugbuster/pics/Makefile.am  #1.1:1.2
@@ -1,3 +1,3 @@
-logo_DATA = tools.png logo.png bars.png
+logo_DATA = tools.png logo.png bars.png top-right.png
 logodir = $(kde_datadir)/kbugbuster/pics
 


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