author | drw <drw> | 2005-06-15 19:17:11 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 19:17:11 (UTC) |
commit | 1be8e6534619e409f51af90695dc00373d5a1e59 (patch) (unidiff) | |
tree | 534f98ceccfa378667620632a92f81c45627c393 | |
parent | b86723182311fa621451c2641acf62b3b89dceeb (diff) | |
download | opie-1be8e6534619e409f51af90695dc00373d5a1e59.zip opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.gz opie-1be8e6534619e409f51af90695dc00373d5a1e59.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 17 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 12 |
3 files changed, 23 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 3e18531..ccb3ec0 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -1,157 +1,162 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "configwindow.h" | 16 | #include "configwindow.h" |
17 | #include "gps.h" | 17 | #include "gps.h" |
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | #include "packetview.h" | 19 | #include "packetview.h" |
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | #include "wellenreiter.h" | 21 | #include "wellenreiter.h" |
22 | #include "scanlist.h" | 22 | #include "scanlist.h" |
23 | 23 | ||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #ifdef QWS | 25 | #ifdef QWS |
26 | #include <qpe/resource.h> | 26 | #include <opie2/oresource.h> |
27 | #include <opie2/odebug.h> | 27 | #include <opie2/odebug.h> |
28 | #include <opie2/ofiledialog.h> | 28 | #include <opie2/ofiledialog.h> |
29 | #else | 29 | #else |
30 | #include "resource.h" | 30 | #include "resource.h" |
31 | #include <qapplication.h> | 31 | #include <qapplication.h> |
32 | #include <qfiledialog.h> | 32 | #include <qfiledialog.h> |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qcombobox.h> | 36 | #include <qcombobox.h> |
37 | #include <qdatastream.h> | 37 | #include <qdatastream.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qfileinfo.h> | 39 | #include <qfileinfo.h> |
40 | #include <qlabel.h> | 40 | #include <qlabel.h> |
41 | #include <qlayout.h> | 41 | #include <qlayout.h> |
42 | #include <qlineedit.h> | 42 | #include <qlineedit.h> |
43 | #include <qiconset.h> | 43 | #include <qiconset.h> |
44 | #include <qmenubar.h> | 44 | #include <qmenubar.h> |
45 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
46 | #include <qpopupmenu.h> | 46 | #include <qpopupmenu.h> |
47 | #include <qpushbutton.h> | 47 | #include <qpushbutton.h> |
48 | #include <qstatusbar.h> | 48 | #include <qstatusbar.h> |
49 | #include <qspinbox.h> | 49 | #include <qspinbox.h> |
50 | #include <qtextstream.h> | 50 | #include <qtextstream.h> |
51 | #include <qtoolbutton.h> | 51 | #include <qtoolbutton.h> |
52 | #include <qwhatsthis.h> | 52 | #include <qwhatsthis.h> |
53 | 53 | ||
54 | /* STD */ | 54 | /* STD */ |
55 | #include <unistd.h> | 55 | #include <unistd.h> |
56 | 56 | ||
57 | using namespace Opie::Core; | 57 | using namespace Opie::Core; |
58 | using namespace Opie::Net; | 58 | using namespace Opie::Net; |
59 | using namespace Opie::Ui; | 59 | using namespace Opie::Ui; |
60 | 60 | ||
61 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 61 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
62 | :QMainWindow( parent, name, f ) | 62 | :QMainWindow( parent, name, f ) |
63 | { | 63 | { |
64 | cw = new WellenreiterConfigWindow( this ); | 64 | cw = new WellenreiterConfigWindow( this ); |
65 | mw = new Wellenreiter( this ); | 65 | mw = new Wellenreiter( this ); |
66 | mw->setConfigWindow( cw ); | 66 | mw->setConfigWindow( cw ); |
67 | setCentralWidget( mw ); | 67 | setCentralWidget( mw ); |
68 | 68 | ||
69 | // setup application icon | 69 | // setup application icon |
70 | 70 | ||
71 | setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); | 71 | setIcon( Opie::Core::OResource::loadPixmap( "wellenreiter/appicon-trans", Opie::Core::OResource::SmallIcon ) ); |
72 | #ifndef QWS | 72 | #ifndef QWS |
73 | setIconText( "Wellenreiter/X11" ); | 73 | setIconText( "Wellenreiter/X11" ); |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | // setup tool buttons | 76 | // setup tool buttons |
77 | bool useBigIcon = qApp->desktop()->size().width() > 330; | ||
77 | 78 | ||
78 | startButton = new QToolButton( 0 ); | 79 | startButton = new QToolButton( 0 ); |
80 | startButton->setUsesBigPixmap( useBigIcon ); | ||
79 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); | 81 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); |
80 | #ifdef QWS | 82 | #ifdef QWS |
81 | startButton->setAutoRaise( true ); | 83 | startButton->setAutoRaise( true ); |
82 | #endif | 84 | #endif |
83 | startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); | 85 | startButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SearchIcon", Opie::Core::OResource::SmallIcon ) ); |
84 | startButton->setEnabled( false ); | 86 | startButton->setEnabled( false ); |
85 | connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); | 87 | connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); |
86 | 88 | ||
87 | stopButton = new QToolButton( 0 ); | 89 | stopButton = new QToolButton( 0 ); |
90 | stopButton->setUsesBigPixmap( useBigIcon ); | ||
88 | QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); | 91 | QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); |
89 | #ifdef QWS | 92 | #ifdef QWS |
90 | stopButton->setAutoRaise( true ); | 93 | stopButton->setAutoRaise( true ); |
91 | #endif | 94 | #endif |
92 | stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); | 95 | stopButton->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/CancelIcon", Opie::Core::OResource::SmallIcon ) ); |
93 | stopButton->setEnabled( false ); | 96 | stopButton->setEnabled( false ); |
94 | connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); | 97 | connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); |
95 | 98 | ||
96 | QToolButton* d = new QToolButton( 0 ); | 99 | QToolButton* d = new QToolButton( 0 ); |
100 | d->setUsesBigPixmap( useBigIcon ); | ||
97 | QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), | 101 | QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), |
98 | #ifdef QWS | 102 | #ifdef QWS |
99 | d->setAutoRaise( true ); | 103 | d->setAutoRaise( true ); |
100 | #endif | 104 | #endif |
101 | d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); | 105 | d->setIconSet( Opie::Core::OResource::loadPixmap( "wellenreiter/SettingsIcon", Opie::Core::OResource::SmallIcon ) ); |
102 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); | 106 | connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); |
103 | 107 | ||
104 | uploadButton = new QToolButton( 0 ); | 108 | uploadButton = new QToolButton( 0 ); |
109 | uploadButton->setUsesBigPixmap( useBigIcon ); | ||
105 | QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); | 110 | QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); |
106 | #ifdef QWS | 111 | #ifdef QWS |
107 | uploadButton->setAutoRaise( true ); | 112 | uploadButton->setAutoRaise( true ); |
108 | #endif | 113 | #endif |
109 | uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); | 114 | uploadButton->setIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); |
110 | uploadButton->setEnabled( false ); | 115 | uploadButton->setEnabled( false ); |
111 | //uploadButton->setEnabled( true ); // DEBUGGING | 116 | //uploadButton->setEnabled( true ); // DEBUGGING |
112 | connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); | 117 | connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); |
113 | 118 | ||
114 | // setup menu bar | 119 | // setup menu bar |
115 | 120 | ||
116 | int id; | 121 | int id; |
117 | 122 | ||
118 | QMenuBar* mb = menuBar(); | 123 | QMenuBar* mb = menuBar(); |
119 | 124 | ||
120 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 125 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
121 | fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); | 126 | fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); |
122 | fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); | 127 | fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); |
123 | fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); | 128 | fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); |
124 | 129 | ||
125 | QPopupMenu* fileLoad = new QPopupMenu( mb ); | 130 | QPopupMenu* fileLoad = new QPopupMenu( mb ); |
126 | fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); | 131 | fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); |
127 | //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); | 132 | //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); |
128 | 133 | ||
129 | QPopupMenu* file = new QPopupMenu( mb ); | 134 | QPopupMenu* file = new QPopupMenu( mb ); |
130 | file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); | 135 | file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); |
131 | id = file->insertItem( tr( "&Load" ), fileLoad ); | 136 | id = file->insertItem( tr( "&Load" ), fileLoad ); |
132 | file->insertItem( tr( "&Save" ), fileSave ); | 137 | file->insertItem( tr( "&Save" ), fileSave ); |
133 | file->insertSeparator(); | 138 | file->insertSeparator(); |
134 | uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) ); | 139 | uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) ); |
135 | file->insertSeparator(); | 140 | file->insertSeparator(); |
136 | file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); | 141 | file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); |
137 | 142 | ||
138 | QPopupMenu* sniffer = new QPopupMenu( mb ); | 143 | QPopupMenu* sniffer = new QPopupMenu( mb ); |
139 | sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); | 144 | sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); |
140 | sniffer->insertSeparator(); | 145 | sniffer->insertSeparator(); |
141 | startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); | 146 | startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); |
142 | sniffer->setItemEnabled( startID, false ); | 147 | sniffer->setItemEnabled( startID, false ); |
143 | stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); | 148 | stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); |
144 | sniffer->setItemEnabled( stopID, false ); | 149 | sniffer->setItemEnabled( stopID, false ); |
145 | 150 | ||
146 | QPopupMenu* view = new QPopupMenu( mb ); | 151 | QPopupMenu* view = new QPopupMenu( mb ); |
147 | view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) ); | 152 | view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) ); |
148 | view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) ); | 153 | view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) ); |
149 | 154 | ||
150 | QPopupMenu* demo = new QPopupMenu( mb ); | 155 | QPopupMenu* demo = new QPopupMenu( mb ); |
151 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); | 156 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); |
152 | //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); | 157 | //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); |
153 | 158 | ||
154 | id = mb->insertItem( tr( "&File" ), file ); | 159 | id = mb->insertItem( tr( "&File" ), file ); |
155 | 160 | ||
156 | id = mb->insertItem( tr( "&View" ), view ); | 161 | id = mb->insertItem( tr( "&View" ), view ); |
157 | //mb->setItemEnabled( id, false ); | 162 | //mb->setItemEnabled( id, false ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 587faad..a61e808 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -1,72 +1,72 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | 19 | ||
20 | /* OPIE */ | 20 | /* OPIE */ |
21 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
23 | #include <opie2/oresource.h> | ||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/resource.h> | ||
25 | #else | 25 | #else |
26 | #include "resource.h" | 26 | #include "resource.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | 29 | ||
30 | /* QT */ | 30 | /* QT */ |
31 | #include <qcursor.h> | 31 | #include <qcursor.h> |
32 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
33 | #include <qpopupmenu.h> | 33 | #include <qpopupmenu.h> |
34 | #include <qcheckbox.h> | 34 | #include <qcheckbox.h> |
35 | 35 | ||
36 | /* STD */ | 36 | /* STD */ |
37 | #include <assert.h> | 37 | #include <assert.h> |
38 | 38 | ||
39 | using namespace Opie::Core; | 39 | using namespace Opie::Core; |
40 | using namespace Opie::Ui; | 40 | using namespace Opie::Ui; |
41 | using namespace Opie::Net; | 41 | using namespace Opie::Net; |
42 | 42 | ||
43 | const int col_type = 0; | 43 | const int col_type = 0; |
44 | const int col_essid = 0; | 44 | const int col_essid = 0; |
45 | const int col_sig = 1; | 45 | const int col_sig = 1; |
46 | const int col_ap = 2; | 46 | const int col_ap = 2; |
47 | const int col_channel = 3; | 47 | const int col_channel = 3; |
48 | const int col_wep = 4; | 48 | const int col_wep = 4; |
49 | const int col_traffic = 5; | 49 | const int col_traffic = 5; |
50 | const int col_ip = 6; | 50 | const int col_ip = 6; |
51 | const int col_manuf = 7; | 51 | const int col_manuf = 7; |
52 | const int col_firstseen = 8; | 52 | const int col_firstseen = 8; |
53 | const int col_lastseen = 9; | 53 | const int col_lastseen = 9; |
54 | const int col_location = 10; | 54 | const int col_location = 10; |
55 | 55 | ||
56 | #define DEBUG | 56 | #define DEBUG |
57 | 57 | ||
58 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 58 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
59 | :OListView( parent, name ) | 59 | :OListView( parent, name ) |
60 | { | 60 | { |
61 | setFrameShape( QListView::StyledPanel ); | 61 | setFrameShape( QListView::StyledPanel ); |
62 | setFrameShadow( QListView::Sunken ); | 62 | setFrameShadow( QListView::Sunken ); |
63 | 63 | ||
64 | addColumn( tr( "Net/Station" ) ); | 64 | addColumn( tr( "Net/Station" ) ); |
65 | setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); | 65 | setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); |
66 | addColumn( tr( "#" ) ); | 66 | addColumn( tr( "#" ) ); |
67 | setColumnAlignment( col_sig, AlignCenter ); | 67 | setColumnAlignment( col_sig, AlignCenter ); |
68 | addColumn( tr( "MAC" ) ); | 68 | addColumn( tr( "MAC" ) ); |
69 | setColumnAlignment( col_ap, AlignCenter ); | 69 | setColumnAlignment( col_ap, AlignCenter ); |
70 | addColumn( tr( "Chn" ) ); | 70 | addColumn( tr( "Chn" ) ); |
71 | setColumnAlignment( col_channel, AlignCenter ); | 71 | setColumnAlignment( col_channel, AlignCenter ); |
72 | addColumn( tr( "W" ) ); | 72 | addColumn( tr( "W" ) ); |
@@ -432,124 +432,124 @@ MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const | |||
432 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) | 432 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) |
433 | { | 433 | { |
434 | #ifdef DEBUG | 434 | #ifdef DEBUG |
435 | odebug << "creating scanlist item" << oendl; | 435 | odebug << "creating scanlist item" << oendl; |
436 | #endif | 436 | #endif |
437 | if ( WellenreiterConfigWindow::instance() ) | 437 | if ( WellenreiterConfigWindow::instance() ) |
438 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here | 438 | WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here |
439 | 439 | ||
440 | decorateItem( type, essid, macaddr, wep, channel, signal, false ); | 440 | decorateItem( type, essid, macaddr, wep, channel, signal, false ); |
441 | } | 441 | } |
442 | 442 | ||
443 | const QString& MScanListItem::essid() const | 443 | const QString& MScanListItem::essid() const |
444 | { | 444 | { |
445 | if ( type == "network" ) | 445 | if ( type == "network" ) |
446 | return _essid; | 446 | return _essid; |
447 | else | 447 | else |
448 | return ( (MScanListItem*) parent() )->essid(); | 448 | return ( (MScanListItem*) parent() )->essid(); |
449 | } | 449 | } |
450 | 450 | ||
451 | OListViewItem* MScanListItem::childFactory() | 451 | OListViewItem* MScanListItem::childFactory() |
452 | { | 452 | { |
453 | return new MScanListItem( this ); | 453 | return new MScanListItem( this ); |
454 | } | 454 | } |
455 | 455 | ||
456 | void MScanListItem::serializeTo( QDataStream& s ) const | 456 | void MScanListItem::serializeTo( QDataStream& s ) const |
457 | { | 457 | { |
458 | #ifdef DEBUG | 458 | #ifdef DEBUG |
459 | odebug << "serializing MScanListItem" << oendl; | 459 | odebug << "serializing MScanListItem" << oendl; |
460 | #endif | 460 | #endif |
461 | OListViewItem::serializeTo( s ); | 461 | OListViewItem::serializeTo( s ); |
462 | 462 | ||
463 | s << _type; | 463 | s << _type; |
464 | s << (Q_UINT8) ( _wep ? 'y' : 'n' ); | 464 | s << (Q_UINT8) ( _wep ? 'y' : 'n' ); |
465 | } | 465 | } |
466 | 466 | ||
467 | void MScanListItem::serializeFrom( QDataStream& s ) | 467 | void MScanListItem::serializeFrom( QDataStream& s ) |
468 | { | 468 | { |
469 | #ifdef DEBUG | 469 | #ifdef DEBUG |
470 | odebug << "serializing MScanListItem" << oendl; | 470 | odebug << "serializing MScanListItem" << oendl; |
471 | #endif | 471 | #endif |
472 | OListViewItem::serializeFrom( s ); | 472 | OListViewItem::serializeFrom( s ); |
473 | 473 | ||
474 | Q_UINT8 wep; | 474 | Q_UINT8 wep; |
475 | s >> _type; | 475 | s >> _type; |
476 | s >> wep; | 476 | s >> wep; |
477 | _wep = (wep == 'y'); | 477 | _wep = (wep == 'y'); |
478 | 478 | ||
479 | QString name = QString( "wellenreiter/"+ _type ); | 479 | QString name = QString( "wellenreiter/"+ _type ); |
480 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 480 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
481 | if ( _wep ) | 481 | if ( _wep ) |
482 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 482 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
483 | listView()->triggerUpdate(); | 483 | listView()->triggerUpdate(); |
484 | } | 484 | } |
485 | 485 | ||
486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) | 486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) |
487 | { | 487 | { |
488 | #ifdef DEBUG | 488 | #ifdef DEBUG |
489 | odebug << "decorating scanlist item " << type << " / " | 489 | odebug << "decorating scanlist item " << type << " / " |
490 | << essid << " / " << macaddr | 490 | << essid << " / " << macaddr |
491 | << "[" << channel << "]" << oendl; | 491 | << "[" << channel << "]" << oendl; |
492 | #endif | 492 | #endif |
493 | 493 | ||
494 | // set icon for managed or adhoc mode | 494 | // set icon for managed or adhoc mode |
495 | QString name; | 495 | QString name; |
496 | name.sprintf( "wellenreiter/"+ type ); | 496 | name.sprintf( "wellenreiter/"+ type ); |
497 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 497 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
498 | 498 | ||
499 | // special case for probed networks FIXME: This is ugly at present | 499 | // special case for probed networks FIXME: This is ugly at present |
500 | if ( type == "network" && probed ) | 500 | if ( type == "network" && probed ) |
501 | { | 501 | { |
502 | setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) ); | 502 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) ); |
503 | } | 503 | } |
504 | 504 | ||
505 | // set icon for wep (wireless encryption protocol) | 505 | // set icon for wep (wireless encryption protocol) |
506 | if ( wep ) | 506 | if ( wep ) |
507 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 507 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
508 | 508 | ||
509 | // set channel and signal text | 509 | // set channel and signal text |
510 | 510 | ||
511 | if ( signal != -1 ) | 511 | if ( signal != -1 ) |
512 | setText( col_sig, QString::number( signal ) ); | 512 | setText( col_sig, QString::number( signal ) ); |
513 | if ( channel != -1 ) | 513 | if ( channel != -1 ) |
514 | setText( col_channel, QString::number( channel ) ); | 514 | setText( col_channel, QString::number( channel ) ); |
515 | 515 | ||
516 | setText( col_firstseen, QTime::currentTime().toString() ); | 516 | setText( col_firstseen, QTime::currentTime().toString() ); |
517 | //setText( col_lastseen, QTime::currentTime().toString() ); | 517 | //setText( col_lastseen, QTime::currentTime().toString() ); |
518 | 518 | ||
519 | listView()->triggerUpdate(); | 519 | listView()->triggerUpdate(); |
520 | 520 | ||
521 | this->type = type; | 521 | this->type = type; |
522 | _type = type; | 522 | _type = type; |
523 | _essid = essid; | 523 | _essid = essid; |
524 | _macaddr = macaddr; | 524 | _macaddr = macaddr; |
525 | _channel = channel; | 525 | _channel = channel; |
526 | _beacons = 1; | 526 | _beacons = 1; |
527 | _signal = 0; | 527 | _signal = 0; |
528 | 528 | ||
529 | if ( WellenreiterConfigWindow::instance()->openTree->isChecked() ) | 529 | if ( WellenreiterConfigWindow::instance()->openTree->isChecked() ) |
530 | { | 530 | { |
531 | listView()->ensureItemVisible( this ); | 531 | listView()->ensureItemVisible( this ); |
532 | } | 532 | } |
533 | 533 | ||
534 | } | 534 | } |
535 | 535 | ||
536 | 536 | ||
537 | void MScanListItem::setManufacturer( const QString& manufacturer ) | 537 | void MScanListItem::setManufacturer( const QString& manufacturer ) |
538 | { | 538 | { |
539 | setText( col_manuf, manufacturer ); | 539 | setText( col_manuf, manufacturer ); |
540 | } | 540 | } |
541 | 541 | ||
542 | 542 | ||
543 | void MScanListItem::setLocation( const QString& location ) | 543 | void MScanListItem::setLocation( const QString& location ) |
544 | { | 544 | { |
545 | setText( col_location, location ); | 545 | setText( col_location, location ); |
546 | } | 546 | } |
547 | 547 | ||
548 | 548 | ||
549 | void MScanListItem::receivedBeacon() | 549 | void MScanListItem::receivedBeacon() |
550 | { | 550 | { |
551 | _beacons++; | 551 | _beacons++; |
552 | #ifdef DEBUG | 552 | #ifdef DEBUG |
553 | odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; | 553 | odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; |
554 | #endif | 554 | #endif |
555 | setText( col_sig, QString::number( _beacons ) ); | 555 | setText( col_sig, QString::number( _beacons ) ); |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 1d5bd1b..11eb145 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -1,156 +1,156 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ***********************************************************************/ | 14 | ***********************************************************************/ |
15 | 15 | ||
16 | #include "wellenreiterbase.h" | 16 | #include "wellenreiterbase.h" |
17 | 17 | ||
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | 20 | ||
21 | #include "logwindow.h" | 21 | #include "logwindow.h" |
22 | #include "packetview.h" | 22 | #include "packetview.h" |
23 | #include "scanlist.h" | 23 | #include "scanlist.h" |
24 | #include "statwindow.h" | 24 | #include "statwindow.h" |
25 | #include "graphwindow.h" | 25 | #include "graphwindow.h" |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/resource.h> | 28 | #include <opie2/oresource.h> |
29 | #include <opie2/otabwidget.h> | 29 | #include <opie2/otabwidget.h> |
30 | using namespace Opie; | 30 | using namespace Opie; |
31 | #else | 31 | #else |
32 | #include "resource.h" | 32 | #include "resource.h" |
33 | #include <qtabwidget.h> | 33 | #include <qtabwidget.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 37 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
38 | * name 'name' and widget flags set to 'f' | 38 | * name 'name' and widget flags set to 'f' |
39 | */ | 39 | */ |
40 | using namespace Opie::Ui; | 40 | using namespace Opie::Ui; |
41 | using namespace Opie::Ui; | 41 | using namespace Opie::Ui; |
42 | using namespace Opie::Ui; | 42 | using namespace Opie::Ui; |
43 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 43 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
44 | : QWidget( parent, name, fl ) | 44 | : QWidget( parent, name, fl ) |
45 | { | 45 | { |
46 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 46 | //ani1 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot0", Opie::Core::OResource::SmallIcon ) ); |
47 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 47 | //ani2 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot90", Opie::Core::OResource::SmallIcon ) ); |
48 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 48 | //ani3 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot180", Opie::Core::OResource::SmallIcon ) ); |
49 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 49 | //ani4 = new QPixmap( Opie::Core::OResource::loadPixmap( "wellenreiter/networks_rot270", Opie::Core::OResource::SmallIcon ) ); |
50 | 50 | ||
51 | if ( !name ) | 51 | if ( !name ) |
52 | setName( "WellenreiterBase" ); | 52 | setName( "WellenreiterBase" ); |
53 | resize( 191, 294 ); | 53 | resize( 191, 294 ); |
54 | #ifdef QWS | 54 | #ifdef QWS |
55 | setCaption( tr( "Wellenreiter/Opie" ) ); | 55 | setCaption( tr( "Wellenreiter/Opie" ) ); |
56 | #else | 56 | #else |
57 | setCaption( tr( "Wellenreiter/X11" ) ); | 57 | setCaption( tr( "Wellenreiter/X11" ) ); |
58 | #endif | 58 | #endif |
59 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 59 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
60 | WellenreiterBaseLayout->setSpacing( 2 ); | 60 | WellenreiterBaseLayout->setSpacing( 2 ); |
61 | WellenreiterBaseLayout->setMargin( 0 ); | 61 | WellenreiterBaseLayout->setMargin( 0 ); |
62 | #ifdef QWS | 62 | #ifdef QWS |
63 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); | 63 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); |
64 | #else | 64 | #else |
65 | TabWidget = new QTabWidget( this, "TabWidget" ); | 65 | TabWidget = new QTabWidget( this, "TabWidget" ); |
66 | #endif | 66 | #endif |
67 | ap = new QWidget( TabWidget, "ap" ); | 67 | ap = new QWidget( TabWidget, "ap" ); |
68 | apLayout = new QVBoxLayout( ap ); | 68 | apLayout = new QVBoxLayout( ap ); |
69 | apLayout->setSpacing( 2 ); | 69 | apLayout->setSpacing( 2 ); |
70 | apLayout->setMargin( 2 ); | 70 | apLayout->setMargin( 2 ); |
71 | 71 | ||
72 | //--------- NETVIEW TAB -------------- | 72 | //--------- NETVIEW TAB -------------- |
73 | 73 | ||
74 | netview = new MScanListView( ap ); | 74 | netview = new MScanListView( ap ); |
75 | apLayout->addWidget( netview ); | 75 | apLayout->addWidget( netview ); |
76 | 76 | ||
77 | //--------- GRAPH TAB -------------- | 77 | //--------- GRAPH TAB -------------- |
78 | 78 | ||
79 | graphwindow = new MGraphWindow( TabWidget, "Graph" ); | 79 | graphwindow = new MGraphWindow( TabWidget, "Graph" ); |
80 | 80 | ||
81 | //--------- LOG TAB -------------- | 81 | //--------- LOG TAB -------------- |
82 | 82 | ||
83 | logwindow = new MLogWindow( TabWidget, "Log" ); | 83 | logwindow = new MLogWindow( TabWidget, "Log" ); |
84 | 84 | ||
85 | //--------- HEX TAB -------------- | 85 | //--------- HEX TAB -------------- |
86 | 86 | ||
87 | hexwindow = new PacketView( TabWidget, "Hex" ); | 87 | hexwindow = new PacketView( TabWidget, "Hex" ); |
88 | 88 | ||
89 | //--------- STAT TAB -------------- | 89 | //--------- STAT TAB -------------- |
90 | 90 | ||
91 | statwindow = new MStatWindow( TabWidget, "Stat" ); | 91 | statwindow = new MStatWindow( TabWidget, "Stat" ); |
92 | 92 | ||
93 | //--------- ABOUT TAB -------------- | 93 | //--------- ABOUT TAB -------------- |
94 | 94 | ||
95 | about = new QWidget( TabWidget, "about" ); | 95 | about = new QWidget( TabWidget, "about" ); |
96 | aboutLayout = new QGridLayout( about ); | 96 | aboutLayout = new QGridLayout( about ); |
97 | aboutLayout->setSpacing( 6 ); | 97 | aboutLayout->setSpacing( 6 ); |
98 | aboutLayout->setMargin( 11 ); | 98 | aboutLayout->setMargin( 11 ); |
99 | 99 | ||
100 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); | 100 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); |
101 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); | 101 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); |
102 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); | 102 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); |
103 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); | 103 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); |
104 | PixmapLabel1_3_2->setLineWidth( 2 ); | 104 | PixmapLabel1_3_2->setLineWidth( 2 ); |
105 | PixmapLabel1_3_2->setMargin( 0 ); | 105 | PixmapLabel1_3_2->setMargin( 0 ); |
106 | PixmapLabel1_3_2->setMidLineWidth( 0 ); | 106 | PixmapLabel1_3_2->setMidLineWidth( 0 ); |
107 | 107 | ||
108 | QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); | 108 | QPixmap logo = Opie::Core::OResource::loadPixmap( "wellenreiter/logo" ); |
109 | QPainter draw( &logo ); | 109 | QPainter draw( &logo ); |
110 | draw.setPen( Qt::black ); | 110 | draw.setPen( Qt::black ); |
111 | draw.setFont( QFont( "Fixed", 8 ) ); | 111 | draw.setFont( QFont( "Fixed", 8 ) ); |
112 | draw.drawText( 5, 10, WELLENREITER_VERSION ); | 112 | draw.drawText( 5, 10, WELLENREITER_VERSION ); |
113 | 113 | ||
114 | PixmapLabel1_3_2->setPixmap( logo ); | 114 | PixmapLabel1_3_2->setPixmap( logo ); |
115 | PixmapLabel1_3_2->setScaledContents( TRUE ); | 115 | PixmapLabel1_3_2->setScaledContents( TRUE ); |
116 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); | 116 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); |
117 | 117 | ||
118 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); | 118 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); |
119 | 119 | ||
120 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); | 120 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); |
121 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); | 121 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); |
122 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); | 122 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); |
123 | TextLabel1_4_2_font.setPointSize( 10 ); | 123 | TextLabel1_4_2_font.setPointSize( 10 ); |
124 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); | 124 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); |
125 | TextLabel1_4_2->setText( | 125 | TextLabel1_4_2->setText( |
126 | "<p align=center>" | 126 | "<p align=center>" |
127 | "<hr>" | 127 | "<hr>" |
128 | "<b>(C) Michael 'Mickey' Lauer</b><br>" | 128 | "<b>(C) Michael 'Mickey' Lauer</b><br>" |
129 | "<hr>" | 129 | "<hr>" |
130 | "mickey@Vanille.de<br>" | 130 | "mickey@Vanille.de<br>" |
131 | "www.Vanille.de/projects/wellenreiter.html<br>" | 131 | "www.Vanille.de/projects/wellenreiter.html<br>" |
132 | "www.wellenreiter.net" | 132 | "www.wellenreiter.net" |
133 | "</p>" ); | 133 | "</p>" ); |
134 | TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); | 134 | TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); |
135 | 135 | ||
136 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); | 136 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); |
137 | 137 | ||
138 | #ifdef QWS | 138 | #ifdef QWS |
139 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); | 139 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); |
140 | TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) ); | 140 | TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) ); |
141 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); | 141 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); |
142 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | 142 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); |
143 | TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) ); | 143 | TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) ); |
144 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | 144 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); |
145 | #else | 145 | #else |
146 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); | 146 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); |
147 | TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) ); | 147 | TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) ); |
148 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); | 148 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); |
149 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); | 149 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); |
150 | TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) ); | 150 | TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) ); |
151 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); | 151 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); |
152 | #endif | 152 | #endif |
153 | WellenreiterBaseLayout->addWidget( TabWidget ); | 153 | WellenreiterBaseLayout->addWidget( TabWidget ); |
154 | 154 | ||
155 | #ifdef QWS | 155 | #ifdef QWS |
156 | TabWidget->setCurrentTab( tr( "Nets" ) ); | 156 | TabWidget->setCurrentTab( tr( "Nets" ) ); |