summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-01-23 18:08:30 (UTC)
committer mickeyl <mickeyl>2005-01-23 18:08:30 (UTC)
commitda166ce6066568db9b7ac0bf5c2cc0dc9afb0776 (patch) (unidiff)
tree2a26219682f582a68fbcbe356f3755655b59664d
parent701dd4a1e9c64294a9d8947df18a5414bbf62a4f (diff)
downloadopie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.zip
opie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.tar.gz
opie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.tar.bz2
show Qt version instead of the builder name which is more or less irrelevant nowadays
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro2
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index fc754d7..e1d6449 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -10,27 +10,27 @@ HEADERS = \
10 contrib/dhry.h \ 10 contrib/dhry.h \
11 benchmarkinfo.h \ 11 benchmarkinfo.h \
12 sysloginfo.h \ 12 sysloginfo.h \
13 versioninfo.h \ 13 versioninfo.h \
14 sysinfo.h 14 sysinfo.h
15SOURCES = main.cpp \ 15SOURCES = main.cpp \
16 memory.cpp \ 16 memory.cpp \
17 graph.cpp \ 17 graph.cpp \
18 load.cpp \ 18 load.cpp \
19 storage.cpp \ 19 storage.cpp \
20 processinfo.cpp \ 20 processinfo.cpp \
21 modulesinfo.cpp \ 21 modulesinfo.cpp \
22 detail.cpp \ 22 detail.cpp \
23 contrib/dhry.c contrib/fft.c \ 23 contrib/dhry.c contrib/fft.c \
24 benchmarkinfo.cpp \ 24 benchmarkinfo.cpp \
25 sysloginfo.cpp \ 25 sysloginfo.cpp \
26 versioninfo.cpp \ 26 versioninfo.cpp \
27 sysinfo.cpp 27 sysinfo.cpp
28 28
29INCLUDEPATH += $(OPIEDIR)/include 29INCLUDEPATH += $(OPIEDIR)/include
30DEPENDPATH += $(OPIEDIR)/include 30DEPENDPATH += $(OPIEDIR)/include
31LIBS += -lqpe -lopiecore2 -lopieui2 31LIBS += -lqpe -lopiecore2 -lopieui2
32DEFINES += UNIX 32DEFINES += UNIX
33TARGET = sysinfo 33TARGET = sysinfo
34VERSION = 1.2.1 34VERSION = 1.2.2
35 35
36include( $(OPIEDIR)/include.pro ) 36include( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 2111298..d8fd7fa 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -57,50 +57,50 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
57 if ( file.open( IO_ReadOnly ) ) 57 if ( file.open( IO_ReadOnly ) )
58 { 58 {
59 QTextStream t( &file ); 59 QTextStream t( &file );
60 QStringList strList; 60 QStringList strList;
61 61
62 strList = QStringList::split( " " , t.read(), false ); 62 strList = QStringList::split( " " , t.read(), false );
63 63
64 kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " ); 64 kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " );
65 kernelVersionString.append( strList[2] ); 65 kernelVersionString.append( strList[2] );
66 kernelVersionString.append( "<br>" ); 66 kernelVersionString.append( "<br>" );
67 kernelVersionString.append( tr( "Compiled by: " ) ); 67 kernelVersionString.append( tr( "Compiled by: " ) );
68 kernelVersionString.append( strList[3] ); 68 kernelVersionString.append( strList[3] );
69 kernelVersionString.append("</qt>"); 69 kernelVersionString.append("</qt>");
70 file.close(); 70 file.close();
71 } 71 }
72 72
73 QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " ); 73 QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " );
74 palmtopVersionString.append( QPE_VERSION ); 74 palmtopVersionString.append( QPE_VERSION );
75 palmtopVersionString.append( "<br>" ); 75 palmtopVersionString.append( "<br>" );
76#ifdef QPE_VENDOR 76#ifdef QPE_VENDOR
77 QString builder = QPE_VENDOR; 77 QString builder = QPE_VENDOR;
78#else 78#else
79 QString builder = "Unknown"; 79 QString builder = "Unknown";
80#endif 80#endif
81 palmtopVersionString.append( tr( "Compiled by: " ) ); 81 palmtopVersionString.append( tr( "Built against Qt/E " ) );
82 palmtopVersionString.append( builder ); 82 palmtopVersionString.append( QT_VERSION_STR );
83 palmtopVersionString.append( "<br>" ); 83 palmtopVersionString.append( "<br>" );
84 palmtopVersionString.append( tr( "Built on: " ) ); 84 palmtopVersionString.append( tr( "Built on: " ) );
85 palmtopVersionString.append( __DATE__ ); 85 palmtopVersionString.append( __DATE__ );
86 palmtopVersionString.append( "</qt>" ); 86 palmtopVersionString.append( "</qt>" );
87 87
88 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 88 QHBoxLayout *hb1 = new QHBoxLayout( vb );
89 hb1->setSpacing( 2 ); 89 hb1->setSpacing( 2 );
90 90
91 QLabel *palmtopLogo = new QLabel( container ); 91 QLabel *palmtopLogo = new QLabel( container );
92 QImage logo1 = Resource::loadImage( "logo/opielogo" ); 92 QImage logo1 = Resource::loadImage( "logo/opielogo" );
93 logo1 = logo1.smoothScale( 50, 55 ); 93 logo1 = logo1.smoothScale( 50, 55 );
94 QPixmap logo1Pixmap; 94 QPixmap logo1Pixmap;
95 logo1Pixmap.convertFromImage( logo1 ); 95 logo1Pixmap.convertFromImage( logo1 );
96 palmtopLogo->setPixmap( logo1Pixmap ); 96 palmtopLogo->setPixmap( logo1Pixmap );
97 palmtopLogo->setFixedSize( 60, 60 ); 97 palmtopLogo->setFixedSize( 60, 60 );
98 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 98 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
99 99
100 QLabel *palmtopVersion = new QLabel( container ); 100 QLabel *palmtopVersion = new QLabel( container );
101 palmtopVersion->setText( palmtopVersionString ); 101 palmtopVersion->setText( palmtopVersionString );
102 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 102 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
103 103
104 104
105 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 105 QHBoxLayout *hb2 = new QHBoxLayout( vb );
106 hb1->setSpacing( 2 ); 106 hb1->setSpacing( 2 );