author | hrw <hrw> | 2006-01-16 15:07:34 (UTC) |
---|---|---|
committer | hrw <hrw> | 2006-01-16 15:07:34 (UTC) |
commit | 50b379b4637c80273b6f5397c9c20db78410f125 (patch) (side-by-side diff) | |
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 @@ -423,4 +423,6 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); 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; if ( m_ipkgArgs.dest ) 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 @@ -44,4 +44,6 @@ #define FORCE_REINSTALL 0x0004 #define FORCE_OVERWRITE 0x0008 +#define FORCE_RECURSIVE 0x0010 +#define FORCE_VERBOSE_WGET 0x0020 class OConfItemList; 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 @@ -151,4 +151,8 @@ void OIpkgConfigDlg::accept() if ( m_optForceOverwrite->isChecked() ) options |= FORCE_OVERWRITE; + if ( m_optForceRecursive->isChecked() ) + options |= FORCE_RECURSIVE; + if ( m_optVerboseWget->isChecked() ) + options |= FORCE_VERBOSE_WGET; m_ipkg->setIpkgExecOptions( options ); m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); @@ -337,7 +341,15 @@ void OIpkgConfigDlg::initOptionsWidget() layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); + 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 ); m_optVerboseIpkg = new QComboBox( container ); @@ -347,13 +359,13 @@ void OIpkgConfigDlg::initOptionsWidget() m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); - layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); + layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); l = new QLabel( tr( "Package source lists directory:" ), container ); 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 ); m_optSourceLists = new QLineEdit( container ); 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 ); QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), @@ -363,5 +375,5 @@ void OIpkgConfigDlg::initOptionsWidget() QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); - layout->addWidget( btn, 7, 1 ); + layout->addWidget( btn, 9, 1 ); layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); @@ -434,4 +446,8 @@ void OIpkgConfigDlg::initData() if ( options & FORCE_OVERWRITE ) m_optForceOverwrite->setChecked( true ); + if ( options & FORCE_RECURSIVE ) + m_optForceRecursive->setChecked( true ); + if ( options & FORCE_VERBOSE_WGET ) + m_optVerboseWget->setChecked( true ); m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); 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 @@ -97,4 +97,6 @@ private: QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox 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 QLineEdit *m_optSourceLists; // Ipkg source lists destination directory |