Diffstat (limited to 'noncore/settings/packagemanager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.h | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 26 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.h | 2 |
4 files changed, 27 insertions, 5 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index ffb3687..38cd824 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -413,24 +413,26 @@ OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name ) | |||
413 | 413 | ||
414 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, | 414 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, |
415 | const QObject *receiver, const char *slotOutput, bool rawOutput ) | 415 | const QObject *receiver, const char *slotOutput, bool rawOutput ) |
416 | { | 416 | { |
417 | if ( command == OPackage::NotDefined ) | 417 | if ( command == OPackage::NotDefined ) |
418 | return false; | 418 | return false; |
419 | 419 | ||
420 | // Set ipkg run-time options/arguments | 420 | // Set ipkg run-time options/arguments |
421 | m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); | 421 | m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); |
422 | m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); | 422 | m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); |
423 | // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); | 423 | // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); |
424 | m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); | 424 | m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); |
425 | m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); | ||
426 | m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); | ||
425 | m_ipkgArgs.verbosity = m_ipkgExecVerbosity; | 427 | m_ipkgArgs.verbosity = m_ipkgExecVerbosity; |
426 | if ( m_ipkgArgs.dest ) | 428 | if ( m_ipkgArgs.dest ) |
427 | free( m_ipkgArgs.dest ); | 429 | free( m_ipkgArgs.dest ); |
428 | if ( !destination.isNull() ) | 430 | if ( !destination.isNull() ) |
429 | { | 431 | { |
430 | int len = destination.length() + 1; | 432 | int len = destination.length() + 1; |
431 | m_ipkgArgs.dest = (char *)malloc( len ); | 433 | m_ipkgArgs.dest = (char *)malloc( len ); |
432 | strncpy( m_ipkgArgs.dest, destination, destination.length() ); | 434 | strncpy( m_ipkgArgs.dest, destination, destination.length() ); |
433 | m_ipkgArgs.dest[ len - 1 ] = '\0'; | 435 | m_ipkgArgs.dest[ len - 1 ] = '\0'; |
434 | } | 436 | } |
435 | else | 437 | else |
436 | m_ipkgArgs.dest = 0l; | 438 | m_ipkgArgs.dest = 0l; |
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h index 9a7802c..88f0e32 100644 --- a/noncore/settings/packagemanager/oipkg.h +++ b/noncore/settings/packagemanager/oipkg.h | |||
@@ -34,24 +34,26 @@ | |||
34 | #include "oconfitem.h" | 34 | #include "oconfitem.h" |
35 | #include "opackage.h" | 35 | #include "opackage.h" |
36 | 36 | ||
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | 38 | ||
39 | #include <qobject.h> | 39 | #include <qobject.h> |
40 | 40 | ||
41 | // Ipkg execution options (m_ipkgExecOptions) | 41 | // Ipkg execution options (m_ipkgExecOptions) |
42 | #define FORCE_DEPENDS 0x0001 | 42 | #define FORCE_DEPENDS 0x0001 |
43 | #define FORCE_REMOVE 0x0002 | 43 | #define FORCE_REMOVE 0x0002 |
44 | #define FORCE_REINSTALL 0x0004 | 44 | #define FORCE_REINSTALL 0x0004 |
45 | #define FORCE_OVERWRITE 0x0008 | 45 | #define FORCE_OVERWRITE 0x0008 |
46 | #define FORCE_RECURSIVE 0x0010 | ||
47 | #define FORCE_VERBOSE_WGET 0x0020 | ||
46 | 48 | ||
47 | class OConfItemList; | 49 | class OConfItemList; |
48 | 50 | ||
49 | class OIpkg : public QObject | 51 | class OIpkg : public QObject |
50 | { | 52 | { |
51 | Q_OBJECT | 53 | Q_OBJECT |
52 | 54 | ||
53 | public: | 55 | public: |
54 | OIpkg( Config *config = 0l, QObject *parent = 0l, const char *name = 0l ); | 56 | OIpkg( Config *config = 0l, QObject *parent = 0l, const char *name = 0l ); |
55 | ~OIpkg(); | 57 | ~OIpkg(); |
56 | 58 | ||
57 | OConfItemList *configItems(); | 59 | OConfItemList *configItems(); |
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index 58c572b..d014378 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -141,24 +141,28 @@ void OIpkgConfigDlg::accept() | |||
141 | } | 141 | } |
142 | 142 | ||
143 | // Save options configuration | 143 | // Save options configuration |
144 | int options = 0; | 144 | int options = 0; |
145 | if ( m_optForceDepends->isChecked() ) | 145 | if ( m_optForceDepends->isChecked() ) |
146 | options |= FORCE_DEPENDS; | 146 | options |= FORCE_DEPENDS; |
147 | if ( m_optForceReinstall->isChecked() ) | 147 | if ( m_optForceReinstall->isChecked() ) |
148 | options |= FORCE_REINSTALL; | 148 | options |= FORCE_REINSTALL; |
149 | if ( m_optForceRemove->isChecked() ) | 149 | if ( m_optForceRemove->isChecked() ) |
150 | options |= FORCE_REMOVE; | 150 | options |= FORCE_REMOVE; |
151 | if ( m_optForceOverwrite->isChecked() ) | 151 | if ( m_optForceOverwrite->isChecked() ) |
152 | options |= FORCE_OVERWRITE; | 152 | options |= FORCE_OVERWRITE; |
153 | if ( m_optForceRecursive->isChecked() ) | ||
154 | options |= FORCE_RECURSIVE; | ||
155 | if ( m_optVerboseWget->isChecked() ) | ||
156 | options |= FORCE_VERBOSE_WGET; | ||
153 | m_ipkg->setIpkgExecOptions( options ); | 157 | m_ipkg->setIpkgExecOptions( options ); |
154 | m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); | 158 | m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); |
155 | 159 | ||
156 | QDialog::accept(); | 160 | QDialog::accept(); |
157 | } | 161 | } |
158 | 162 | ||
159 | void OIpkgConfigDlg::reject() | 163 | void OIpkgConfigDlg::reject() |
160 | { | 164 | { |
161 | if ( m_configs ) | 165 | if ( m_configs ) |
162 | delete m_configs; | 166 | delete m_configs; |
163 | } | 167 | } |
164 | 168 | ||
@@ -327,51 +331,59 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
327 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); | 331 | m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container ); |
328 | QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) ); | 332 | QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) ); |
329 | layout->addMultiCellWidget( m_optForceReinstall, 1, 1, 0, 1 ); | 333 | layout->addMultiCellWidget( m_optForceReinstall, 1, 1, 0, 1 ); |
330 | 334 | ||
331 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); | 335 | m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container ); |
332 | QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) ); | 336 | QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) ); |
333 | layout->addMultiCellWidget( m_optForceRemove, 2, 2, 0, 1 ); | 337 | layout->addMultiCellWidget( m_optForceRemove, 2, 2, 0, 1 ); |
334 | 338 | ||
335 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); | 339 | m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container ); |
336 | QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); | 340 | QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); |
337 | layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); | 341 | layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); |
338 | 342 | ||
343 | m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); | ||
344 | QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); | ||
345 | layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); | ||
346 | |||
347 | m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); | ||
348 | QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); | ||
349 | layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); | ||
350 | |||
339 | QLabel *l = new QLabel( tr( "Information level:" ), container ); | 351 | QLabel *l = new QLabel( tr( "Information level:" ), container ); |
340 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); | 352 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); |
341 | layout->addMultiCellWidget( l, 4, 4, 0, 1 ); | 353 | layout->addMultiCellWidget( l, 6, 6, 0, 1 ); |
342 | 354 | ||
343 | m_optVerboseIpkg = new QComboBox( container ); | 355 | m_optVerboseIpkg = new QComboBox( container ); |
344 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); | 356 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); |
345 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); | 357 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); |
346 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); | 358 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); |
347 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); | 359 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); |
348 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); | 360 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); |
349 | layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); | 361 | layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); |
350 | 362 | ||
351 | l = new QLabel( tr( "Package source lists directory:" ), container ); | 363 | l = new QLabel( tr( "Package source lists directory:" ), container ); |
352 | QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); | 364 | QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); |
353 | layout->addMultiCellWidget( l, 6, 6, 0, 1 ); | 365 | layout->addMultiCellWidget( l, 8, 8, 0, 1 ); |
354 | 366 | ||
355 | m_optSourceLists = new QLineEdit( container ); | 367 | m_optSourceLists = new QLineEdit( container ); |
356 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); | 368 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); |
357 | layout->addWidget( m_optSourceLists, 7, 0 ); | 369 | layout->addWidget( m_optSourceLists, 9, 0 ); |
358 | 370 | ||
359 | QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), | 371 | QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), |
360 | QString::null, container ); | 372 | QString::null, container ); |
361 | btn->setMinimumHeight( AppLnk::smallIconSize()+4 ); | 373 | btn->setMinimumHeight( AppLnk::smallIconSize()+4 ); |
362 | btn->setMaximumWidth( btn->height() ); | 374 | btn->setMaximumWidth( btn->height() ); |
363 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); | 375 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); |
364 | connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); | 376 | connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); |
365 | layout->addWidget( btn, 7, 1 ); | 377 | layout->addWidget( btn, 9, 1 ); |
366 | 378 | ||
367 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); | 379 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); |
368 | } | 380 | } |
369 | 381 | ||
370 | void OIpkgConfigDlg::initData() | 382 | void OIpkgConfigDlg::initData() |
371 | { | 383 | { |
372 | // Read ipkg configuration (server/destination/proxy) information | 384 | // Read ipkg configuration (server/destination/proxy) information |
373 | if ( m_ipkg && !m_installOptions ) | 385 | if ( m_ipkg && !m_installOptions ) |
374 | { | 386 | { |
375 | m_configs = m_ipkg->configItems(); | 387 | m_configs = m_ipkg->configItems(); |
376 | if ( m_configs ) | 388 | if ( m_configs ) |
377 | { | 389 | { |
@@ -424,24 +436,28 @@ void OIpkgConfigDlg::initData() | |||
424 | } | 436 | } |
425 | 437 | ||
426 | // Get Ipkg execution options | 438 | // Get Ipkg execution options |
427 | int options = m_ipkg->ipkgExecOptions(); | 439 | int options = m_ipkg->ipkgExecOptions(); |
428 | if ( options & FORCE_DEPENDS ) | 440 | if ( options & FORCE_DEPENDS ) |
429 | m_optForceDepends->setChecked( true ); | 441 | m_optForceDepends->setChecked( true ); |
430 | if ( options & FORCE_REINSTALL ) | 442 | if ( options & FORCE_REINSTALL ) |
431 | m_optForceReinstall->setChecked( true ); | 443 | m_optForceReinstall->setChecked( true ); |
432 | if ( options & FORCE_REMOVE ) | 444 | if ( options & FORCE_REMOVE ) |
433 | m_optForceRemove->setChecked( true ); | 445 | m_optForceRemove->setChecked( true ); |
434 | if ( options & FORCE_OVERWRITE ) | 446 | if ( options & FORCE_OVERWRITE ) |
435 | m_optForceOverwrite->setChecked( true ); | 447 | m_optForceOverwrite->setChecked( true ); |
448 | if ( options & FORCE_RECURSIVE ) | ||
449 | m_optForceRecursive->setChecked( true ); | ||
450 | if ( options & FORCE_VERBOSE_WGET ) | ||
451 | m_optVerboseWget->setChecked( true ); | ||
436 | 452 | ||
437 | m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); | 453 | m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); |
438 | } | 454 | } |
439 | 455 | ||
440 | void OIpkgConfigDlg::slotServerSelected( int index ) | 456 | void OIpkgConfigDlg::slotServerSelected( int index ) |
441 | { | 457 | { |
442 | m_serverCurrent = index; | 458 | m_serverCurrent = index; |
443 | 459 | ||
444 | // Enable Edit and Delete buttons | 460 | // Enable Edit and Delete buttons |
445 | m_serverEditBtn->setEnabled( true ); | 461 | m_serverEditBtn->setEnabled( true ); |
446 | m_serverDeleteBtn->setEnabled( true ); | 462 | m_serverDeleteBtn->setEnabled( true ); |
447 | } | 463 | } |
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h index 88381ab..36ab9a0 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.h +++ b/noncore/settings/packagemanager/oipkgconfigdlg.h | |||
@@ -87,24 +87,26 @@ private: | |||
87 | QLineEdit *m_proxyHttpServer; // HTTP proxy server URL edit box | 87 | QLineEdit *m_proxyHttpServer; // HTTP proxy server URL edit box |
88 | QCheckBox *m_proxyHttpActive; // Activate HTTP proxy check box | 88 | QCheckBox *m_proxyHttpActive; // Activate HTTP proxy check box |
89 | QLineEdit *m_proxyFtpServer; // FTP proxy server edit box | 89 | QLineEdit *m_proxyFtpServer; // FTP proxy server edit box |
90 | QCheckBox *m_proxyFtpActive; // Activate FTP proxy check box | 90 | QCheckBox *m_proxyFtpActive; // Activate FTP proxy check box |
91 | QLineEdit *m_proxyUsername; // Proxy server username edit box | 91 | QLineEdit *m_proxyUsername; // Proxy server username edit box |
92 | QLineEdit *m_proxyPassword; // Proxy server password edit box | 92 | QLineEdit *m_proxyPassword; // Proxy server password edit box |
93 | 93 | ||
94 | // Options configuration UI controls | 94 | // Options configuration UI controls |
95 | QCheckBox *m_optForceDepends; // Force depends ipkg option checkbox | 95 | QCheckBox *m_optForceDepends; // Force depends ipkg option checkbox |
96 | QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox | 96 | QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox |
97 | QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox | 97 | QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox |
98 | QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox | 98 | QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox |
99 | QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox | ||
100 | QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox | ||
99 | QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection | 101 | QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection |
100 | QLineEdit *m_optSourceLists; // Ipkg source lists destination directory | 102 | QLineEdit *m_optSourceLists; // Ipkg source lists destination directory |
101 | 103 | ||
102 | void initServerWidget(); | 104 | void initServerWidget(); |
103 | void initDestinationWidget(); | 105 | void initDestinationWidget(); |
104 | void initProxyWidget(); | 106 | void initProxyWidget(); |
105 | void initOptionsWidget(); | 107 | void initOptionsWidget(); |
106 | 108 | ||
107 | void initData(); | 109 | void initData(); |
108 | 110 | ||
109 | private slots: | 111 | private slots: |
110 | void slotServerSelected( int index ); | 112 | void slotServerSelected( int index ); |