-rw-r--r-- | kaddressbook/kabprefs.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabprefs.h | 1 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.h | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index 0c192dd..03c5e76 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp | |||
@@ -57,8 +57,10 @@ KABPrefs::KABPrefs() | |||
57 | addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false ); | 57 | addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false ); |
58 | addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true ); | 58 | addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true ); |
59 | addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter ); | 59 | addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter ); |
60 | addItemIntList( "DetailsSplitter", &mDetailsSplitter ); | 60 | addItemIntList( "DetailsSplitter", &mDetailsSplitter ); |
61 | addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true ); | ||
62 | |||
61 | 63 | ||
62 | KPrefs::setCurrentGroup( "Extensions_General" ); | 64 | KPrefs::setCurrentGroup( "Extensions_General" ); |
63 | QStringList defaultExtensions; | 65 | QStringList defaultExtensions; |
64 | defaultExtensions << "merge"; | 66 | defaultExtensions << "merge"; |
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h index 8f149ac..03e529f 100644 --- a/kaddressbook/kabprefs.h +++ b/kaddressbook/kabprefs.h | |||
@@ -64,8 +64,9 @@ class KABPrefs : public KPimPrefs | |||
64 | 64 | ||
65 | // GUI | 65 | // GUI |
66 | bool mJumpButtonBarVisible; | 66 | bool mJumpButtonBarVisible; |
67 | bool mDetailsPageVisible; | 67 | bool mDetailsPageVisible; |
68 | bool mMultipleViewsAtOnce; | ||
68 | QValueList<int> mExtensionsSplitter; | 69 | QValueList<int> mExtensionsSplitter; |
69 | QValueList<int> mDetailsSplitter; | 70 | QValueList<int> mDetailsSplitter; |
70 | 71 | ||
71 | // Extensions stuff | 72 | // Extensions stuff |
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index b5309c0..31ab7b5 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp | |||
@@ -110,14 +110,17 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
110 | 110 | ||
111 | mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" ); | 111 | mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), groupBox, "mparse" ); |
112 | boxLayout->addWidget( mNameParsing ); | 112 | boxLayout->addWidget( mNameParsing ); |
113 | 113 | ||
114 | mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), groupBox, "mdisplay" ); | ||
115 | boxLayout->addWidget( mMultipleViewsAtOnce ); | ||
116 | |||
114 | layout->addWidget( groupBox ); | 117 | layout->addWidget( groupBox ); |
115 | 118 | ||
116 | 119 | ||
117 | //extensions groupbox | 120 | //extensions groupbox |
118 | 121 | ||
119 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage ); | 122 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), generalPage ); |
120 | boxLayout = new QVBoxLayout( groupBox->layout() ); | 123 | boxLayout = new QVBoxLayout( groupBox->layout() ); |
121 | boxLayout->setAlignment( Qt::AlignTop ); | 124 | boxLayout->setAlignment( Qt::AlignTop ); |
122 | boxLayout->setMargin(KDialog::marginHintSmall()); | 125 | boxLayout->setMargin(KDialog::marginHintSmall()); |
123 | boxLayout->setSpacing(KDialog::spacingHintSmall()); | 126 | boxLayout->setSpacing(KDialog::spacingHintSmall()); |
@@ -138,8 +141,9 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
138 | layout->addWidget( groupBox ); | 141 | layout->addWidget( groupBox ); |
139 | 142 | ||
140 | connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 143 | connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
141 | connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 144 | connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
145 | connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | ||
142 | connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ), | 146 | connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ), |
143 | SLOT( selectionChanged( QListViewItem* ) ) ); | 147 | SLOT( selectionChanged( QListViewItem* ) ) ); |
144 | connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ), | 148 | connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ), |
145 | SLOT( itemClicked( QListViewItem* ) ) ); | 149 | SLOT( itemClicked( QListViewItem* ) ) ); |
@@ -164,8 +168,9 @@ void KABConfigWidget::restoreSettings(KABPrefs* prefs) | |||
164 | blockSignals( true ); | 168 | blockSignals( true ); |
165 | 169 | ||
166 | mNameParsing->setChecked( prefs->mAutomaticNameParsing ); | 170 | mNameParsing->setChecked( prefs->mAutomaticNameParsing ); |
167 | mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick ); | 171 | mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick ); |
172 | mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce ); | ||
168 | 173 | ||
169 | mAddresseeWidget->restoreSettings(); | 174 | mAddresseeWidget->restoreSettings(); |
170 | 175 | ||
171 | restoreExtensionSettings(); | 176 | restoreExtensionSettings(); |
@@ -178,8 +183,9 @@ void KABConfigWidget::restoreSettings(KABPrefs* prefs) | |||
178 | void KABConfigWidget::saveSettings(KABPrefs* prefs) | 183 | void KABConfigWidget::saveSettings(KABPrefs* prefs) |
179 | { | 184 | { |
180 | prefs->mAutomaticNameParsing = mNameParsing->isChecked(); | 185 | prefs->mAutomaticNameParsing = mNameParsing->isChecked(); |
181 | prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked(); | 186 | prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked(); |
187 | prefs->mMultipleViewsAtOnce = mMultipleViewsAtOnce->isChecked(); | ||
182 | 188 | ||
183 | mAddresseeWidget->saveSettings(); | 189 | mAddresseeWidget->saveSettings(); |
184 | 190 | ||
185 | saveExtensionSettings(); | 191 | saveExtensionSettings(); |
@@ -191,8 +197,9 @@ void KABConfigWidget::saveSettings(KABPrefs* prefs) | |||
191 | void KABConfigWidget::defaults(KABPrefs* prefs) | 197 | void KABConfigWidget::defaults(KABPrefs* prefs) |
192 | { | 198 | { |
193 | mNameParsing->setChecked( true ); | 199 | mNameParsing->setChecked( true ); |
194 | mViewsSingleClickBox->setChecked( false ); | 200 | mViewsSingleClickBox->setChecked( false ); |
201 | mMultipleViewsAtOnce->setChecked( true ); | ||
195 | 202 | ||
196 | emit changed( true ); | 203 | emit changed( true ); |
197 | } | 204 | } |
198 | 205 | ||
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 8c0c436..2928495 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h | |||
@@ -67,8 +67,10 @@ class KABConfigWidget : public QWidget | |||
67 | KListView *mExtensionView; | 67 | KListView *mExtensionView; |
68 | 68 | ||
69 | QCheckBox *mNameParsing; | 69 | QCheckBox *mNameParsing; |
70 | QCheckBox *mViewsSingleClickBox; | 70 | QCheckBox *mViewsSingleClickBox; |
71 | QCheckBox *mMultipleViewsAtOnce; | ||
72 | |||
71 | QPushButton *mConfigureButton; | 73 | QPushButton *mConfigureButton; |
72 | 74 | ||
73 | AddresseeWidget *mAddresseeWidget; | 75 | AddresseeWidget *mAddresseeWidget; |
74 | }; | 76 | }; |