-rw-r--r-- | noncore/settings/sysinfo/qpe-sysinfo.control | 2 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/sysinfo/qpe-sysinfo.control b/noncore/settings/sysinfo/qpe-sysinfo.control index e5ed583..7a2d85d 100644 --- a/noncore/settings/sysinfo/qpe-sysinfo.control +++ b/noncore/settings/sysinfo/qpe-sysinfo.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/qpe-logo.png pics/tux-logo.png | 1 | Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/opielogo.png pics/tux-logo.png |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: qpe/applications | 3 | Section: qpe/applications |
4 | Maintainer: Warwick Allison <warwick@trolltech.com> | 4 | Maintainer: Warwick Allison <warwick@trolltech.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-3 | 6 | Version: $QPE_VERSION-3 |
7 | Depends: qpe-base ($QPE_VERSION) | 7 | Depends: qpe-base ($QPE_VERSION) |
8 | Description: System Information dialog | 8 | Description: System Information dialog |
9 | For the Qtopia environment. | 9 | For the Qtopia environment. |
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index d60a445..130a65c 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp | |||
@@ -45,49 +45,49 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
45 | QString v; | 45 | QString v; |
46 | t >> v; t >> v; t >> v; | 46 | t >> v; t >> v; t >> v; |
47 | v = v.left( 20 ); | 47 | v = v.left( 20 ); |
48 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; | 48 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; |
49 | t >> v; | 49 | t >> v; |
50 | kernelVersionString += tr( "Compiled by: " ) + v; | 50 | kernelVersionString += tr( "Compiled by: " ) + v; |
51 | file.close(); | 51 | file.close(); |
52 | } | 52 | } |
53 | 53 | ||
54 | QString palmtopVersionString; | 54 | QString palmtopVersionString; |
55 | palmtopVersionString = tr( "<b>Qtopia</b><p>Version: " ) + QPE_VERSION + "<p>"; | 55 | palmtopVersionString = tr( "<b>Qtopia</b><p>Version: " ) + QPE_VERSION + "<p>"; |
56 | #ifdef QPE_VENDOR | 56 | #ifdef QPE_VENDOR |
57 | QString builder = QPE_VENDOR; | 57 | QString builder = QPE_VENDOR; |
58 | #else | 58 | #else |
59 | QString builder = "Unknown"; | 59 | QString builder = "Unknown"; |
60 | #endif | 60 | #endif |
61 | palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; | 61 | palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; |
62 | palmtopVersionString += tr( "Built on: " ) + __DATE__; | 62 | palmtopVersionString += tr( "Built on: " ) + __DATE__; |
63 | 63 | ||
64 | 64 | ||
65 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); | 65 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); |
66 | hb1->setSpacing( 2 ); | 66 | hb1->setSpacing( 2 ); |
67 | 67 | ||
68 | QLabel *palmtopLogo = new QLabel( this ); | 68 | QLabel *palmtopLogo = new QLabel( this ); |
69 | QImage logo1 = Resource::loadImage( "qpe-logo" ); | 69 | QImage logo1 = Resource::loadImage( "opielogo" ); |
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 | 84 | ||
85 | QLabel *linuxLogo = new QLabel( this ); | 85 | QLabel *linuxLogo = new QLabel( this ); |
86 | 86 | ||
87 | // Need to do this extra qpainter code with this image becuase for some | 87 | // Need to do this extra qpainter code with this image becuase for some |
88 | // reason it doesn't alpha belnd if directly converted to a pixmap | 88 | // reason it doesn't alpha belnd if directly converted to a pixmap |
89 | QPixmap logo2Pixmap( 60, 60 ); | 89 | QPixmap logo2Pixmap( 60, 60 ); |
90 | QColor bgColor = colorGroup().background(); | 90 | QColor bgColor = colorGroup().background(); |
91 | QPainter painter( &logo2Pixmap ); | 91 | QPainter painter( &logo2Pixmap ); |
92 | painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) ); | 92 | painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) ); |
93 | QImage logo2 = Resource::loadImage( "tux-logo" ); | 93 | QImage logo2 = Resource::loadImage( "tux-logo" ); |