summaryrefslogtreecommitdiff
authordrw <drw>2004-08-16 17:19:29 (UTC)
committer drw <drw>2004-08-16 17:19:29 (UTC)
commitf8f568aaddc63d39b50aa8357326a64c036f5847 (patch) (unidiff)
treeed1fe779405d7a14cf1e27486a92dd93462652b3
parente08904edaea335f215b7bc16ab2ec239df415e5e (diff)
downloadopie-f8f568aaddc63d39b50aa8357326a64c036f5847.zip
opie-f8f568aaddc63d39b50aa8357326a64c036f5847.tar.gz
opie-f8f568aaddc63d39b50aa8357326a64c036f5847.tar.bz2
Correct group box label
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 7941ab8..1561470 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -1,73 +1,73 @@
1/* 1/*
2                This file is part of the Opie Project 2 This file is part of the Opie Project
3 3
4              Copyright (c) 2003 Dan Williams <drw@handhelds.org> 4 Copyright (c) 2003 Dan Williams <drw@handhelds.org>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7 .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8_;:, .> :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_, > . <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 10:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i, .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12- . .-<_> .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13 ._= =} : or (at your option) any later version.
14    .%`+i>       _;_. 14 .%`+i> _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15 .i_,=:_. -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17 : .. .:, . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.= = ; Library General Public License for more
21++=   -.     .`     .: details. 21++= -. .` .: details.
22 :     =  ...= . :.=- 22: = ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23-. .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24 -_. . . )=. = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25 -- :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#include "oipkgconfigdlg.h" 32#include "oipkgconfigdlg.h"
33 33
34#include <qpe/resource.h> 34#include <qpe/resource.h>
35 35
36#include <qcheckbox.h> 36#include <qcheckbox.h>
37#include <qcombobox.h> 37#include <qcombobox.h>
38#include <qgroupbox.h> 38#include <qgroupbox.h>
39#include <qlabel.h> 39#include <qlabel.h>
40#include <qlineedit.h> 40#include <qlineedit.h>
41#include <qlistbox.h> 41#include <qlistbox.h>
42#include <qpushbutton.h> 42#include <qpushbutton.h>
43#include <qscrollview.h> 43#include <qscrollview.h>
44#include <qwhatsthis.h> 44#include <qwhatsthis.h>
45 45
46OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) 46OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
47 : QDialog( parent, QString::null, true, WStyle_ContextHelp ) 47 : QDialog( parent, QString::null, true, WStyle_ContextHelp )
48 , m_ipkg( ipkg ) 48 , m_ipkg( ipkg )
49 , m_configs( 0x0 ) 49 , m_configs( 0x0 )
50 , m_installOptions( installOptions ) 50 , m_installOptions( installOptions )
51 , m_serverNew( false ) 51 , m_serverNew( false )
52 , m_serverCurrent( -1 ) 52 , m_serverCurrent( -1 )
53 , m_destNew( false ) 53 , m_destNew( false )
54 , m_destCurrent( -1 ) 54 , m_destCurrent( -1 )
55 , m_layout( this, 2, 4 ) 55 , m_layout( this, 2, 4 )
56 , m_tabWidget( this ) 56 , m_tabWidget( this )
57{ 57{
58 setCaption( tr( "Configuration" ) ); 58 setCaption( tr( "Configuration" ) );
59 59
60 // Initialize configuration widgets 60 // Initialize configuration widgets
61 if ( !installOptions ) 61 if ( !installOptions )
62 { 62 {
63 initServerWidget(); 63 initServerWidget();
64 initDestinationWidget(); 64 initDestinationWidget();
65 initProxyWidget(); 65 initProxyWidget();
66 } 66 }
67 initOptionsWidget(); 67 initOptionsWidget();
68 68
69 // Load configuration information 69 // Load configuration information
70 initData(); 70 initData();
71 71
72 // Setup tabs for all info 72 // Setup tabs for all info
73 m_layout.addWidget( &m_tabWidget ); 73 m_layout.addWidget( &m_tabWidget );
@@ -198,97 +198,97 @@ void OIpkgConfigDlg::initServerWidget()
198 198
199 label = new QLabel( tr( "Address:" ), grpbox ); 199 label = new QLabel( tr( "Address:" ), grpbox );
200 QWhatsThis::add( label, tr( "Enter the URL address of this entry here." ) ); 200 QWhatsThis::add( label, tr( "Enter the URL address of this entry here." ) );
201 grplayout->addWidget( label, 1, 0 ); 201 grplayout->addWidget( label, 1, 0 );
202 m_serverLocation = new QLineEdit( grpbox ); 202 m_serverLocation = new QLineEdit( grpbox );
203 QWhatsThis::add( m_serverLocation, tr( "Enter the URL address of this entry here." ) ); 203 QWhatsThis::add( m_serverLocation, tr( "Enter the URL address of this entry here." ) );
204 grplayout->addWidget( m_serverLocation, 1, 1 ); 204 grplayout->addWidget( m_serverLocation, 1, 1 );
205 205
206 m_serverActive = new QCheckBox( tr( "Active" ), grpbox ); 206 m_serverActive = new QCheckBox( tr( "Active" ), grpbox );
207 QWhatsThis::add( m_serverActive, tr( "Tap here to indicate whether this entry is active or not." ) ); 207 QWhatsThis::add( m_serverActive, tr( "Tap here to indicate whether this entry is active or not." ) );
208 grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 ); 208 grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 );
209 209
210 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); 210 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
211 QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) ); 211 QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) );
212 connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) ); 212 connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) );
213 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); 213 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
214} 214}
215 215
216void OIpkgConfigDlg::initDestinationWidget() 216void OIpkgConfigDlg::initDestinationWidget()
217{ 217{
218 m_destWidget = new QWidget( this ); 218 m_destWidget = new QWidget( this );
219 219
220 // Initialize UI 220 // Initialize UI
221 QVBoxLayout *vb = new QVBoxLayout( m_destWidget ); 221 QVBoxLayout *vb = new QVBoxLayout( m_destWidget );
222 QScrollView *sv = new QScrollView( m_destWidget ); 222 QScrollView *sv = new QScrollView( m_destWidget );
223 vb->addWidget( sv, 0, 0 ); 223 vb->addWidget( sv, 0, 0 );
224 sv->setResizePolicy( QScrollView::AutoOneFit ); 224 sv->setResizePolicy( QScrollView::AutoOneFit );
225 sv->setFrameStyle( QFrame::NoFrame ); 225 sv->setFrameStyle( QFrame::NoFrame );
226 QWidget *container = new QWidget( sv->viewport() ); 226 QWidget *container = new QWidget( sv->viewport() );
227 sv->addChild( container ); 227 sv->addChild( container );
228 QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 ); 228 QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 );
229 229
230 m_destList = new QListBox( container ); 230 m_destList = new QListBox( container );
231 QWhatsThis::add( m_destList, tr( "This is a list of all destinations configured for this device. Select one here to edit or delete, or add a new one below." ) ); 231 QWhatsThis::add( m_destList, tr( "This is a list of all destinations configured for this device. Select one here to edit or delete, or add a new one below." ) );
232 m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); 232 m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
233 connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) ); 233 connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) );
234 layout->addMultiCellWidget( m_destList, 0, 0, 0, 1 ); 234 layout->addMultiCellWidget( m_destList, 0, 0, 0, 1 );
235 235
236 QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container ); 236 QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
237 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) ); 237 QWhatsThis::add( btn, tr( "Tap here to create a new entry. Fill in the fields below and then tap on Update." ) );
238 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) ); 238 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
239 layout->addWidget( btn, 1, 0 ); 239 layout->addWidget( btn, 1, 0 );
240 240
241 btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container ); 241 btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
242 QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) ); 242 QWhatsThis::add( btn, tr( "Tap here to delete the entry selected above." ) );
243 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) ); 243 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
244 layout->addWidget( btn, 1, 1 ); 244 layout->addWidget( btn, 1, 1 );
245 245
246 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container ); 246 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
247 grpbox->layout()->setSpacing( 2 ); 247 grpbox->layout()->setSpacing( 2 );
248 grpbox->layout()->setMargin( 4 ); 248 grpbox->layout()->setMargin( 4 );
249 layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 ); 249 layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
250 250
251 QGridLayout *grplayout = new QGridLayout( grpbox->layout() ); 251 QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
252 252
253 QLabel *label = new QLabel( tr( "Name:" ), grpbox ); 253 QLabel *label = new QLabel( tr( "Name:" ), grpbox );
254 QWhatsThis::add( label, tr( "Enter the name of this entry here." ) ); 254 QWhatsThis::add( label, tr( "Enter the name of this entry here." ) );
255 grplayout->addWidget( label, 0, 0 ); 255 grplayout->addWidget( label, 0, 0 );
256 m_destName = new QLineEdit( grpbox ); 256 m_destName = new QLineEdit( grpbox );
257 QWhatsThis::add( m_destName, tr( "Enter the name of this entry here." ) ); 257 QWhatsThis::add( m_destName, tr( "Enter the name of this entry here." ) );
258 grplayout->addWidget( m_destName, 0, 1 ); 258 grplayout->addWidget( m_destName, 0, 1 );
259 259
260 label = new QLabel( tr( "Location:" ), grpbox ); 260 label = new QLabel( tr( "Location:" ), grpbox );
261 QWhatsThis::add( label, tr( "Enter the absolute directory path of this entry here." ) ); 261 QWhatsThis::add( label, tr( "Enter the absolute directory path of this entry here." ) );
262 grplayout->addWidget( label, 1, 0 ); 262 grplayout->addWidget( label, 1, 0 );
263 m_destLocation = new QLineEdit( grpbox ); 263 m_destLocation = new QLineEdit( grpbox );
264 QWhatsThis::add( m_destLocation, tr( "Enter the absolute directory path of this entry here." ) ); 264 QWhatsThis::add( m_destLocation, tr( "Enter the absolute directory path of this entry here." ) );
265 grplayout->addWidget( m_destLocation, 1, 1 ); 265 grplayout->addWidget( m_destLocation, 1, 1 );
266 266
267 m_destActive = new QCheckBox( tr( "Active" ), grpbox ); 267 m_destActive = new QCheckBox( tr( "Active" ), grpbox );
268 QWhatsThis::add( m_destActive, tr( "Tap here to indicate whether this entry is active or not." ) ); 268 QWhatsThis::add( m_destActive, tr( "Tap here to indicate whether this entry is active or not." ) );
269 grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 ); 269 grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 );
270 270
271 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox ); 271 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
272 QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) ); 272 QWhatsThis::add( btn, tr( "Tap here to update the entry's information." ) );
273 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) ); 273 connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) );
274 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 ); 274 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
275} 275}
276 276
277void OIpkgConfigDlg::initProxyWidget() 277void OIpkgConfigDlg::initProxyWidget()
278{ 278{
279 m_proxyWidget = new QWidget( this ); 279 m_proxyWidget = new QWidget( this );
280 280
281 // Initialize UI 281 // Initialize UI
282 QVBoxLayout *vb = new QVBoxLayout( m_proxyWidget ); 282 QVBoxLayout *vb = new QVBoxLayout( m_proxyWidget );
283 QScrollView *sv = new QScrollView( m_proxyWidget ); 283 QScrollView *sv = new QScrollView( m_proxyWidget );
284 vb->addWidget( sv, 0, 0 ); 284 vb->addWidget( sv, 0, 0 );
285 sv->setResizePolicy( QScrollView::AutoOneFit ); 285 sv->setResizePolicy( QScrollView::AutoOneFit );
286 sv->setFrameStyle( QFrame::NoFrame ); 286 sv->setFrameStyle( QFrame::NoFrame );
287 QWidget *container = new QWidget( sv->viewport() ); 287 QWidget *container = new QWidget( sv->viewport() );
288 sv->addChild( container ); 288 sv->addChild( container );
289 QGridLayout *layout = new QGridLayout( container, 4, 2, 2, 4 ); 289 QGridLayout *layout = new QGridLayout( container, 4, 2, 2, 4 );
290 290
291 // HTTP proxy server configuration 291 // HTTP proxy server configuration
292 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container ); 292 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
293 grpbox->layout()->setSpacing( 2 ); 293 grpbox->layout()->setSpacing( 2 );
294 grpbox->layout()->setMargin( 4 ); 294 grpbox->layout()->setMargin( 4 );