author | hrw <hrw> | 2006-01-16 15:07:34 (UTC) |
---|---|---|
committer | hrw <hrw> | 2006-01-16 15:07:34 (UTC) |
commit | 50b379b4637c80273b6f5397c9c20db78410f125 (patch) (unidiff) | |
tree | 13ebc10d48900beaa44450f94a710736420179b9 /noncore/settings | |
parent | 2664267708d5ed695151bf0ec9376080e7bf617e (diff) | |
download | opie-50b379b4637c80273b6f5397c9c20db78410f125.zip opie-50b379b4637c80273b6f5397c9c20db78410f125.tar.gz opie-50b379b4637c80273b6f5397c9c20db78410f125.tar.bz2 |
opie-packagemanager: added two options
- "Force resursive" for -recursive ipkg option
- "Verbose fetch" for -verbose_wget ipkg option
-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 | |||
@@ -424,2 +424,4 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me | |||
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; |
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 | |||
@@ -45,2 +45,4 @@ | |||
45 | #define FORCE_OVERWRITE 0x0008 | 45 | #define FORCE_OVERWRITE 0x0008 |
46 | #define FORCE_RECURSIVE 0x0010 | ||
47 | #define FORCE_VERBOSE_WGET 0x0020 | ||
46 | 48 | ||
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 | |||
@@ -152,2 +152,6 @@ void OIpkgConfigDlg::accept() | |||
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 ); |
@@ -338,5 +342,13 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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 | ||
@@ -348,3 +360,3 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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 | ||
@@ -352,3 +364,3 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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 | ||
@@ -356,3 +368,3 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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 | ||
@@ -364,3 +376,3 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
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 | ||
@@ -435,2 +447,6 @@ void OIpkgConfigDlg::initData() | |||
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 | ||
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 | |||
@@ -98,2 +98,4 @@ private: | |||
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 |