summaryrefslogtreecommitdiff
Unidiff
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
45 GroupBoxOptionsLayout->setAlignment( Qt::AlignTop ); 45 GroupBoxOptionsLayout->setAlignment( Qt::AlignTop );
46 GroupBoxOptionsLayout->setSpacing( 2 ); 46 GroupBoxOptionsLayout->setSpacing( 0 );
47 GroupBoxOptionsLayout->setMargin( 2 ); 47 GroupBoxOptionsLayout->setMargin( 0 );
48 48
@@ -68,3 +68,3 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
68 _force_remove_font.setPointSize( 8 ); 68 _force_remove_font.setPointSize( 8 );
69 _force_remove->setFont( _force_remove_font ); 69 _force_remove->setFont( _force_remove_font );
70 _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); 70 _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
@@ -73,2 +73,10 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
73 73
74 _force_overwrite = new QCheckBox( GroupBoxOptions, "_force_overwrite" );
75 QFont _force_overwrite_font( _force_overwrite->font() );
76 _force_overwrite_font.setPointSize( 8 );
77 _force_overwrite->setFont( _force_overwrite_font );
78 _force_overwrite->setText( tr( "-force-overwrite" ) );
79
80 GroupBoxOptionsLayout->addWidget(_force_overwrite, 3, 0 );
81
74 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 ); 82 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 );
@@ -100,4 +108,5 @@ bool InstallDialog::event( QEvent* ev )
100 _force_reinstall_font.setPointSize( 8 ); 108 _force_reinstall_font.setPointSize( 8 );
101 _force_reinstall->setFont( _force_reinstall_font ); 109 _force_reinstall->setFont( _force_reinstall_font );
102 QFont _force_remove_font( _force_remove->font() ); 110 QFont _force_remove_font( _force_remove->font() );
111 QFont _force_overwrite_font( _force_overwrite->font() );
103 _force_remove_font.setPointSize( 8 ); 112 _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
37 QCheckBox* _force_reinstall; 37 QCheckBox* _force_reinstall;
38 QCheckBox* _force_overwrite;
38 QCheckBox* _force_remove; 39 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 )
77 cmd += " -force-removal-of-essential-packages "; 77 cmd += " -force-removal-of-essential-packages ";
78 if (installDialog->_force_overwrite->isChecked())
79 cmd += " -force-overwrite ";
78 } 80 }