Diffstat (limited to 'noncore/settings/aqpkg/instoptionsimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/instoptionsimpl.cpp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp index 47b250d..72d794f 100644 --- a/noncore/settings/aqpkg/instoptionsimpl.cpp +++ b/noncore/settings/aqpkg/instoptionsimpl.cpp @@ -11,32 +11,34 @@ * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifdef QWS #include <qpe/config.h> #endif #include <qcheckbox.h> +#include <qcombobox.h> #include <qgroupbox.h> +#include <qlabel.h> #include <qlayout.h> #include "global.h" #include "instoptionsimpl.h" #include "ipkg.h" -InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const char* name, bool modal, WFlags fl ) +InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, int verb, QWidget * parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { setCaption( tr( "Options" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); layout->setMargin( 2 ); layout->setSpacing( 4 ); QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Options" ), this ); grpbox->layout()->setSpacing( 2 ); grpbox->layout()->setMargin( 4 ); layout->addWidget( grpbox ); @@ -46,37 +48,47 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const forceDepends = new QCheckBox( tr( "Force Depends" ), grpbox ); grplayout->addWidget( forceDepends ); forceReinstall = new QCheckBox( tr( "Force Reinstall" ), grpbox ); grplayout->addWidget( forceReinstall ); forceRemove = new QCheckBox( tr( "Force Remove" ), grpbox ); grplayout->addWidget( forceRemove ); forceOverwrite = new QCheckBox( tr( "Force Overwrite" ), grpbox ); grplayout->addWidget( forceOverwrite ); - verboseWget = new QCheckBox( tr( "Verbose WGet" ), grpbox ); - grplayout->addWidget( verboseWget ); + QLabel *l = new QLabel( tr( "Information Level" ), grpbox ); + grplayout->addWidget( l ); + + verboseIpkg = new QComboBox( grpbox ); + verboseIpkg->insertItem( tr( "Errors only" ) ); + verboseIpkg->insertItem( tr( "Normal messages" ) ); + verboseIpkg->insertItem( tr( "Informative messages" ) ); + verboseIpkg->insertItem( tr( "Troubleshooting output" ) ); + verboseIpkg->setCurrentItem( verb ); + grplayout->addWidget( verboseIpkg ); + + grplayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); if ( flags & FORCE_DEPENDS ) forceDepends->setChecked( true ); if ( flags & FORCE_REINSTALL ) forceReinstall->setChecked( true ); if ( flags & FORCE_REMOVE ) forceRemove->setChecked( true ); if ( flags & FORCE_OVERWRITE ) forceOverwrite->setChecked( true ); - if ( flags & VERBOSE_WGET ) - verboseWget->setChecked( true ); +// if ( flags & VERBOSE_WGET ) +// verboseWget->setChecked( true ); // if ( flags & MAKE_LINKS ) // makeLinks->setChecked( true ); showMaximized(); } InstallOptionsDlgImpl::~InstallOptionsDlgImpl() { } @@ -88,12 +100,17 @@ int InstallOptionsDlgImpl :: getFlags() flags |= FORCE_DEPENDS; if ( forceReinstall->isChecked() ) flags |= FORCE_REINSTALL; if ( forceRemove->isChecked() ) flags |= FORCE_REMOVE; if ( forceOverwrite->isChecked() ) flags |= FORCE_OVERWRITE; if ( verboseWget->isChecked() ) flags |= VERBOSE_WGET; return flags; } + +int InstallOptionsDlgImpl :: getInfoLevel() +{ + return verboseIpkg->currentItem(); +} |