Diffstat (limited to 'noncore/settings/packagemanager/oipkgconfigdlg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 68 |
1 files changed, 52 insertions, 16 deletions
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index e6d6a81..7ee2d74 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -125,12 +125,19 @@ void OIpkgConfigDlg::accept() | |||
125 | if ( confItem ) | 125 | if ( confItem ) |
126 | confItem->setValue( m_proxyPassword->text() ); | 126 | confItem->setValue( m_proxyPassword->text() ); |
127 | else | 127 | else |
128 | m_configs->append( new OConfItem( OConfItem::Option, "proxy_password", | 128 | m_configs->append( new OConfItem( OConfItem::Option, "proxy_password", |
129 | m_proxyPassword->text() ) ); | 129 | m_proxyPassword->text() ) ); |
130 | 130 | ||
131 | confItem = m_ipkg->findConfItem( OConfItem::Other, "lists_dir" ); | ||
132 | if ( confItem ) | ||
133 | confItem->setValue( m_optSourceLists->text() ); | ||
134 | else | ||
135 | m_configs->append( new OConfItem( OConfItem::Other, "lists_dir", | ||
136 | m_optSourceLists->text(), "name" ) ); | ||
137 | |||
131 | m_ipkg->setConfigItems( m_configs ); | 138 | m_ipkg->setConfigItems( m_configs ); |
132 | } | 139 | } |
133 | 140 | ||
134 | // Save options configuration | 141 | // Save options configuration |
135 | int options = 0; | 142 | int options = 0; |
136 | if ( m_optForceDepends->isChecked() ) | 143 | if ( m_optForceDepends->isChecked() ) |
@@ -294,41 +301,54 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
294 | QScrollView *sv = new QScrollView( m_optionsWidget ); | 301 | QScrollView *sv = new QScrollView( m_optionsWidget ); |
295 | vb->addWidget( sv, 0, 0 ); | 302 | vb->addWidget( sv, 0, 0 ); |
296 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 303 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
297 | sv->setFrameStyle( QFrame::NoFrame ); | 304 | sv->setFrameStyle( QFrame::NoFrame ); |
298 | QWidget *container = new QWidget( sv->viewport() ); | 305 | QWidget *container = new QWidget( sv->viewport() ); |
299 | sv->addChild( container ); | 306 | sv->addChild( container ); |
300 | QVBoxLayout *layout = new QVBoxLayout( container, 2, 4 ); | 307 | QGridLayout *layout = new QGridLayout( container, 8, 2, 2, 4 ); |
301 | 308 | ||
302 | m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container ); | 309 | m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container ); |
303 | QWhatsThis::add( m_optForceDepends, tr( "Tap here to enable or disable the '-force-depends' option for Ipkg." ) ); | 310 | QWhatsThis::add( m_optForceDepends, tr( "Tap here to enable or disable the '-force-depends' option for Ipkg." ) ); |
304 | layout->addWidget( m_optForceDepends ); | 311 | layout->addMultiCellWidget( m_optForceDepends, 0, 0, 0, 1 ); |
305 | 312 | ||
306 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); | 313 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); |
307 | QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) ); | 314 | QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) ); |
308 | layout->addWidget( m_optForceReinstall ); | 315 | layout->addMultiCellWidget( m_optForceReinstall, 1, 1, 0, 1 ); |
309 | 316 | ||
310 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); | 317 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); |
311 | QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) ); | 318 | QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) ); |
312 | layout->addWidget( m_optForceRemove ); | 319 | layout->addMultiCellWidget( m_optForceRemove, 2, 2, 0, 1 ); |
313 | 320 | ||
314 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); | 321 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); |
315 | QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); | 322 | QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); |
316 | layout->addWidget( m_optForceOverwrite ); | 323 | layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); |
317 | 324 | ||
318 | QLabel *l = new QLabel( tr( "Information Level" ), container ); | 325 | QLabel *l = new QLabel( tr( "Information level:" ), container ); |
319 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); | 326 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); |
320 | layout->addWidget( l ); | 327 | layout->addMultiCellWidget( l, 4, 4, 0, 1 ); |
321 | 328 | ||
322 | m_optVerboseIpkg = new QComboBox( container ); | 329 | m_optVerboseIpkg = new QComboBox( container ); |
323 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); | 330 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); |
324 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); | 331 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); |
325 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); | 332 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); |
326 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); | 333 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); |
327 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); | 334 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); |
328 | layout->addWidget( m_optVerboseIpkg ); | 335 | layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); |
336 | |||
337 | l = new QLabel( tr( "Package source lists directory:" ), container ); | ||
338 | QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); | ||
339 | layout->addMultiCellWidget( l, 6, 6, 0, 1 ); | ||
340 | |||
341 | m_optSourceLists = new QLineEdit( container ); | ||
342 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); | ||
343 | layout->addWidget( m_optSourceLists, 7, 0 ); | ||
344 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "folder" ), QString::null, container ); | ||
345 | btn->setMaximumWidth( btn->height() ); | ||
346 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); | ||
347 | connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); | ||
348 | layout->addWidget( btn, 7, 1 ); | ||
329 | 349 | ||
330 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); | 350 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); |
331 | } | 351 | } |
332 | 352 | ||
333 | void OIpkgConfigDlg::initData() | 353 | void OIpkgConfigDlg::initData() |
334 | { | 354 | { |
@@ -342,21 +362,17 @@ void OIpkgConfigDlg::initData() | |||
342 | { | 362 | { |
343 | OConfItem *config = configIt.current(); | 363 | OConfItem *config = configIt.current(); |
344 | 364 | ||
345 | // Add configuration item to the appropriate dialog controls | 365 | // Add configuration item to the appropriate dialog controls |
346 | if ( config ) | 366 | if ( config ) |
347 | { | 367 | { |
348 | if ( config->type() == OConfItem::Source ) | 368 | switch ( config->type() ) |
349 | { | ||
350 | m_serverList->insertItem( config->name() ); | ||
351 | } | ||
352 | else if ( config->type() == OConfItem::Destination ) | ||
353 | { | 369 | { |
354 | m_destList->insertItem( config->name() ); | 370 | case OConfItem::Source : m_serverList->insertItem( config->name() ); break; |
355 | } | 371 | case OConfItem::Destination : m_destList->insertItem( config->name() ); break; |
356 | else if ( config->type() == OConfItem::Option ) | 372 | case OConfItem::Option : |
357 | { | 373 | { |
358 | if ( config->name() == "http_proxy" ) | 374 | if ( config->name() == "http_proxy" ) |
359 | { | 375 | { |
360 | m_proxyHttpServer->setText( config->value() ); | 376 | m_proxyHttpServer->setText( config->value() ); |
361 | m_proxyHttpActive->setChecked( config->active() ); | 377 | m_proxyHttpActive->setChecked( config->active() ); |
362 | } | 378 | } |
@@ -371,12 +387,23 @@ void OIpkgConfigDlg::initData() | |||
371 | } | 387 | } |
372 | else if ( config->name() == "proxy_password" ) | 388 | else if ( config->name() == "proxy_password" ) |
373 | { | 389 | { |
374 | m_proxyPassword->setText( config->value() ); | 390 | m_proxyPassword->setText( config->value() ); |
375 | } | 391 | } |
376 | } | 392 | } |
393 | break; | ||
394 | case OConfItem::Other : | ||
395 | { | ||
396 | if ( config->name() == "lists_dir" ) | ||
397 | m_optSourceLists->setText( config->value() ); | ||
398 | else // TODO - use proper libipkg define | ||
399 | m_optSourceLists->setText( "/usr/lib/ipkg/lists" ); | ||
400 | } | ||
401 | break; | ||
402 | default : break; | ||
403 | }; | ||
377 | } | 404 | } |
378 | } | 405 | } |
379 | } | 406 | } |
380 | } | 407 | } |
381 | 408 | ||
382 | // Get Ipkg execution options | 409 | // Get Ipkg execution options |
@@ -510,12 +537,21 @@ void OIpkgConfigDlg::slotDestDelete() | |||
510 | { | 537 | { |
511 | m_configs->removeRef( destination ); | 538 | m_configs->removeRef( destination ); |
512 | m_destList->removeItem( m_destCurrent ); | 539 | m_destList->removeItem( m_destCurrent ); |
513 | } | 540 | } |
514 | } | 541 | } |
515 | 542 | ||
543 | void OIpkgConfigDlg::slotOptSelectSourceListsPath() | ||
544 | { | ||
545 | QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_optSourceLists->text() ); | ||
546 | if ( path.at( path.length() - 1 ) == '/' ) | ||
547 | path.truncate( path.length() - 1 ); | ||
548 | if ( !path.isNull() ) | ||
549 | m_optSourceLists->setText( path ); | ||
550 | } | ||
551 | |||
516 | OIpkgServerDlg::OIpkgServerDlg( OConfItem *server, QWidget *parent ) | 552 | OIpkgServerDlg::OIpkgServerDlg( OConfItem *server, QWidget *parent ) |
517 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) | 553 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) |
518 | , m_server( server ) | 554 | , m_server( server ) |
519 | { | 555 | { |
520 | setCaption( tr( "Edit Server" ) ); | 556 | setCaption( tr( "Edit Server" ) ); |
521 | 557 | ||