| -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 m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); + m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); + m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); 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 @@ #define FORCE_OVERWRITE 0x0008 +#define FORCE_RECURSIVE 0x0010 +#define FORCE_VERBOSE_WGET 0x0020 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() options |= FORCE_OVERWRITE; + if ( m_optForceRecursive->isChecked() ) + options |= FORCE_RECURSIVE; + if ( m_optVerboseWget->isChecked() ) + options |= FORCE_VERBOSE_WGET; m_ipkg->setIpkgExecOptions( options ); @@ -338,5 +342,13 @@ void OIpkgConfigDlg::initOptionsWidget() + m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); + QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); + layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); + + m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); + QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); + layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); + QLabel *l = new QLabel( tr( "Information level:" ), container ); QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); - layout->addMultiCellWidget( l, 4, 4, 0, 1 ); + layout->addMultiCellWidget( l, 6, 6, 0, 1 ); @@ -348,3 +360,3 @@ void OIpkgConfigDlg::initOptionsWidget() m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); - layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); + layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); @@ -352,3 +364,3 @@ void OIpkgConfigDlg::initOptionsWidget() QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); - layout->addMultiCellWidget( l, 6, 6, 0, 1 ); + layout->addMultiCellWidget( l, 8, 8, 0, 1 ); @@ -356,3 +368,3 @@ void OIpkgConfigDlg::initOptionsWidget() QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); - layout->addWidget( m_optSourceLists, 7, 0 ); + layout->addWidget( m_optSourceLists, 9, 0 ); @@ -364,3 +376,3 @@ void OIpkgConfigDlg::initOptionsWidget() connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); - layout->addWidget( btn, 7, 1 ); + layout->addWidget( btn, 9, 1 ); @@ -435,2 +447,6 @@ void OIpkgConfigDlg::initData() m_optForceOverwrite->setChecked( true ); + if ( options & FORCE_RECURSIVE ) + m_optForceRecursive->setChecked( true ); + if ( options & FORCE_VERBOSE_WGET ) + m_optVerboseWget->setChecked( true ); 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: QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox + QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox + QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection |