7 files changed, 185 insertions, 42 deletions
diff --git a/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control b/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control index 902ebff..7e904bb 100644 --- a/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control +++ b/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control | |||
@@ -1,2 +1,2 @@ | |||
1 | Package: opie-networksettings2plugin-GPRS | 1 | Package: opie-networksettings2plugin-gprs |
2 | Files: plugins/networksettings2/libGPRS.so* | 2 | Files: plugins/networksettings2/libGPRS.so* |
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index 141484c..9512579 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp | |||
@@ -46,3 +46,2 @@ static char Dig2Hex[] = { | |||
46 | System::System( void ) : QObject(), ProbedInterfaces() { | 46 | System::System( void ) : QObject(), ProbedInterfaces() { |
47 | probeInterfaces(); | ||
48 | } | 47 | } |
@@ -54,3 +53,10 @@ System::~System( void ) { | |||
54 | 53 | ||
55 | int System::runAsRoot( QStringList & S ) { | 54 | QDict<InterfaceInfo> & System::interfaces( void ) { |
55 | if( ProbedInterfaces.count() == 0 ) { | ||
56 | probeInterfaces(); | ||
57 | } | ||
58 | return ProbedInterfaces; | ||
59 | } | ||
60 | |||
61 | int System::runAsRoot( QStringList & S, MyProcess * Prc ) { | ||
56 | char * usr = getenv("USER"); | 62 | char * usr = getenv("USER"); |
@@ -71,21 +77,27 @@ int System::runAsRoot( QStringList & S ) { | |||
71 | } else { | 77 | } else { |
72 | MyProcess * P = new MyProcess(); | 78 | MyProcess * P; |
73 | emit processEvent( tr("Command : ") + S.join( " " ) ); | ||
74 | 79 | ||
75 | P->process() << S; | 80 | if( Prc ) { |
76 | 81 | P = Prc; | |
77 | connect( P, | 82 | } else { |
78 | SIGNAL( stdoutLine( const QString & ) ), | 83 | P = new MyProcess(); |
79 | this, | 84 | emit processEvent( tr("Command : ") + S.join( " " ) ); |
80 | SIGNAL( stdoutLine( const QString & ) ) ); | 85 | |
81 | 86 | connect( P, | |
82 | connect( P, | 87 | SIGNAL( stdoutLine( const QString & ) ), |
83 | SIGNAL( stderrLine( const QString & ) ), | 88 | this, |
84 | this, | 89 | SIGNAL( stdoutLine( const QString & ) ) ); |
85 | SIGNAL( stderrLine( const QString & ) ) ); | 90 | |
91 | connect( P, | ||
92 | SIGNAL( stderrLine( const QString & ) ), | ||
93 | this, | ||
94 | SIGNAL( stderrLine( const QString & ) ) ); | ||
95 | |||
96 | connect( P, | ||
97 | SIGNAL(processExited(MyProcess*) ), | ||
98 | this, SLOT | ||
99 | (SLOT_ProcessExited(MyProcess*) ) ); | ||
100 | } | ||
86 | 101 | ||
87 | connect( P, | 102 | P->process() << S; |
88 | SIGNAL(processExited(MyProcess*) ), | ||
89 | this, SLOT | ||
90 | (SLOT_ProcessExited(MyProcess*) ) ); | ||
91 | 103 | ||
@@ -96,3 +108,4 @@ int System::runAsRoot( QStringList & S ) { | |||
96 | owarn << "Error starting " << S << oendl; | 108 | owarn << "Error starting " << S << oendl; |
97 | delete P; | 109 | if( ! Prc ) |
110 | delete P; | ||
98 | // error starting app | 111 | // error starting app |
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h index e67d695..f7a7274 100644 --- a/noncore/settings/networksettings2/networksettings2/system.h +++ b/noncore/settings/networksettings2/networksettings2/system.h | |||
@@ -98,9 +98,8 @@ public : | |||
98 | 98 | ||
99 | QDict<InterfaceInfo> & interfaces( void ) | 99 | QDict<InterfaceInfo> & interfaces( void ); |
100 | { return ProbedInterfaces; } | ||
101 | InterfaceInfo * interface( const QString& N ) | 100 | InterfaceInfo * interface( const QString& N ) |
102 | { return ProbedInterfaces[N]; } | 101 | { return interfaces()[N]; } |
103 | 102 | ||
104 | // exec command as root | 103 | // exec command as root |
105 | int runAsRoot( QStringList & S ); | 104 | int runAsRoot( QStringList & S, MyProcess * Prc = 0 ); |
106 | 105 | ||
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp index 2d4885c..5a890da 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp | |||
@@ -2,2 +2,4 @@ | |||
2 | #include <opie2/oledbox.h> | 2 | #include <opie2/oledbox.h> |
3 | #include <opie2/ofiledialog.h> | ||
4 | |||
3 | using namespace Opie::Core; | 5 | using namespace Opie::Core; |
@@ -6,16 +8,18 @@ using namespace Opie::Ui; | |||
6 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qapplication.h> | ||
7 | #include <qcheckbox.h> | 10 | #include <qcheckbox.h> |
11 | #include <qcombobox.h> | ||
12 | #include <qdialog.h> | ||
13 | #include <qdir.h> | ||
14 | #include <qfile.h> | ||
8 | #include <qgroupbox.h> | 15 | #include <qgroupbox.h> |
9 | #include <qlabel.h> | ||
10 | #include <qprogressbar.h> | ||
11 | #include <qheader.h> | 16 | #include <qheader.h> |
12 | #include <qmessagebox.h> | ||
13 | #include <qapplication.h> | ||
14 | #include <qlistbox.h> | ||
15 | #include <qdialog.h> | ||
16 | #include <qlayout.h> | ||
17 | #include <qcombobox.h> | ||
18 | #include <qlabel.h> | 17 | #include <qlabel.h> |
18 | #include <qlayout.h> | ||
19 | #include <qlistbox.h> | ||
19 | #include <qlistview.h> | 20 | #include <qlistview.h> |
21 | #include <qmessagebox.h> | ||
22 | #include <qprogressbar.h> | ||
20 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | #include <qtextstream.h> | ||
21 | 25 | ||
@@ -29,2 +33,4 @@ using namespace Opie::Ui; | |||
29 | 33 | ||
34 | #include <system.h> | ||
35 | |||
30 | using namespace Opietooth2; | 36 | using namespace Opietooth2; |
@@ -115,3 +121,4 @@ OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { | |||
115 | OT = OTGateway::getOTGateway(); | 121 | OT = OTGateway::getOTGateway(); |
116 | 122 | HciDump = 0; | |
123 | Sys = new System(); | ||
117 | } | 124 | } |
@@ -119,5 +126,108 @@ OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { | |||
119 | OTSniffing::~OTSniffing() { | 126 | OTSniffing::~OTSniffing() { |
127 | printf( "CLOSE \n" ); | ||
128 | if ( HciDump ) { | ||
129 | HciDump->process().kill(); | ||
130 | delete HciDump; | ||
131 | } | ||
132 | delete Sys; | ||
120 | } | 133 | } |
121 | 134 | ||
122 | void OTSniffing::SLOT_Trace( void ) { | 135 | void OTSniffing::SLOT_Trace( bool ) { |
136 | HciDump = new MyProcess(); | ||
137 | QStringList SL; | ||
138 | |||
139 | SL << "hcidump"; | ||
140 | switch( DataFormat_CB->currentItem() ) { | ||
141 | case 0 : // Hex | ||
142 | SL << "-x"; | ||
143 | break; | ||
144 | case 1 : // Ascii | ||
145 | SL << "-a"; | ||
146 | break; | ||
147 | case 2 : // both | ||
148 | SL << "-X"; | ||
149 | break; | ||
150 | } | ||
151 | |||
152 | SL << "-i"; | ||
153 | SL << OT->scanWith()->devname(); | ||
154 | |||
155 | connect( HciDump, | ||
156 | SIGNAL( stdoutLine( const QString & ) ), | ||
157 | this, | ||
158 | SLOT( SLOT_Show( const QString & ) ) ); | ||
159 | |||
160 | connect( HciDump, | ||
161 | SIGNAL(processExited(MyProcess*) ), | ||
162 | this, | ||
163 | SLOT( SLOT_ProcessExited(MyProcess*) ) ); | ||
164 | |||
165 | if( ! Sys->runAsRoot( SL, HciDump ) ) { | ||
166 | QMessageBox::warning(0, | ||
167 | tr("Run hcidump"), | ||
168 | tr("Cannot start %1").arg(SL.join(" ")) | ||
169 | ); | ||
170 | delete HciDump; | ||
171 | HciDump = 0; | ||
172 | } | ||
173 | |||
174 | } | ||
175 | |||
176 | void OTSniffing::SLOT_Show( const QString & S ) { | ||
177 | printf( "%s\n", S.latin1() ); | ||
178 | Output_LB->insertItem( S ); | ||
179 | Output_LB->setCurrentItem( Output_LB->count()-1 ); | ||
180 | Output_LB->ensureCurrentVisible(); | ||
181 | } | ||
182 | |||
183 | void OTSniffing::SLOT_ProcessExited( MyProcess * ) { | ||
184 | printf( "Exited\n" ); | ||
185 | delete HciDump; | ||
186 | HciDump = 0; | ||
187 | } | ||
188 | |||
189 | void OTSniffing::SLOT_Save( void ) { | ||
190 | QString S = OFileDialog::getSaveFileName( | ||
191 | OFileSelector::Extended, | ||
192 | QDir::home().path(), | ||
193 | QString::null, | ||
194 | MimeTypes(), | ||
195 | this ); | ||
196 | |||
197 | if( ! S.isEmpty() ) { | ||
198 | QFile F( S ); | ||
199 | if( ! F.open( IO_WriteOnly ) ) { | ||
200 | QMessageBox::warning(0, | ||
201 | tr("Save log"), | ||
202 | tr("Cannot open %1").arg(S) | ||
203 | ); | ||
204 | return; | ||
205 | } | ||
206 | QTextStream TS( &F ); | ||
207 | TS << S << endl; | ||
208 | } | ||
209 | } | ||
210 | |||
211 | void OTSniffing::SLOT_Load( void ) { | ||
212 | QString S = OFileDialog::getOpenFileName( | ||
213 | OFileSelector::Extended, | ||
214 | QDir::home().path(), | ||
215 | QString::null, | ||
216 | MimeTypes(), | ||
217 | this ); | ||
218 | |||
219 | if( ! S.isEmpty() ) { | ||
220 | QFile F( S ); | ||
221 | if( ! F.open( IO_ReadOnly ) ) { | ||
222 | QMessageBox::warning(0, | ||
223 | tr("Save log"), | ||
224 | tr("Cannot open %1").arg(S) | ||
225 | ); | ||
226 | return; | ||
227 | } | ||
228 | QTextStream TS ( &F ); | ||
229 | SLOT_ClearLog(); | ||
230 | S = TS.read(); | ||
231 | Output_LB->insertStringList( QStringList::split( "\n", S ) ); | ||
232 | } | ||
123 | } | 233 | } |
@@ -125,2 +235,3 @@ void OTSniffing::SLOT_Trace( void ) { | |||
125 | void OTSniffing::SLOT_ClearLog( void ) { | 235 | void OTSniffing::SLOT_ClearLog( void ) { |
236 | Output_LB->clear(); | ||
126 | } | 237 | } |
@@ -1031,3 +1142,6 @@ void OTMain::SLOT_Sniffing( void ) { | |||
1031 | if( SnifWindow == 0 ) { | 1142 | if( SnifWindow == 0 ) { |
1032 | SnifWindow = new OTSniffing( this ); | 1143 | SnifWindow = new QDialog( this, 0, FALSE ); |
1144 | QVBoxLayout * V = new QVBoxLayout( SnifWindow ); | ||
1145 | OTSniffing * SN = new OTSniffing( SnifWindow ); | ||
1146 | V->addWidget( SN ); | ||
1033 | } | 1147 | } |
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h index 211ae65..2b20975 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.h +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h | |||
@@ -5,3 +5,14 @@ | |||
5 | 5 | ||
6 | namespace Opie { namespace Ui { class OLedBox; }; }; | 6 | class MyProcess; |
7 | class System; | ||
8 | |||
9 | namespace Opie { | ||
10 | |||
11 | namespace Ui { | ||
12 | |||
13 | class OLedBox; | ||
14 | |||
15 | }; | ||
16 | |||
17 | }; | ||
7 | 18 | ||
@@ -27,4 +38,8 @@ private slots : | |||
27 | 38 | ||
28 | void SLOT_Trace( void ); | 39 | void SLOT_Trace( bool ); |
29 | void SLOT_ClearLog( void ); | 40 | void SLOT_ClearLog( void ); |
41 | void SLOT_Load( void ); | ||
42 | void SLOT_Save( void ); | ||
43 | void SLOT_ProcessExited( MyProcess * ); | ||
44 | void SLOT_Show( const QString & ); | ||
30 | 45 | ||
@@ -37,2 +52,4 @@ private : | |||
37 | OTGateway * OT; | 52 | OTGateway * OT; |
53 | MyProcess * HciDump; | ||
54 | System * Sys; | ||
38 | }; | 55 | }; |
@@ -219,3 +236,3 @@ private : | |||
219 | OTGateway * OT; | 236 | OTGateway * OT; |
220 | OTSniffing * SnifWindow; | 237 | QDialog * SnifWindow; |
221 | }; | 238 | }; |
diff --git a/noncore/settings/networksettings2/opietooth2/libopietooth2.control b/noncore/settings/networksettings2/opietooth2/libopietooth2.control index fd01fb5..c2c8eb8 100644 --- a/noncore/settings/networksettings2/opietooth2/libopietooth2.control +++ b/noncore/settings/networksettings2/opietooth2/libopietooth2.control | |||
@@ -7,3 +7,3 @@ Architecture: arm | |||
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: task-opie-minimal, libbluetooth1, opie-bluepin | opie-multiauth-bluepingplugin, bluez-utils-nodbus | 8 | Depends: task-opie-minimal, opie-networksettings2, libbluetooth1, opie-bluepin | opie-multiauth-bluepingplugin, bluez-utils-nodbus |
9 | Description: Opie bluetooth support library version 2 | 9 | Description: Opie bluetooth support library version 2 |
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro index cfb527d..e0057a9 100644 --- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro +++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro | |||
@@ -29,5 +29,5 @@ SOURCES = OTDevice.cpp \ | |||
29 | Opietooth.cpp | 29 | Opietooth.cpp |
30 | INCLUDEPATH+= $(OPIEDIR)/include | 30 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 |
31 | DEPENDPATH+= $(OPIEDIR)/include | 31 | DEPENDPATH+= $(OPIEDIR)/include |
32 | LIBS += -lqpe -lopiecore2 -lbluetooth | 32 | LIBS += -lqpe -lopiecore2 -lbluetooth -lnetworksettings2 |
33 | INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui | 33 | INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui |