author | drw <drw> | 2002-11-17 21:36:55 (UTC) |
---|---|---|
committer | drw <drw> | 2002-11-17 21:36:55 (UTC) |
commit | 2f87d2f9155285d853b66bb08e43b275f6284226 (patch) (unidiff) | |
tree | 5f829b21ae5c60e9264d29378349f1c83e521284 /noncore | |
parent | d94c9d39ab6e744f848a04c07eac03f20c91987c (diff) | |
download | opie-2f87d2f9155285d853b66bb08e43b275f6284226.zip opie-2f87d2f9155285d853b66bb08e43b275f6284226.tar.gz opie-2f87d2f9155285d853b66bb08e43b275f6284226.tar.bz2 |
Finish What's This and some additional code clean-up
-rw-r--r-- | noncore/settings/sysinfo/modulesdetail.cpp | 12 | ||||
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.cpp | 8 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processdetail.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 41 |
5 files changed, 51 insertions, 29 deletions
diff --git a/noncore/settings/sysinfo/modulesdetail.cpp b/noncore/settings/sysinfo/modulesdetail.cpp index 48d47f6..ea5f352 100644 --- a/noncore/settings/sysinfo/modulesdetail.cpp +++ b/noncore/settings/sysinfo/modulesdetail.cpp | |||
@@ -25,5 +25,4 @@ | |||
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | |||
26 | #include <qcombobox.h> | 27 | #include <qcombobox.h> |
27 | #include <qpushbutton.h> | ||
28 | #include <qtextview.h> | ||
29 | #include <qlayout.h> | 28 | #include <qlayout.h> |
@@ -31,5 +30,8 @@ | |||
31 | #include <qmessagebox.h> | 30 | #include <qmessagebox.h> |
31 | #include <qpushbutton.h> | ||
32 | #include <qtextview.h> | ||
33 | #include <qwhatsthis.h> | ||
32 | 34 | ||
33 | ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) | 35 | ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) |
34 | : QWidget( parent, name, fl ) | 36 | : QWidget( parent, name, WStyle_ContextHelp ) |
35 | { | 37 | { |
@@ -45,4 +47,4 @@ ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) | |||
45 | // I can't think of other useful commands yet. Anyone? | 47 | // I can't think of other useful commands yet. Anyone? |
46 | |||
47 | layout->addWidget( CommandCB, 1, 0 ); | 48 | layout->addWidget( CommandCB, 1, 0 ); |
49 | QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command." ) ); | ||
48 | 50 | ||
@@ -50,2 +52,3 @@ ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) | |||
50 | layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 ); | 52 | layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 ); |
53 | QWhatsThis::add( ModulesView, tr( "This area shows detailed information about this module." ) ); | ||
51 | 54 | ||
@@ -57,2 +60,3 @@ ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) | |||
57 | layout->addWidget( SendButton, 1, 1 ); | 60 | layout->addWidget( SendButton, 1, 1 ); |
61 | QWhatsThis::add( SendButton, tr( "Click here to send the selected command to this module." ) ); | ||
58 | } | 62 | } |
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp index 7a32c20..a0d26c7 100644 --- a/noncore/settings/sysinfo/modulesinfo.cpp +++ b/noncore/settings/sysinfo/modulesinfo.cpp | |||
@@ -23,7 +23,8 @@ | |||
23 | 23 | ||
24 | #include <qfile.h> | ||
24 | #include <qheader.h> | 25 | #include <qheader.h> |
25 | #include <qlistview.h> | ||
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qlistview.h> | ||
27 | #include <qtimer.h> | 28 | #include <qtimer.h> |
28 | #include <qfile.h> | 29 | #include <qwhatsthis.h> |
29 | 30 | ||
@@ -47,4 +48,5 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) | |||
47 | this, SLOT( viewModules( QListViewItem * ) ) ); | 48 | this, SLOT( viewModules( QListViewItem * ) ) ); |
48 | |||
49 | layout->addWidget( ModulesView ); | 49 | layout->addWidget( ModulesView ); |
50 | QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) ); | ||
51 | |||
50 | QTimer *t = new QTimer( this ); | 52 | QTimer *t = new QTimer( this ); |
diff --git a/noncore/settings/sysinfo/processdetail.cpp b/noncore/settings/sysinfo/processdetail.cpp index 5c0d335..661e32c 100644 --- a/noncore/settings/sysinfo/processdetail.cpp +++ b/noncore/settings/sysinfo/processdetail.cpp | |||
@@ -25,4 +25,2 @@ | |||
25 | #include <qcombobox.h> | 25 | #include <qcombobox.h> |
26 | #include <qpushbutton.h> | ||
27 | #include <qtextview.h> | ||
28 | #include <qlayout.h> | 26 | #include <qlayout.h> |
@@ -30,5 +28,8 @@ | |||
30 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
29 | #include <qpushbutton.h> | ||
30 | #include <qtextview.h> | ||
31 | #include <qwhatsthis.h> | ||
31 | 32 | ||
32 | ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) | 33 | ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) |
33 | : QWidget( parent, name, fl ) | 34 | : QWidget( parent, name, WStyle_ContextHelp ) |
34 | { | 35 | { |
@@ -52,2 +53,3 @@ ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) | |||
52 | layout->addWidget( SignalCB, 1, 0 ); | 53 | layout->addWidget( SignalCB, 1, 0 ); |
54 | QWhatsThis::add( SignalCB, tr( "Select a signal here and then click the Send button to the right to send to this process." ) ); | ||
53 | 55 | ||
@@ -55,2 +57,3 @@ ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) | |||
55 | layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); | 57 | layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); |
58 | QWhatsThis::add( ProcessView, tr( "This area shows detailed information about this process." ) ); | ||
56 | 59 | ||
@@ -62,2 +65,3 @@ ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) | |||
62 | layout->addWidget( SendButton, 1, 1 ); | 65 | layout->addWidget( SendButton, 1, 1 ); |
66 | QWhatsThis::add( SendButton, tr( "Click here to send the selected signal to this process." ) ); | ||
63 | } | 67 | } |
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp index 0512141..86133a9 100644 --- a/noncore/settings/sysinfo/processinfo.cpp +++ b/noncore/settings/sysinfo/processinfo.cpp | |||
@@ -21,8 +21,9 @@ | |||
21 | 21 | ||
22 | #include <qdir.h> | ||
23 | #include <qfile.h> | ||
22 | #include <qheader.h> | 24 | #include <qheader.h> |
23 | #include <qlistview.h> | ||
24 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qlistview.h> | ||
25 | #include <qtimer.h> | 27 | #include <qtimer.h> |
26 | #include <qfile.h> | 28 | #include <qwhatsthis.h> |
27 | #include <qdir.h> | ||
28 | 29 | ||
@@ -46,4 +47,4 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) | |||
46 | this, SLOT( viewProcess( QListViewItem * ) ) ); | 47 | this, SLOT( viewProcess( QListViewItem * ) ) ); |
47 | |||
48 | layout->addWidget( ProcessView ); | 48 | layout->addWidget( ProcessView ); |
49 | QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) ); | ||
49 | 50 | ||
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 79e7fea..658f371 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp | |||
@@ -45,3 +45,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
45 | QVBoxLayout *vb = new QVBoxLayout( this, 4 ); | 45 | QVBoxLayout *vb = new QVBoxLayout( this, 4 ); |
46 | 46 | ||
47 | QString kernelVersionString; | 47 | QString kernelVersionString; |
@@ -53,5 +53,8 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
53 | v = v.left( 20 ); | 53 | v = v.left( 20 ); |
54 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; | 54 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ); |
55 | kernelVersionString.append( v ); | ||
56 | kernelVersionString.append( "<p>" ); | ||
55 | t >> v; | 57 | t >> v; |
56 | kernelVersionString += tr( "Compiled by: " ) + v; | 58 | kernelVersionString.append( tr( "Compiled by: " ) ); |
59 | kernelVersionString.append( v ); | ||
57 | file.close(); | 60 | file.close(); |
@@ -59,4 +62,5 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
59 | 62 | ||
60 | QString palmtopVersionString; | 63 | QString palmtopVersionString = tr( "<b>Opie</b><p>Version: " ); |
61 | palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>"; | 64 | palmtopVersionString.append( QPE_VERSION ); |
65 | palmtopVersionString.append( "<p>" ); | ||
62 | #ifdef QPE_VENDOR | 66 | #ifdef QPE_VENDOR |
@@ -65,7 +69,10 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
65 | QString builder = "Unknown"; | 69 | QString builder = "Unknown"; |
66 | #endif | 70 | #endif |
67 | palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; | 71 | palmtopVersionString.append( tr( "Compiled by: " ) ); |
68 | palmtopVersionString += tr( "Built on: " ) + __DATE__; | 72 | palmtopVersionString.append( builder ); |
73 | palmtopVersionString.append( "<p>" ); | ||
74 | palmtopVersionString.append( tr( "Built on: " ) ); | ||
75 | palmtopVersionString.append( __DATE__ ); | ||
76 | |||
69 | 77 | ||
70 | |||
71 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); | 78 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); |
@@ -98,3 +105,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
98 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); | 105 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); |
99 | 106 | ||
100 | QLabel *kernelVersion = new QLabel( this ); | 107 | QLabel *kernelVersion = new QLabel( this ); |
@@ -116,7 +123,11 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
116 | 123 | ||
117 | // QString systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->systemString() | 124 | QString systemString = "<b>"; |
118 | QString systemString = "<b>"+ ODevice::inst()->systemString()+"</b>" | 125 | systemString.append( ODevice::inst()->systemString() ); |
119 | +tr("<p>Version: " ) + ODevice::inst()->systemVersionString() | 126 | systemString.append( "</b>" ); |
120 | +tr("<p>Model: ") + ODevice::inst()->modelString() | 127 | systemString.append( tr( "<p>Version: " ) ); |
121 | +tr("<p>Vendor: ") + ODevice::inst()->vendorString(); | 128 | systemString.append( ODevice::inst()->systemVersionString() ); |
129 | systemString.append( tr( "<p>Model: " ) ); | ||
130 | systemString.append( ODevice::inst()->modelString() ); | ||
131 | systemString.append( tr( "<p>Vendor: " ) ); | ||
132 | systemString.append( ODevice::inst()->vendorString() ); | ||
122 | 133 | ||