From a2d8fcc8f1fcd64c01e41cb8ba31ae17a5ea5a8b Mon Sep 17 00:00:00 2001 From: ulf69 Date: Thu, 02 Sep 2004 23:07:29 +0000 Subject: sourceforge 1014892, quit dialog now configurable --- (limited to 'kaddressbook/kcmconfigs') diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 31ab7b5..3a2ccbb 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -98,28 +99,37 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), KDialog::spacingHintSmall() ); //general groupbox - QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() ); + QVBox *vBox = new QVBox( generalPage, "qvbox" ); + QVBoxLayout *boxLayout = new QVBoxLayout( vBox->layout(), -1, "qvboxlayout" ); boxLayout->setAlignment( Qt::AlignTop ); boxLayout->setMargin(KDialog::marginHintSmall() ); - groupBox->layout()->setMargin(KDialog::marginHintSmall()) ; - groupBox->layout()->setSpacing(KDialog::spacingHintSmall()); + vBox->layout()->setMargin(KDialog::marginHintSmall()) ; + vBox->layout()->setSpacing(KDialog::spacingHintSmall()); boxLayout->setSpacing( KDialog::spacingHintSmall() ); - mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); + mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); - mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" ); + mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), vBox, "mparse" ); boxLayout->addWidget( mNameParsing ); - mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), groupBox, "mdisplay" ); + mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" ); boxLayout->addWidget( mMultipleViewsAtOnce ); - layout->addWidget( groupBox ); + mAskForQuit = new QCheckBox( i18n( "Ask for quit when closing Ka/Pi" ), vBox, "mquit" ); + boxLayout->addWidget( mAskForQuit ); + layout->addWidget( vBox ); + + tabWidget->addTab( generalPage, i18n( "General" ) ); + + // Extension page + QWidget *extensionPage = new QWidget( this ); + QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(), + KDialog::spacingHintSmall() ); //extensions groupbox - groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), generalPage ); + QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage ); boxLayout = new QVBoxLayout( groupBox->layout() ); boxLayout->setAlignment( Qt::AlignTop ); boxLayout->setMargin(KDialog::marginHintSmall()); @@ -138,11 +148,12 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) mConfigureButton->setEnabled( false ); boxLayout->addWidget( mConfigureButton ); - layout->addWidget( groupBox ); + extensionLayout->addWidget( groupBox ); connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); + connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ), SLOT( selectionChanged( QListViewItem* ) ) ); connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ), @@ -150,7 +161,7 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) connect( mConfigureButton, SIGNAL( clicked() ), SLOT( configureExtension() ) ); - tabWidget->addTab( generalPage, i18n( "General" ) ); + tabWidget->addTab( extensionPage, i18n( "Extensions" ) ); // Addressee page mAddresseeWidget = new AddresseeWidget( this ); @@ -170,6 +181,7 @@ void KABConfigWidget::restoreSettings(KABPrefs* prefs) mNameParsing->setChecked( prefs->mAutomaticNameParsing ); mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick ); mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce ); + mAskForQuit->setChecked( prefs->mAskForQuit ); mAddresseeWidget->restoreSettings(); @@ -185,6 +197,7 @@ void KABConfigWidget::saveSettings(KABPrefs* prefs) prefs->mAutomaticNameParsing = mNameParsing->isChecked(); prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked(); prefs->mMultipleViewsAtOnce = mMultipleViewsAtOnce->isChecked(); + prefs->mAskForQuit = mAskForQuit->isChecked(); mAddresseeWidget->saveSettings(); @@ -199,6 +212,7 @@ void KABConfigWidget::defaults(KABPrefs* prefs) mNameParsing->setChecked( true ); mViewsSingleClickBox->setChecked( false ); mMultipleViewsAtOnce->setChecked( true ); + mAskForQuit->setChecked (true); emit changed( true ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 2928495..831efc1 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h @@ -69,6 +69,7 @@ class KABConfigWidget : public QWidget QCheckBox *mNameParsing; QCheckBox *mViewsSingleClickBox; QCheckBox *mMultipleViewsAtOnce; + QCheckBox *mAskForQuit; QPushButton *mConfigureButton; -- cgit v0.9.0.2