summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp2
-rw-r--r--noncore/settings/packagemanager/oipkg.h2
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp26
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.h2
5 files changed, 28 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f0dcbb..a9639ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,9 @@
New Features
------------
* Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
* Opie-Notes: Notes application based on NoteZ (hrw)
+ * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
Fixed Bugs
----------
* #1695 - Date selector use too small fontsize on VGA screen (hrw)
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
@@ -421,8 +421,10 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList &parame
m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS );
m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL );
// 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 )
free( m_ipkgArgs.dest );
if ( !destination.isNull() )
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
@@ -42,8 +42,10 @@
#define FORCE_DEPENDS 0x0001
#define FORCE_REMOVE 0x0002
#define FORCE_REINSTALL 0x0004
#define FORCE_OVERWRITE 0x0008
+#define FORCE_RECURSIVE 0x0010
+#define FORCE_VERBOSE_WGET 0x0020
class OConfItemList;
class OIpkg : public QObject
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
@@ -149,8 +149,12 @@ void OIpkgConfigDlg::accept()
if ( m_optForceRemove->isChecked() )
options |= FORCE_REMOVE;
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() );
QDialog::accept();
@@ -335,35 +339,43 @@ void OIpkgConfigDlg::initOptionsWidget()
m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container );
QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) );
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 );
QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) );
m_optVerboseIpkg->insertItem( tr( "Errors only" ) );
m_optVerboseIpkg->insertItem( tr( "Normal messages" ) );
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 ),
QString::null, container );
btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
btn->setMaximumWidth( btn->height() );
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 ) );
}
@@ -432,8 +444,12 @@ void OIpkgConfigDlg::initData()
if ( options & FORCE_REMOVE )
m_optForceRemove->setChecked( true );
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
@@ -95,8 +95,10 @@ private:
QCheckBox *m_optForceDepends; // Force depends ipkg option checkbox
QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox
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
void initServerWidget();