Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiterbase.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index da12f2b..3a703bc 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include "logwindow.h" | 30 | #include "logwindow.h" |
31 | #include "hexwindow.h" | 31 | #include "hexwindow.h" |
32 | #include "configwindow.h" | ||
33 | #include "scanlist.h" | 32 | #include "scanlist.h" |
34 | 33 | ||
35 | #ifdef QWS | 34 | #ifdef QWS |
@@ -56,7 +55,11 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
56 | if ( !name ) | 55 | if ( !name ) |
57 | setName( "WellenreiterBase" ); | 56 | setName( "WellenreiterBase" ); |
58 | resize( 191, 294 ); | 57 | resize( 191, 294 ); |
59 | setCaption( tr( "Wellenreiter" ) ); | 58 | #ifdef QWS |
59 | setCaption( tr( "Wellenreiter/Opie" ) ); | ||
60 | #else | ||
61 | setCaption( tr( "Wellenreiter/X11" ) ); | ||
62 | #endif | ||
60 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 63 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
61 | WellenreiterBaseLayout->setSpacing( 2 ); | 64 | WellenreiterBaseLayout->setSpacing( 2 ); |
62 | WellenreiterBaseLayout->setMargin( 0 ); | 65 | WellenreiterBaseLayout->setMargin( 0 ); |
@@ -85,10 +88,6 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
85 | 88 | ||
86 | hexwindow = new MHexWindow( TabWidget, "Hex" ); | 89 | hexwindow = new MHexWindow( TabWidget, "Hex" ); |
87 | 90 | ||
88 | //--------- CONFIG TAB -------------- | ||
89 | |||
90 | configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); | ||
91 | |||
92 | //--------- ABOUT TAB -------------- | 91 | //--------- ABOUT TAB -------------- |
93 | 92 | ||
94 | about = new QWidget( TabWidget, "about" ); | 93 | about = new QWidget( TabWidget, "about" ); |
@@ -125,25 +124,18 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
125 | 124 | ||
126 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); | 125 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); |
127 | 126 | ||
128 | button = new QPushButton( this, "button" ); | ||
129 | button->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, button->sizePolicy().hasHeightForWidth() ) ); | ||
130 | button->setText( tr( "Start Scanning" ) ); | ||
131 | |||
132 | #ifdef QWS | 127 | #ifdef QWS |
133 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) ); | 128 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Networks" ) ); |
134 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); | 129 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); |
135 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | 130 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); |
136 | TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); | ||
137 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | 131 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); |
138 | #else | 132 | #else |
139 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); | 133 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); |
140 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); | 134 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); |
141 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); | 135 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); |
142 | TabWidget->addTab( configwindow, /* "wellenreiter/config", */ tr( "Config" ) ); | ||
143 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); | 136 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); |
144 | #endif | 137 | #endif |
145 | WellenreiterBaseLayout->addWidget( TabWidget ); | 138 | WellenreiterBaseLayout->addWidget( TabWidget ); |
146 | WellenreiterBaseLayout->addWidget( button ); | ||
147 | 139 | ||
148 | #ifdef QWS | 140 | #ifdef QWS |
149 | TabWidget->setCurrentTab( tr( "Networks" ) ); | 141 | TabWidget->setCurrentTab( tr( "Networks" ) ); |