summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/installdialog.cpp17
-rw-r--r--noncore/unsupported/oipkg/installdialog.h1
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp2
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
@@ -45,4 +45,4 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
GroupBoxOptionsLayout->setAlignment( Qt::AlignTop );
- GroupBoxOptionsLayout->setSpacing( 2 );
- GroupBoxOptionsLayout->setMargin( 2 );
+ GroupBoxOptionsLayout->setSpacing( 0 );
+ GroupBoxOptionsLayout->setMargin( 0 );
@@ -68,3 +68,3 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
_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" ) );
@@ -73,2 +73,10 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
+ _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 );
@@ -100,4 +108,5 @@ bool InstallDialog::event( QEvent* ev )
_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 );
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
@@ -37,2 +37,3 @@ public: InstallDialog( PackageManagerSettings* s, QWidget* parent = 0, const
QCheckBox* _force_reinstall;
+ QCheckBox* _force_overwrite;
QCheckBox* _force_remove;
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
@@ -77,2 +77,4 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
cmd += " -force-removal-of-essential-packages ";
+ if (installDialog->_force_overwrite->isChecked())
+ cmd += " -force-overwrite ";
}