Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiterbase.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index aa94c81..5017b08 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -22,3 +22,2 @@ | |||
22 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
23 | #include <opie/otabwidget.h> | ||
24 | #include <qlayout.h> | 23 | #include <qlayout.h> |
@@ -34,3 +33,9 @@ | |||
34 | 33 | ||
34 | #ifdef QWS | ||
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <opie/otabwidget.h> | ||
37 | #else | ||
38 | #include "resource.h" | ||
39 | #include <qtabwidget.h> | ||
40 | #endif | ||
36 | 41 | ||
@@ -51,5 +56,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
51 | WellenreiterBaseLayout->setMargin( 0 ); | 56 | WellenreiterBaseLayout->setMargin( 0 ); |
52 | 57 | #ifdef QWS | |
53 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); | 58 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); |
54 | 59 | #else | |
60 | TabWidget = new QTabWidget( this, "TabWidget" ); | ||
61 | #endif | ||
55 | ap = new QWidget( TabWidget, "ap" ); | 62 | ap = new QWidget( TabWidget, "ap" ); |
@@ -79,3 +86,3 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
79 | apLayout->addWidget( netview ); | 86 | apLayout->addWidget( netview ); |
80 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) ); | 87 | |
81 | 88 | ||
@@ -84,3 +91,3 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
84 | logwindow = new MLogWindow( TabWidget, "Log" ); | 91 | logwindow = new MLogWindow( TabWidget, "Log" ); |
85 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); | 92 | |
86 | 93 | ||
@@ -89,3 +96,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
89 | hexwindow = new MHexWindow( TabWidget, "Hex" ); | 96 | hexwindow = new MHexWindow( TabWidget, "Hex" ); |
90 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | ||
91 | 97 | ||
@@ -94,3 +100,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
94 | configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); | 100 | configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); |
95 | TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); | ||
96 | 101 | ||
@@ -131,4 +136,2 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
131 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); | 136 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); |
132 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | ||
133 | WellenreiterBaseLayout->addWidget( TabWidget ); | ||
134 | 137 | ||
@@ -137,5 +140,22 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
137 | button->setText( tr( "Start Scanning" ) ); | 140 | button->setText( tr( "Start Scanning" ) ); |
141 | |||
142 | #ifdef QWS | ||
143 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) ); | ||
144 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); | ||
145 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | ||
146 | TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); | ||
147 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | ||
148 | #else | ||
149 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); | ||
150 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); | ||
151 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); | ||
152 | TabWidget->addTab( configwindow, /* "wellenreiter/config", */ tr( "Config" ) ); | ||
153 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); | ||
154 | #endif | ||
155 | WellenreiterBaseLayout->addWidget( TabWidget ); | ||
138 | WellenreiterBaseLayout->addWidget( button ); | 156 | WellenreiterBaseLayout->addWidget( button ); |
139 | 157 | ||
158 | #ifdef QWS | ||
140 | TabWidget->setCurrentTab( tr( "Networks" ) ); | 159 | TabWidget->setCurrentTab( tr( "Networks" ) ); |
160 | #endif | ||
141 | 161 | ||