summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-10 01:20:02 (UTC)
committer llornkcor <llornkcor>2002-11-10 01:20:02 (UTC)
commit7d446dff05a691da5b421b65ace687d787b06d81 (patch) (unidiff)
tree22ce2678382eea790f43eaa88ade162c9ed3281c
parentd8bf328c4dfa2b33e2c5761c7af3b39ec307abee (diff)
downloadopie-7d446dff05a691da5b421b65ace687d787b06d81.zip
opie-7d446dff05a691da5b421b65ace687d787b06d81.tar.gz
opie-7d446dff05a691da5b421b65ace687d787b06d81.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index e92b36c..85b8b51 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -67,63 +67,63 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
67 67
68 68
69 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 69 QHBoxLayout *hb1 = new QHBoxLayout( vb );
70 hb1->setSpacing( 2 ); 70 hb1->setSpacing( 2 );
71 71
72 QLabel *palmtopLogo = new QLabel( this ); 72 QLabel *palmtopLogo = new QLabel( this );
73 QImage logo1 = Resource::loadImage( "logo/opielogo" ); 73 QImage logo1 = Resource::loadImage( "logo/opielogo" );
74 logo1 = logo1.smoothScale( 50, 55 ); 74 logo1 = logo1.smoothScale( 50, 55 );
75 QPixmap logo1Pixmap; 75 QPixmap logo1Pixmap;
76 logo1Pixmap.convertFromImage( logo1 ); 76 logo1Pixmap.convertFromImage( logo1 );
77 palmtopLogo->setPixmap( logo1Pixmap ); 77 palmtopLogo->setPixmap( logo1Pixmap );
78 palmtopLogo->setFixedSize( 60, 60 ); 78 palmtopLogo->setFixedSize( 60, 60 );
79 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 79 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
80 80
81 QLabel *palmtopVersion = new QLabel( this ); 81 QLabel *palmtopVersion = new QLabel( this );
82 palmtopVersion->setText( palmtopVersionString ); 82 palmtopVersion->setText( palmtopVersionString );
83 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 83 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
84 84
85 85
86 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 86 QHBoxLayout *hb2 = new QHBoxLayout( vb );
87 hb1->setSpacing( 2 ); 87 hb1->setSpacing( 2 );
88 88
89 QLabel *linuxLogo = new QLabel( this ); 89 QLabel *linuxLogo = new QLabel( this );
90 QImage logo2 = Resource::loadImage( "logo/tux-logo" ); 90 QImage logo2 = Resource::loadImage( "logo/tux-logo" );
91 logo2 = logo2.smoothScale( 55, 60 ); 91 logo2 = logo2.smoothScale( 55, 60 );
92 QPixmap logo2Pixmap; 92 QPixmap logo2Pixmap;
93 logo2Pixmap.convertFromImage( logo2 ); 93 logo2Pixmap.convertFromImage( logo2 );
94 linuxLogo->setPixmap( logo2Pixmap ); 94 linuxLogo->setPixmap( logo2Pixmap );
95 linuxLogo->setFixedSize( 60, 60 ); 95 linuxLogo->setFixedSize( 60, 60 );
96 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 96 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
97 97
98 QLabel *kernelVersion = new QLabel( this ); 98 QLabel *kernelVersion = new QLabel( this );
99 kernelVersion->setText( kernelVersionString ); 99 kernelVersion->setText( kernelVersionString );
100 hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 100 hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
101 101
102 102
103 QHBoxLayout *hb3 = new QHBoxLayout( vb ); 103 QHBoxLayout *hb3 = new QHBoxLayout( vb );
104 hb3->setSpacing( 2 ); 104 hb3->setSpacing( 2 );
105 105
106 QLabel *palmtopLogo3 = new QLabel( this ); 106 QLabel *palmtopLogo3 = new QLabel( this );
107 QImage logo3 = Resource::loadImage( "SystemInfo" ); 107 QImage logo3 = Resource::loadImage( "SystemInfo" );
108 logo3 = logo3.smoothScale( 50, 55 ); 108 logo3 = logo3.smoothScale( 50, 55 );
109 QPixmap logo3Pixmap; 109 QPixmap logo3Pixmap;
110 logo3Pixmap.convertFromImage( logo3 ); 110 logo3Pixmap.convertFromImage( logo3 );
111 palmtopLogo3->setPixmap( logo3Pixmap ); 111 palmtopLogo3->setPixmap( logo3Pixmap );
112 palmtopLogo3->setFixedSize( 60, 60 ); 112 palmtopLogo3->setFixedSize( 60, 60 );
113 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); 113 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
114 114
115 systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->modelString() 115 QString systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->modelString()
116 +tr("<p>Version: " ) + ODevice::inst()->vendorString() 116 +tr("<p>Version: " ) + ODevice::inst()->vendorString()
117 +tr("<p>Model: ") + ODevice::inst()->systemString() 117 +tr("<p>Model: ") + ODevice::inst()->systemString()
118 +tr("<p>Vendor: ") + ODevice::inst()->systemVersionString(); 118 +tr("<p>Vendor: ") + ODevice::inst()->systemVersionString();
119 119
120 QLabel *systemVersion = new QLabel( this ); 120 QLabel *systemVersion = new QLabel( this );
121 systemVersion->setText( systemString ); 121 systemVersion->setText( systemString );
122 hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 122 hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft );
123 123
124} 124}
125 125
126VersionInfo::~VersionInfo() 126VersionInfo::~VersionInfo()
127{ 127{
128} 128}
129 129