author | mickeyl <mickeyl> | 2003-05-03 21:33:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-03 21:33:49 (UTC) |
commit | 031031a22a8482c674b250c9f32a758f11139aeb (patch) (unidiff) | |
tree | 79126fc719c74361eb1966d774cdf75c04c82a7c /noncore | |
parent | cbaa70d78b1dccce4dc54baba5fc35431467972f (diff) | |
download | opie-031031a22a8482c674b250c9f32a758f11139aeb.zip opie-031031a22a8482c674b250c9f32a758f11139aeb.tar.gz opie-031031a22a8482c674b250c9f32a758f11139aeb.tar.bz2 |
prepare for i18n
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 39 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/statwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 28 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 18 |
6 files changed, 78 insertions, 39 deletions
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 03da135..96ebb3f 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -57,5 +57,5 @@ int main( int argc, char **argv ) | |||
57 | { | 57 | { |
58 | qWarning( "Wellenreiter: trying to run as non-root!" ); | 58 | qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) ); |
59 | result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", "You have started Wellenreiter II\n" | 59 | result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n" |
60 | "as non-root. You will have\nonly limited functionality.\nProceed anyway?", | 60 | "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ), |
61 | QMessageBox::Yes, QMessageBox::No ); | 61 | QMessageBox::Yes, QMessageBox::No ); |
@@ -85,4 +85,4 @@ int main( int argc, char **argv ) | |||
85 | qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() ); | 85 | qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() ); |
86 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", "You have a dhcp client running.\n" | 86 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" |
87 | "This can severly limit scanning!\nShould I kill it for you?", | 87 | "This can severly limit scanning!\nShould I kill it for you?" ), |
88 | QMessageBox::Yes, QMessageBox::No ); | 88 | QMessageBox::Yes, QMessageBox::No ); |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 6cd364c..c4a8fbc 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -104,8 +104,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
104 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 104 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
105 | fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); | 105 | fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); |
106 | fileSave->insertItem( "&Text Log...", this, SLOT( fileSaveLog() ) ); | 106 | fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); |
107 | fileSave->insertItem( "&Hex Log...", this, SLOT( fileSaveHex() ) ); | 107 | fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); |
108 | 108 | ||
109 | QPopupMenu* fileLoad = new QPopupMenu( mb ); | 109 | QPopupMenu* fileLoad = new QPopupMenu( mb ); |
110 | fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); | 110 | fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); |
111 | //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); | 111 | //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); |
@@ -113,17 +113,17 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
113 | QPopupMenu* file = new QPopupMenu( mb ); | 113 | QPopupMenu* file = new QPopupMenu( mb ); |
114 | file->insertItem( "&New", this, SLOT( fileNew() ) ); | 114 | file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); |
115 | id = file->insertItem( "&Load", fileLoad ); | 115 | id = file->insertItem( tr( "&Load" ), fileLoad ); |
116 | file->insertItem( "&Save", fileSave ); | 116 | file->insertItem( tr( "&Save" ), fileSave ); |
117 | file->insertSeparator(); | 117 | file->insertSeparator(); |
118 | file->insertItem( "&Exit", qApp, SLOT( quit() ) ); | 118 | file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); |
119 | 119 | ||
120 | QPopupMenu* view = new QPopupMenu( mb ); | 120 | QPopupMenu* view = new QPopupMenu( mb ); |
121 | view->insertItem( "&Configure..." ); | 121 | view->insertItem( tr( "&Configure..." ) ); |
122 | 122 | ||
123 | QPopupMenu* sniffer = new QPopupMenu( mb ); | 123 | QPopupMenu* sniffer = new QPopupMenu( mb ); |
124 | sniffer->insertItem( "&Configure...", this, SLOT( showConfigure() ) ); | 124 | sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); |
125 | sniffer->insertSeparator(); | 125 | sniffer->insertSeparator(); |
126 | startID = sniffer->insertItem( "&Start", mw, SLOT( startClicked() ) ); | 126 | startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); |
127 | sniffer->setItemEnabled( startID, false ); | 127 | sniffer->setItemEnabled( startID, false ); |
128 | stopID = sniffer->insertItem( "Sto&p", mw, SLOT( stopClicked() ) ); | 128 | stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); |
129 | sniffer->setItemEnabled( stopID, false ); | 129 | sniffer->setItemEnabled( stopID, false ); |
@@ -131,9 +131,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
131 | QPopupMenu* demo = new QPopupMenu( mb ); | 131 | QPopupMenu* demo = new QPopupMenu( mb ); |
132 | demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) ); | 132 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); |
133 | 133 | ||
134 | id = mb->insertItem( "&File", file ); | 134 | id = mb->insertItem( tr( "&File" ), file ); |
135 | id = mb->insertItem( "&View", view ); | 135 | id = mb->insertItem( tr( "&View" ), view ); |
136 | mb->setItemEnabled( id, false ); | 136 | mb->setItemEnabled( id, false ); |
137 | id = mb->insertItem( "&Sniffer", sniffer ); | 137 | id = mb->insertItem( tr( "&Sniffer" ), sniffer ); |
138 | id = mb->insertItem( "&Demo", demo ); | 138 | id = mb->insertItem( tr( "&Demo" ), demo ); |
139 | mb->setItemEnabled( id, true ); | 139 | mb->setItemEnabled( id, true ); |
@@ -157,3 +157,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
157 | #ifndef QWS | 157 | #ifndef QWS |
158 | statusBar()->message( "Ready." ); | 158 | statusBar()->message( tr( "Ready." ) ); |
159 | #endif | 159 | #endif |
@@ -353,3 +353,4 @@ void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) | |||
353 | { | 353 | { |
354 | QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); | 354 | QMessageBox::warning( this, "Wellenreiter/Opie", |
355 | tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) ); | ||
355 | e->ignore(); | 356 | e->ignore(); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 1cf49e0..3a6aa15 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -55,5 +55,5 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) | |||
55 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); | 55 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); |
56 | addColumn( tr( "B" ) ); | 56 | addColumn( tr( "#" ) ); |
57 | setColumnAlignment( 1, AlignCenter ); | 57 | setColumnAlignment( 1, AlignCenter ); |
58 | addColumn( tr( "AP" ) ); | 58 | addColumn( tr( "MAC" ) ); |
59 | setColumnAlignment( 2, AlignCenter ); | 59 | setColumnAlignment( 2, AlignCenter ); |
@@ -150,2 +150,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
150 | s.sprintf( "(i) new network: '%s'", (const char*) essid ); | 150 | s.sprintf( "(i) new network: '%s'", (const char*) essid ); |
151 | //TODO send s to logwindow | ||
151 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); | 152 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); |
@@ -155,3 +156,2 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
155 | // insert new station as child from network | 156 | // insert new station as child from network |
156 | |||
157 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? | 157 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? |
@@ -172,2 +172,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
172 | } | 172 | } |
173 | //TODO send s to logwindow | ||
173 | 174 | ||
@@ -200,2 +201,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons | |||
200 | station->setManufacturer( _manufacturerdb->lookup( addr ) ); | 201 | station->setManufacturer( _manufacturerdb->lookup( addr ) ); |
202 | |||
203 | QString s; | ||
204 | if ( type == "station" ) | ||
205 | { | ||
206 | s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) ); | ||
207 | } | ||
208 | else | ||
209 | { | ||
210 | s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) ); | ||
211 | } | ||
212 | //TODO send s to logwindow | ||
201 | } | 213 | } |
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp index 2c8c774..a9ae661 100644 --- a/noncore/net/wellenreiter/gui/statwindow.cpp +++ b/noncore/net/wellenreiter/gui/statwindow.cpp | |||
@@ -22,4 +22,4 @@ MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) | |||
22 | table = new OListView( this ); | 22 | table = new OListView( this ); |
23 | table->addColumn( "Protocol" ); | 23 | table->addColumn( tr( "Protocol" ) ); |
24 | table->addColumn( "Count" ); | 24 | table->addColumn( tr( "Count" ) ); |
25 | table->setItemMargin( 2 ); | 25 | table->setItemMargin( 2 ); |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index c061319..62bda91 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -170,7 +170,11 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
170 | 170 | ||
171 | // do we have a prism header? | 171 | // update graph window |
172 | if ( ds ) | ||
173 | { | ||
172 | OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); | 174 | OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); |
173 | if ( ds && prism ) | 175 | if ( prism ) |
174 | graphwindow->traffic( ds->channel(), prism->signalStrength() ); | 176 | graphwindow->traffic( ds->channel(), prism->signalStrength() ); |
175 | 177 | else | |
178 | graphwindow->traffic( ds->channel(), 95 ); | ||
179 | } | ||
176 | return; | 180 | return; |
@@ -261,3 +265,4 @@ void Wellenreiter::stopClicked() | |||
261 | // message the user | 265 | // message the user |
262 | QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." ); | 266 | QMessageBox::information( this, "Wellenreiter II", |
267 | tr( "Your wireless card\nshould now be usable again." ) ); | ||
263 | 268 | ||
@@ -282,3 +287,4 @@ void Wellenreiter::startClicked() | |||
282 | { | 287 | { |
283 | QMessageBox::information( this, "Wellenreiter II", "Your device is not\nproperly configured. Please reconfigure!" ); | 288 | QMessageBox::information( this, "Wellenreiter II", |
289 | tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); | ||
284 | return; | 290 | return; |
@@ -299,3 +305,3 @@ void Wellenreiter::startClicked() | |||
299 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; | 305 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; |
300 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break; | 306 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; |
301 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; | 307 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; |
@@ -311,3 +317,4 @@ void Wellenreiter::startClicked() | |||
311 | { | 317 | { |
312 | QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." ); | 318 | QMessageBox::warning( this, "Wellenreiter II", |
319 | tr( "Can't set device into monitor mode." ) ); | ||
313 | return; | 320 | return; |
@@ -319,3 +326,3 @@ void Wellenreiter::startClicked() | |||
319 | { | 326 | { |
320 | if ( configwindow->writeCaptureFile->isEnabled() ) | 327 | if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!? |
321 | { | 328 | { |
@@ -339,3 +346,4 @@ void Wellenreiter::startClicked() | |||
339 | { | 346 | { |
340 | QMessageBox::warning( this, "Wellenreiter II", "Can't open packet capturer:\n" + QString(strerror( errno ) )); | 347 | QMessageBox::warning( this, "Wellenreiter II", |
348 | tr( "Can't open packet capturer:\n" ) + QString(strerror( errno ) )); | ||
341 | return; | 349 | return; |
@@ -369,3 +377,3 @@ void Wellenreiter::startClicked() | |||
369 | assert( parent() ); | 377 | assert( parent() ); |
370 | ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." ); | 378 | ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) ); |
371 | } | 379 | } |
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index eb60c4a..7085c5a 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro | |||
@@ -14 +14,19 @@ contains( platform, x11 ) { | |||
14 | 14 | ||
15 | TRANSLATIONS = ../../../i18n/de/wellenreiter.ts \ | ||
16 | ../../../i18n/nl/wellenreiter.ts \ | ||
17 | ../../../i18n/da/wellenreiter.ts \ | ||
18 | ../../../i18n/xx/wellenreiter.ts \ | ||
19 | ../../../i18n/en/wellenreiter.ts \ | ||
20 | ../../../i18n/es/wellenreiter.ts \ | ||
21 | ../../../i18n/fr/wellenreiter.ts \ | ||
22 | ../../../i18n/hu/wellenreiter.ts \ | ||
23 | ../../../i18n/ja/wellenreiter.ts \ | ||
24 | ../../../i18n/ko/wellenreiter.ts \ | ||
25 | ../../../i18n/no/wellenreiter.ts \ | ||
26 | ../../../i18n/pl/wellenreiter.ts \ | ||
27 | ../../../i18n/pt/wellenreiter.ts \ | ||
28 | ../../../i18n/pt_BR/wellenreiter.ts \ | ||
29 | ../../../i18n/sl/wellenreiter.ts \ | ||
30 | ../../../i18n/zh_CN/wellenreiter.ts \ | ||
31 | ../../../i18n/zh_TW/wellenreiter.ts | ||
32 | |||