Diffstat (limited to 'kaddressbook/viewconfigurefilterpage.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/viewconfigurefilterpage.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index b085a5e..cdb778b 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -1,137 +1,140 @@ /* This file is part of KAddressBook. Copyright (c) 2002 Mike Pilone <mpilone@slac.com> 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #ifndef KAB_EMBEDDED #include <kcombobox.h> #else //KAB_EMBEDDED #include <qcombobox.h> #endif //KAB_EMBEDDED -#include <qbuttongroup.h> +#include <q3buttongroup.h> #include <qlabel.h> #include <qlayout.h> #include <qradiobutton.h> +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <Q3VBoxLayout> #include <kconfig.h> #include <kdialog.h> #include <klocale.h> #include "filter.h" #include "viewconfigurefilterpage.h" ViewConfigureFilterPage::ViewConfigureFilterPage( QWidget *parent, const char *name ) : QWidget( parent, name ) { - QBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + Q3BoxLayout *topLayout = new Q3VBoxLayout( this, 0, KDialog::spacingHint() ); - mFilterGroup = new QButtonGroup(); + mFilterGroup = new Q3ButtonGroup(); connect( mFilterGroup, SIGNAL( clicked( int ) ), SLOT( buttonClicked( int ) ) ); QLabel *label = new QLabel( i18n( "The default filter will be activated whenever" " this view is displayed. This feature allows you to configure views that only" " interact with certain types of information based on the filter. Once the view" " is activated, the filter can be changed at anytime." ), this ); label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); topLayout->addWidget( label ); QWidget *spacer = new QWidget( this ); spacer->setMinimumHeight( 5 ); topLayout->addWidget( spacer ); QRadioButton *button = new QRadioButton( i18n( "No default filter" ), this ); mFilterGroup->insert( button ); topLayout->addWidget( button ); button = new QRadioButton( i18n( "Use last active filter" ), this ); mFilterGroup->insert( button ); topLayout->addWidget( button ); - QBoxLayout *comboLayout = new QHBoxLayout(); + Q3BoxLayout *comboLayout = new Q3HBoxLayout(); topLayout->addLayout( comboLayout ); button = new QRadioButton( i18n( "Use filter:" ), this ); mFilterGroup->insert( button ); comboLayout->addWidget( button ); #ifndef KAB_EMBEDDED mFilterCombo = new KComboBox( this ); #else //KAB_EMBEDDED mFilterCombo = new QComboBox( this ); #endif //KAB_EMBEDDED comboLayout->addWidget( mFilterCombo ); } ViewConfigureFilterPage::~ViewConfigureFilterPage() { delete mFilterGroup; } void ViewConfigureFilterPage::restoreSettings( KConfig *config ) { mFilterCombo->clear(); //US I had to adjust the whole method in order to work with QComboBoxes // in case of the Platformindependent version QString defaultfiltername = config->readEntry( "DefaultFilterName" ); int id = config->readNumEntry( "DefaultFilterType", 1 ); mFilterGroup->setButton( id ); buttonClicked( id ); // Load the filter combo Filter::List list = Filter::restore( config, "Filter" ); Filter::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { mFilterCombo->insertItem( (*it).name() ); if ( id == 2 && (*it).name() == defaultfiltername) // has default filter { mFilterCombo->insertItem( (*it).name(), 0); } else { mFilterCombo->insertItem( (*it).name() ); } } } void ViewConfigureFilterPage::saveSettings( KConfig *config ) { config->writeEntry( "DefaultFilterName", mFilterCombo->currentText() ); config->writeEntry( "DefaultFilterType", mFilterGroup->id( mFilterGroup->selected() ) ); } void ViewConfigureFilterPage::buttonClicked( int id ) { mFilterCombo->setEnabled( id == 2 ); } -#ifndef KAB_EMBEDDED -#include "viewconfigurefilterpage.moc" +#ifndef KAB_EMBEDDED_ +#include "moc_viewconfigurefilterpage.cpp" #endif //KAB_EMBEDDED |