| author | tille <tille> | 2002-07-30 14:37:26 (UTC) |
|---|---|---|
| committer | tille <tille> | 2002-07-30 14:37:26 (UTC) |
| commit | 988409a5a21b3a4238ce41316e48777c885f147a (patch) (side-by-side diff) | |
| tree | 0c62baa663e715f81e936664e0775dddb96ea519 /noncore | |
| parent | 0adb56cb2cd83e9933baa9776c77c4c637f93d04 (diff) | |
| download | opie-988409a5a21b3a4238ce41316e48777c885f147a.zip opie-988409a5a21b3a4238ce41316e48777c885f147a.tar.gz opie-988409a5a21b3a4238ce41316e48777c885f147a.tar.bz2 | |
Added -force-overwrite ipkg option
| -rw-r--r-- | noncore/unsupported/oipkg/installdialog.cpp | 17 | ||||
| -rw-r--r-- | noncore/unsupported/oipkg/installdialog.h | 1 | ||||
| -rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/noncore/unsupported/oipkg/installdialog.cpp b/noncore/unsupported/oipkg/installdialog.cpp index c676e84..fd93ad3 100644 --- a/noncore/unsupported/oipkg/installdialog.cpp +++ b/noncore/unsupported/oipkg/installdialog.cpp @@ -44,6 +44,6 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const GroupBoxOptionsLayout = new QGridLayout( GroupBoxOptions->layout() ); GroupBoxOptionsLayout->setAlignment( Qt::AlignTop ); - GroupBoxOptionsLayout->setSpacing( 2 ); - GroupBoxOptionsLayout->setMargin( 2 ); + GroupBoxOptionsLayout->setSpacing( 0 ); + GroupBoxOptionsLayout->setMargin( 0 ); _force_depends = new QCheckBox( GroupBoxOptions, "_force_depends" ); @@ -67,9 +67,17 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const QFont _force_remove_font( _force_remove->font() ); _force_remove_font.setPointSize( 8 ); - _force_remove->setFont( _force_remove_font ); + _force_remove->setFont( _force_remove_font ); _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); GroupBoxOptionsLayout->addWidget( _force_remove, 2, 0 ); + _force_overwrite = new QCheckBox( GroupBoxOptions, "_force_overwrite" ); + QFont _force_overwrite_font( _force_overwrite->font() ); + _force_overwrite_font.setPointSize( 8 ); + _force_overwrite->setFont( _force_overwrite_font ); + _force_overwrite->setText( tr( "-force-overwrite" ) ); + + GroupBoxOptionsLayout->addWidget(_force_overwrite, 3, 0 ); + InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 ); toRemoveItem = new QCheckListItem( ListViewPackages, tr("To remove") ); @@ -99,6 +107,7 @@ bool InstallDialog::event( QEvent* ev ) QFont _force_reinstall_font( _force_reinstall->font() ); _force_reinstall_font.setPointSize( 8 ); - _force_reinstall->setFont( _force_reinstall_font ); + _force_reinstall->setFont( _force_reinstall_font ); QFont _force_remove_font( _force_remove->font() ); + QFont _force_overwrite_font( _force_overwrite->font() ); _force_remove_font.setPointSize( 8 ); _force_remove->setFont( _force_remove_font ); diff --git a/noncore/unsupported/oipkg/installdialog.h b/noncore/unsupported/oipkg/installdialog.h index 828c8df..d3510ff 100644 --- a/noncore/unsupported/oipkg/installdialog.h +++ b/noncore/unsupported/oipkg/installdialog.h @@ -36,4 +36,5 @@ public: InstallDialog( PackageManagerSettings* s, QWidget* parent = 0, const QCheckBox* _force_depends; QCheckBox* _force_reinstall; + QCheckBox* _force_overwrite; QCheckBox* _force_remove; QCheckListItem *toRemoveItem; diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 84de67b..2ed313c 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -76,4 +76,6 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) if (installDialog->_force_remove->isChecked()) cmd += " -force-removal-of-essential-packages "; + if (installDialog->_force_overwrite->isChecked()) + cmd += " -force-overwrite "; } } //!args.contains("update") |