author | mickeyl <mickeyl> | 2003-12-09 21:33:48 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-09 21:33:48 (UTC) |
commit | 0a1f6405780b18c9f3d953adcfd072de8fd4dc18 (patch) (unidiff) | |
tree | b155d2ee3c7766155b028f4e8ee92599fd50e8a9 | |
parent | dc1fc74ee3988fb3a89f6fc46cbcfe8b74416647 (diff) | |
download | opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.zip opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.tar.gz opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.tar.bz2 |
misc. fixes and preparations for uploading dumps
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 56 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 24 |
3 files changed, 47 insertions, 41 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 868b0b0..ab7e0c7 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -59,9 +59,2 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
59 | 59 | ||
60 | // setup icon sets | ||
61 | |||
62 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); | ||
63 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); | ||
64 | startIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | ||
65 | stopIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); | ||
66 | |||
67 | // setup tool buttons | 60 | // setup tool buttons |
@@ -72,3 +65,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
72 | #endif | 65 | #endif |
73 | startButton->setIconSet( *startIconSet ); | 66 | startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); |
74 | startButton->setEnabled( false ); | 67 | startButton->setEnabled( false ); |
@@ -80,3 +73,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
80 | #endif | 73 | #endif |
81 | stopButton->setIconSet( *stopIconSet ); | 74 | stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); |
82 | stopButton->setEnabled( false ); | 75 | stopButton->setEnabled( false ); |
@@ -84,9 +77,2 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
84 | 77 | ||
85 | QToolButton* c = new QToolButton( 0 ); | ||
86 | #ifdef QWS | ||
87 | c->setAutoRaise( true ); | ||
88 | #endif | ||
89 | c->setIconSet( *infoIconSet ); | ||
90 | c->setEnabled( false ); | ||
91 | |||
92 | QToolButton* d = new QToolButton( 0 ); | 78 | QToolButton* d = new QToolButton( 0 ); |
@@ -95,5 +81,13 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
95 | #endif | 81 | #endif |
96 | d->setIconSet( *settingsIconSet ); | 82 | d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); |
97 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); | 83 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); |
98 | 84 | ||
85 | uploadButton = new QToolButton( 0 ); | ||
86 | #ifdef QWS | ||
87 | uploadButton->setAutoRaise( true ); | ||
88 | #endif | ||
89 | uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); | ||
90 | uploadButton->setEnabled( false ); | ||
91 | connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); | ||
92 | |||
99 | // setup menu bar | 93 | // setup menu bar |
@@ -118,2 +112,4 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
118 | file->insertSeparator(); | 112 | file->insertSeparator(); |
113 | uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) ); | ||
114 | file->insertSeparator(); | ||
119 | file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); | 115 | file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); |
@@ -141,2 +137,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
141 | mb->setItemEnabled( id, true ); | 137 | mb->setItemEnabled( id, true ); |
138 | mb->setItemEnabled( uploadID, false ); | ||
142 | 139 | ||
@@ -145,3 +142,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
145 | mb->insertItem( stopButton ); | 142 | mb->insertItem( stopButton ); |
146 | mb->insertItem( c ); | 143 | mb->insertItem( uploadButton ); |
147 | mb->insertItem( d ); | 144 | mb->insertItem( d ); |
@@ -149,3 +146,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
149 | mb->insertItem( d ); | 146 | mb->insertItem( d ); |
150 | mb->insertItem( c ); | 147 | mb->insertItem( uploadButton ); |
151 | mb->insertItem( stopButton ); | 148 | mb->insertItem( stopButton ); |
@@ -181,3 +178,2 @@ void WellenreiterMainWindow::showConfigure() | |||
181 | 178 | ||
182 | |||
183 | void WellenreiterMainWindow::updateToolButtonState() | 179 | void WellenreiterMainWindow::updateToolButtonState() |
@@ -206,2 +202,8 @@ void WellenreiterMainWindow::changedSniffingState() | |||
206 | menuBar()->setItemEnabled( stopID, mw->sniffing ); | 202 | menuBar()->setItemEnabled( stopID, mw->sniffing ); |
203 | |||
204 | if ( !mw->sniffing ) | ||
205 | { | ||
206 | menuBar()->setItemEnabled( uploadID, true ); | ||
207 | uploadButton->setEnabled( true ); | ||
208 | } | ||
207 | } | 209 | } |
@@ -211,8 +213,6 @@ WellenreiterMainWindow::~WellenreiterMainWindow() | |||
211 | { | 213 | { |
212 | delete infoIconSet; | 214 | qDebug( "Wellenreiter:: bye." ); |
213 | delete settingsIconSet; | ||
214 | delete startIconSet; | ||
215 | delete stopIconSet; | ||
216 | }; | 215 | }; |
217 | 216 | ||
217 | |||
218 | void WellenreiterMainWindow::demoAddStations() | 218 | void WellenreiterMainWindow::demoAddStations() |
@@ -345,2 +345,3 @@ void WellenreiterMainWindow::fileLoadSession() | |||
345 | 345 | ||
346 | |||
346 | void WellenreiterMainWindow::fileNew() | 347 | void WellenreiterMainWindow::fileNew() |
@@ -352,2 +353,3 @@ void WellenreiterMainWindow::fileNew() | |||
352 | 353 | ||
354 | |||
353 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) | 355 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) |
@@ -367 +369,7 @@ void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) | |||
367 | 369 | ||
370 | void WellenreiterMainWindow::uploadSession() | ||
371 | { | ||
372 | QMessageBox::warning( this, "Wellenreiter/Opie", | ||
373 | tr( "This feature is\nunder construction... ;-)" ) ); | ||
374 | } | ||
375 | |||
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index 926bb0a..8d4e768 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h | |||
@@ -38,11 +38,8 @@ class WellenreiterMainWindow: public QMainWindow | |||
38 | 38 | ||
39 | const QIconSet* startIconSet; | ||
40 | const QIconSet* stopIconSet; | ||
41 | const QIconSet* infoIconSet; | ||
42 | const QIconSet* settingsIconSet; | ||
43 | |||
44 | QToolButton* startButton; | 39 | QToolButton* startButton; |
45 | QToolButton* stopButton; | 40 | QToolButton* stopButton; |
41 | QToolButton* uploadButton; | ||
46 | int startID; | 42 | int startID; |
47 | int stopID; | 43 | int stopID; |
44 | int uploadID; | ||
48 | 45 | ||
@@ -60,2 +57,3 @@ class WellenreiterMainWindow: public QMainWindow | |||
60 | void fileNew(); | 57 | void fileNew(); |
58 | void uploadSession(); | ||
61 | void changedSniffingState(); | 59 | void changedSniffingState(); |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 1d4a98b..ec89f1e 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -304,3 +304,3 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
304 | if ( !configwindow->writeCaptureFile->isChecked() ) | 304 | if ( !configwindow->writeCaptureFile->isChecked() ) |
305 | return false; | 305 | return true; // semantic change - we're logging anyway now to /tmp/wellenreiter |
306 | 306 | ||
@@ -508,9 +508,7 @@ void Wellenreiter::startClicked() | |||
508 | // open pcap and start sniffing | 508 | // open pcap and start sniffing |
509 | if ( cardtype != DEVTYPE_FILE ) | ||
510 | { | ||
511 | pcap->open( interface ); | ||
512 | 509 | ||
513 | if ( configwindow->writeCaptureFile->isChecked() ) | 510 | QString dumpname; |
511 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? | ||
514 | { | 512 | { |
515 | QString dumpname( configwindow->captureFileName->text() ); | 513 | dumpname = configwindow->captureFileName->text(); |
516 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; | 514 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; |
@@ -519,13 +517,15 @@ void Wellenreiter::startClicked() | |||
519 | dumpname.append( ".wellenreiter" ); | 517 | dumpname.append( ".wellenreiter" ); |
520 | pcap->openDumpFile( dumpname ); | ||
521 | } | 518 | } |
522 | else | 519 | else // write it anyway ;) |
523 | { | 520 | { |
524 | pcap->open( interface ); | 521 | dumpname = "/var/log/dump.wellenreiter"; |
525 | } | ||
526 | } | 522 | } |
523 | |||
524 | if ( cardtype != DEVTYPE_FILE ) | ||
525 | pcap->open( interface ); | ||
527 | else | 526 | else |
528 | { | ||
529 | pcap->open( QFile( interface ) ); | 527 | pcap->open( QFile( interface ) ); |
530 | } | 528 | |
529 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); | ||
530 | pcap->openDumpFile( dumpname ); | ||
531 | 531 | ||