summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp56
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h8
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp24
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
@@ -58,11 +58,4 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
#endif
- // setup icon sets
-
- infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
- settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
- startIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
- stopIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
-
// setup tool buttons
@@ -71,5 +64,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
startButton->setAutoRaise( true );
#endif
- startButton->setIconSet( *startIconSet );
+ startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
startButton->setEnabled( false );
connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
@@ -79,22 +72,23 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
stopButton->setAutoRaise( true );
#endif
- stopButton->setIconSet( *stopIconSet );
+ stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
stopButton->setEnabled( false );
connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
- QToolButton* c = new QToolButton( 0 );
- #ifdef QWS
- c->setAutoRaise( true );
- #endif
- c->setIconSet( *infoIconSet );
- c->setEnabled( false );
-
QToolButton* d = new QToolButton( 0 );
#ifdef QWS
d->setAutoRaise( true );
#endif
- d->setIconSet( *settingsIconSet );
+ d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
+ uploadButton = new QToolButton( 0 );
+ #ifdef QWS
+ uploadButton->setAutoRaise( true );
+ #endif
+ uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
+ uploadButton->setEnabled( false );
+ connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
+
// setup menu bar
@@ -117,4 +111,6 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
file->insertItem( tr( "&Save" ), fileSave );
file->insertSeparator();
+ uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
+ file->insertSeparator();
file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
@@ -140,13 +136,14 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
id = mb->insertItem( tr( "&Demo" ), demo );
mb->setItemEnabled( id, true );
+ mb->setItemEnabled( uploadID, false );
#ifdef QWS
mb->insertItem( startButton );
mb->insertItem( stopButton );
- mb->insertItem( c );
+ mb->insertItem( uploadButton );
mb->insertItem( d );
#else // Qt3 changed the insertion order. It's now totally random :(
mb->insertItem( d );
- mb->insertItem( c );
+ mb->insertItem( uploadButton );
mb->insertItem( stopButton );
mb->insertItem( startButton );
@@ -180,5 +177,4 @@ void WellenreiterMainWindow::showConfigure()
-
void WellenreiterMainWindow::updateToolButtonState()
{
@@ -205,4 +201,10 @@ void WellenreiterMainWindow::changedSniffingState()
stopButton->setEnabled( mw->sniffing );
menuBar()->setItemEnabled( stopID, mw->sniffing );
+
+ if ( !mw->sniffing )
+ {
+ menuBar()->setItemEnabled( uploadID, true );
+ uploadButton->setEnabled( true );
+ }
}
@@ -210,10 +212,8 @@ void WellenreiterMainWindow::changedSniffingState()
WellenreiterMainWindow::~WellenreiterMainWindow()
{
- delete infoIconSet;
- delete settingsIconSet;
- delete startIconSet;
- delete stopIconSet;
+ qDebug( "Wellenreiter:: bye." );
};
+
void WellenreiterMainWindow::demoAddStations()
{
@@ -344,4 +344,5 @@ void WellenreiterMainWindow::fileLoadSession()
}
+
void WellenreiterMainWindow::fileNew()
{
@@ -351,4 +352,5 @@ void WellenreiterMainWindow::fileNew()
}
+
void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
{
@@ -366,2 +368,8 @@ void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
+void WellenreiterMainWindow::uploadSession()
+{
+ QMessageBox::warning( this, "Wellenreiter/Opie",
+ tr( "This feature is\nunder construction... ;-)" ) );
+}
+
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
@@ -37,13 +37,10 @@ class WellenreiterMainWindow: public QMainWindow
WellenreiterConfigWindow* cw;
- const QIconSet* startIconSet;
- const QIconSet* stopIconSet;
- const QIconSet* infoIconSet;
- const QIconSet* settingsIconSet;
-
QToolButton* startButton;
QToolButton* stopButton;
+ QToolButton* uploadButton;
int startID;
int stopID;
+ int uploadID;
protected:
@@ -59,4 +56,5 @@ class WellenreiterMainWindow: public QMainWindow
void fileLoadSession();
void fileNew();
+ void uploadSession();
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
@@ -303,5 +303,5 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
// if so, do what the user requested (protocolAction), e.g. pass or discard
if ( !configwindow->writeCaptureFile->isChecked() )
- return false;
+ return true; // semantic change - we're logging anyway now to /tmp/wellenreiter
QObjectList* l = p->queryList();
@@ -507,26 +507,26 @@ void Wellenreiter::startClicked()
// open pcap and start sniffing
- if ( cardtype != DEVTYPE_FILE )
- {
- pcap->open( interface );
- if ( configwindow->writeCaptureFile->isChecked() )
+ QString dumpname;
+ if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
{
- QString dumpname( configwindow->captureFileName->text() );
+ dumpname = configwindow->captureFileName->text();
if ( dumpname.isEmpty() ) dumpname = "captureFile";
dumpname.append( '-' );
dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
dumpname.append( ".wellenreiter" );
- pcap->openDumpFile( dumpname );
}
- else
+ else // write it anyway ;)
{
- pcap->open( interface );
- }
+ dumpname = "/var/log/dump.wellenreiter";
}
+
+ if ( cardtype != DEVTYPE_FILE )
+ pcap->open( interface );
else
- {
pcap->open( QFile( interface ) );
- }
+
+ qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname );
+ pcap->openDumpFile( dumpname );
if ( !pcap->isOpen() )