summaryrefslogtreecommitdiff
authordrw <drw>2002-11-17 21:36:55 (UTC)
committer drw <drw>2002-11-17 21:36:55 (UTC)
commit2f87d2f9155285d853b66bb08e43b275f6284226 (patch) (unidiff)
tree5f829b21ae5c60e9264d29378349f1c83e521284
parentd94c9d39ab6e744f848a04c07eac03f20c91987c (diff)
downloadopie-2f87d2f9155285d853b66bb08e43b275f6284226.zip
opie-2f87d2f9155285d853b66bb08e43b275f6284226.tar.gz
opie-2f87d2f9155285d853b66bb08e43b275f6284226.tar.bz2
Finish What's This and some additional code clean-up
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/modulesdetail.cpp12
-rw-r--r--noncore/settings/sysinfo/modulesinfo.cpp8
-rw-r--r--noncore/settings/sysinfo/processdetail.cpp10
-rw-r--r--noncore/settings/sysinfo/processinfo.cpp9
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp33
5 files changed, 47 insertions, 25 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
@@ -23,15 +23,17 @@
23 23
24#include <sys/types.h> 24#include <sys/types.h>
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>
30#include <qlistview.h> 29#include <qlistview.h>
31#include <qmessagebox.h> 30#include <qmessagebox.h>
31#include <qpushbutton.h>
32#include <qtextview.h>
33#include <qwhatsthis.h>
32 34
33ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl ) 35ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl )
34 : QWidget( parent, name, fl ) 36 : QWidget( parent, name, WStyle_ContextHelp )
35{ 37{
36 modname = ""; 38 modname = "";
37 39
@@ -43,11 +45,12 @@ ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl )
43 CommandCB->insertItem( "modprobe -r" ); 45 CommandCB->insertItem( "modprobe -r" );
44 CommandCB->insertItem( "rmmod" ); 46 CommandCB->insertItem( "rmmod" );
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
49 ModulesView = new QTextView( this, "ModulesView" ); 51 ModulesView = new QTextView( this, "ModulesView" );
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
52 SendButton = new QPushButton( this, "SendButton" ); 55 SendButton = new QPushButton( this, "SendButton" );
53 SendButton->setMinimumSize( QSize( 50, 24 ) ); 56 SendButton->setMinimumSize( QSize( 50, 24 ) );
@@ -55,6 +58,7 @@ ModulesDetail::ModulesDetail( QWidget* parent, const char* name, WFlags fl )
55 SendButton->setText( tr( "Send" ) ); 58 SendButton->setText( tr( "Send" ) );
56 connect( SendButton, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) ); 59 connect( SendButton, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
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}
59 63
60ModulesDetail::~ModulesDetail() 64ModulesDetail::~ModulesDetail()
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
@@ -21,11 +21,12 @@
21 21
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
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
30#include "modulesinfo.h" 31#include "modulesinfo.h"
31 32
@@ -45,8 +46,9 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
45 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold ); 46 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
46 connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), 47 connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
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 );
51 connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) ); 53 connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
52 t->start( 5000 ); 54 t->start( 5000 );
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
@@ -23,14 +23,15 @@
23#include <signal.h> 23#include <signal.h>
24 24
25#include <qcombobox.h> 25#include <qcombobox.h>
26#include <qpushbutton.h>
27#include <qtextview.h>
28#include <qlayout.h> 26#include <qlayout.h>
29#include <qlistview.h> 27#include <qlistview.h>
30#include <qmessagebox.h> 28#include <qmessagebox.h>
29#include <qpushbutton.h>
30#include <qtextview.h>
31#include <qwhatsthis.h>
31 32
32ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl ) 33ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl )
33 : QWidget( parent, name, fl ) 34 : QWidget( parent, name, WStyle_ContextHelp )
34{ 35{
35 pid = 0; 36 pid = 0;
36 37
@@ -50,9 +51,11 @@ ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl )
50 SignalCB->insertItem( "18: SIGCONT" ); 51 SignalCB->insertItem( "18: SIGCONT" );
51 SignalCB->insertItem( "19: SIGSTOP" ); 52 SignalCB->insertItem( "19: SIGSTOP" );
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
54 ProcessView = new QTextView( this, "ProcessView" ); 56 ProcessView = new QTextView( this, "ProcessView" );
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
57 SendButton = new QPushButton( this, "SendButton" ); 60 SendButton = new QPushButton( this, "SendButton" );
58 SendButton->setMinimumSize( QSize( 50, 24 ) ); 61 SendButton->setMinimumSize( QSize( 50, 24 ) );
@@ -60,6 +63,7 @@ ProcessDetail::ProcessDetail( QWidget* parent, const char* name, WFlags fl )
60 SendButton->setText( tr( "Send" ) ); 63 SendButton->setText( tr( "Send" ) );
61 connect( SendButton, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) ); 64 connect( SendButton, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
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}
64 68
65ProcessDetail::~ProcessDetail() 69ProcessDetail::~ProcessDetail()
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
@@ -19,12 +19,13 @@
19 19
20#include <qpe/qpeapplication.h> 20#include <qpe/qpeapplication.h>
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
29#include "processinfo.h" 30#include "processinfo.h"
30 31
@@ -44,8 +45,8 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
44 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold ); 45 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
45 connect( ProcessView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), 46 connect( ProcessView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
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
50 QTimer *t = new QTimer( this ); 51 QTimer *t = new QTimer( this );
51 connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) ); 52 connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
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
@@ -51,21 +51,28 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
51 QString v; 51 QString v;
52 t >> v; t >> v; t >> v; 52 t >> v; t >> v; t >> v;
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();
58 } 61 }
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
63 QString builder = QPE_VENDOR; 67 QString builder = QPE_VENDOR;
64#else 68#else
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__ );
69 76
70 77
71 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 78 QHBoxLayout *hb1 = new QHBoxLayout( vb );
@@ -114,11 +121,15 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
114 palmtopLogo3->setFixedSize( 60, 60 ); 121 palmtopLogo3->setFixedSize( 60, 60 );
115 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); 122 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
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
123 QLabel *systemVersion = new QLabel( this ); 134 QLabel *systemVersion = new QLabel( this );
124 systemVersion->setText( systemString ); 135 systemVersion->setText( systemString );