summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp19
-rw-r--r--pics/tux-logo.pngbin2272 -> 30257 bytes
2 files changed, 6 insertions, 13 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 517029b..3a37086 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -70,33 +70,26 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
70 logo1 = logo1.smoothScale( 50, 55 ); 70 logo1 = logo1.smoothScale( 50, 55 );
71 QPixmap logo1Pixmap; 71 QPixmap logo1Pixmap;
72 logo1Pixmap.convertFromImage( logo1 ); 72 logo1Pixmap.convertFromImage( logo1 );
73 palmtopLogo->setPixmap( logo1Pixmap ); 73 palmtopLogo->setPixmap( logo1Pixmap );
74 palmtopLogo->setFixedSize( 60, 60 ); 74 palmtopLogo->setFixedSize( 60, 60 );
75 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 75 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
76 76
77 QLabel *palmtopVersion = new QLabel( this ); 77 QLabel *palmtopVersion = new QLabel( this );
78 palmtopVersion->setText( palmtopVersionString ); 78 palmtopVersion->setText( palmtopVersionString );
79 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 79 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
80 80
81 81
82 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 82 QHBoxLayout *hb2 = new QHBoxLayout( vb );
83 hb1->setSpacing( 2 ); 83 hb1->setSpacing( 2 );
84
85 QLabel *linuxLogo = new QLabel( this );
86 84
87 // Need to do this extra qpainter code with this image becuase for some 85 QLabel *linuxLogo = new QLabel( this );
88 // reason it doesn't alpha belnd if directly converted to a pixmap
89 QPixmap logo2Pixmap( 60, 60 );
90 QColor bgColor = colorGroup().background();
91 QPainter painter( &logo2Pixmap );
92 painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) );
93 QImage logo2 = Resource::loadImage( "tux-logo" ); 86 QImage logo2 = Resource::loadImage( "tux-logo" );
94 logo2 = logo2.smoothScale( 40, 47 ); 87 logo2 = logo2.smoothScale( 55, 60 );
95 painter.drawImage( 0, 0, logo2 ); 88 QPixmap logo2Pixmap;
96 painter.end(); 89 logo2Pixmap.convertFromImage( logo2 );
97 linuxLogo->setPixmap( logo2Pixmap ); 90 linuxLogo->setPixmap( logo2Pixmap );
98 linuxLogo->setFixedSize( 60, 60 ); 91 linuxLogo->setFixedSize( 60, 60 );
99 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 92 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
100 93
101 QLabel *kernelVersion = new QLabel( this ); 94 QLabel *kernelVersion = new QLabel( this );
102 kernelVersion->setText( kernelVersionString ); 95 kernelVersion->setText( kernelVersionString );
diff --git a/pics/tux-logo.png b/pics/tux-logo.png
index ad7c579..f405025 100644
--- a/pics/tux-logo.png
+++ b/pics/tux-logo.png
Binary files differ