author | zautrix <zautrix> | 2005-08-17 17:09:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 17:09:57 (UTC) |
commit | b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a (patch) (unidiff) | |
tree | ed4d04abe2996cde745757632d8616b23a15670b /kaddressbook | |
parent | c21edc19916722f5dd4e939f1522d311a86411fd (diff) | |
download | kdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.zip kdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.tar.gz kdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.tar.bz2 |
view select fix
-rw-r--r-- | kaddressbook/viewmanager.cpp | 7 | ||||
-rw-r--r-- | kaddressbook/views/configuretableviewdialog.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index c738ad8..b5d9419 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -220,48 +220,51 @@ void ViewManager::setActiveView( const QString &name ) | |||
220 | return; | 220 | return; |
221 | 221 | ||
222 | // At this point we know the view that should be active is not | 222 | // At this point we know the view that should be active is not |
223 | // currently active. We will try to find the new on in the list. If | 223 | // currently active. We will try to find the new on in the list. If |
224 | // we can't find it, it means it hasn't been instantiated, so we will | 224 | // we can't find it, it means it hasn't been instantiated, so we will |
225 | // create it on demand. | 225 | // create it on demand. |
226 | 226 | ||
227 | view = mViewDict.find( name ); | 227 | view = mViewDict.find( name ); |
228 | 228 | ||
229 | // Check if we found the view. If we didn't, then we need to create it | 229 | // Check if we found the view. If we didn't, then we need to create it |
230 | if ( view == 0 ) { | 230 | if ( view == 0 ) { |
231 | KConfig *config = mCore->config(); | 231 | KConfig *config = mCore->config(); |
232 | 232 | ||
233 | KConfigGroupSaver saver( config, name ); | 233 | KConfigGroupSaver saver( config, name ); |
234 | 234 | ||
235 | QString type = config->readEntry( "Type", "Table" ); | 235 | QString type = config->readEntry( "Type", "Table" ); |
236 | 236 | ||
237 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; | 237 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; |
238 | 238 | ||
239 | ViewFactory *factory = mViewFactoryDict.find( type ); | 239 | ViewFactory *factory = mViewFactoryDict.find( type ); |
240 | if ( factory ) | 240 | if ( factory ) |
241 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); | 241 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); |
242 | 242 | ||
243 | if ( view ) { | 243 | if ( view ) { |
244 | if ( !mViewNameList.contains( name ) ) { | ||
245 | mViewNameList.append( name ); | ||
246 | } | ||
244 | view->setCaption( name ); | 247 | view->setCaption( name ); |
245 | mViewDict.insert( name, view ); | 248 | mViewDict.insert( name, view ); |
246 | //US my version needs an int as second parameter to addWidget | 249 | //US my version needs an int as second parameter to addWidget |
247 | mViewWidgetStack->addWidget( view, -1 ); | 250 | mViewWidgetStack->addWidget( view, -1 ); |
248 | view->readConfig( config ); | 251 | view->readConfig( config ); |
249 | 252 | ||
250 | // The manager just relays the signals | 253 | // The manager just relays the signals |
251 | connect( view, SIGNAL( selected( const QString& ) ), | 254 | connect( view, SIGNAL( selected( const QString& ) ), |
252 | SIGNAL( selected( const QString & ) ) ); | 255 | SIGNAL( selected( const QString & ) ) ); |
253 | connect( view, SIGNAL( executed( const QString& ) ), | 256 | connect( view, SIGNAL( executed( const QString& ) ), |
254 | SIGNAL( executed( const QString& ) ) ); | 257 | SIGNAL( executed( const QString& ) ) ); |
255 | 258 | ||
256 | connect( view, SIGNAL( deleteRequest( ) ), | 259 | connect( view, SIGNAL( deleteRequest( ) ), |
257 | SIGNAL( deleteRequest( ) ) ); | 260 | SIGNAL( deleteRequest( ) ) ); |
258 | 261 | ||
259 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); | 262 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); |
260 | connect( view, SIGNAL( dropped( QDropEvent* ) ), | 263 | connect( view, SIGNAL( dropped( QDropEvent* ) ), |
261 | SLOT( dropped( QDropEvent* ) ) ); | 264 | SLOT( dropped( QDropEvent* ) ) ); |
262 | connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) ); | 265 | connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) ); |
263 | } | 266 | } |
264 | } | 267 | } |
265 | 268 | ||
266 | // If we found or created the view, raise it and refresh it | 269 | // If we found or created the view, raise it and refresh it |
267 | if ( view ) { | 270 | if ( view ) { |
@@ -269,48 +272,52 @@ void ViewManager::setActiveView( const QString &name ) | |||
269 | mViewWidgetStack->raiseWidget( view ); | 272 | mViewWidgetStack->raiseWidget( view ); |
270 | // Set the proper filter in the view. By setting the combo | 273 | // Set the proper filter in the view. By setting the combo |
271 | // box, the activated slot will be called, which will push | 274 | // box, the activated slot will be called, which will push |
272 | // the filter to the view and refresh it. | 275 | // the filter to the view and refresh it. |
273 | 276 | ||
274 | if ( view->defaultFilterType() == KAddressBookView::None ) { | 277 | if ( view->defaultFilterType() == KAddressBookView::None ) { |
275 | 278 | ||
276 | mActionSelectFilter->setCurrentItem( 0 ); | 279 | mActionSelectFilter->setCurrentItem( 0 ); |
277 | setActiveFilter( 0 ); | 280 | setActiveFilter( 0 ); |
278 | } else if ( view->defaultFilterType() == KAddressBookView::Active ) { | 281 | } else if ( view->defaultFilterType() == KAddressBookView::Active ) { |
279 | setActiveFilter( mActionSelectFilter->currentItem() ); | 282 | setActiveFilter( mActionSelectFilter->currentItem() ); |
280 | } else { | 283 | } else { |
281 | uint pos = filterPosition( view->defaultFilterName() ); | 284 | uint pos = filterPosition( view->defaultFilterName() ); |
282 | mActionSelectFilter->setCurrentItem( pos ); | 285 | mActionSelectFilter->setCurrentItem( pos ); |
283 | setActiveFilter( pos ); | 286 | setActiveFilter( pos ); |
284 | } | 287 | } |
285 | //US qDebug("ViewManager::setActiveView 6" ); | 288 | //US qDebug("ViewManager::setActiveView 6" ); |
286 | 289 | ||
287 | // Update the inc search widget to show the fields in the new active | 290 | // Update the inc search widget to show the fields in the new active |
288 | // view. | 291 | // view. |
289 | mCore->setSearchFields( mActiveView->fields() ); | 292 | mCore->setSearchFields( mActiveView->fields() ); |
290 | 293 | ||
291 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() | 294 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
292 | //US mActiveView->refresh(); | 295 | //US mActiveView->refresh(); |
296 | |||
297 | mActionSelectView->setItems( mViewNameList ); | ||
298 | mActionSelectView->setCurrentItem( mViewNameList.findIndex( mActiveView->caption() ) ); | ||
299 | |||
293 | } | 300 | } |
294 | else | 301 | else |
295 | { | 302 | { |
296 | qDebug("ViewManager::setActiveView: unable to find view" ); | 303 | qDebug("ViewManager::setActiveView: unable to find view" ); |
297 | } | 304 | } |
298 | } | 305 | } |
299 | 306 | ||
300 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 307 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
301 | void ViewManager::refreshView() | 308 | void ViewManager::refreshView() |
302 | { | 309 | { |
303 | refreshView( QString::null ); | 310 | refreshView( QString::null ); |
304 | } | 311 | } |
305 | 312 | ||
306 | void ViewManager::refreshView( const QString &uid ) | 313 | void ViewManager::refreshView( const QString &uid ) |
307 | { | 314 | { |
308 | if ( mActiveView ) | 315 | if ( mActiveView ) |
309 | mActiveView->refresh( uid ); | 316 | mActiveView->refresh( uid ); |
310 | } | 317 | } |
311 | 318 | ||
312 | void ViewManager::setFocusAV() | 319 | void ViewManager::setFocusAV() |
313 | { | 320 | { |
314 | if ( mActiveView ) | 321 | if ( mActiveView ) |
315 | mActiveView->setFocusAV(); | 322 | mActiveView->setFocusAV(); |
316 | } | 323 | } |
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 0e36abd..c329cd9 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp | |||
@@ -86,49 +86,49 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config ) | |||
86 | LookAndFeelPage::LookAndFeelPage(QWidget *parent, const char *name) | 86 | LookAndFeelPage::LookAndFeelPage(QWidget *parent, const char *name) |
87 | : QVBox(parent, name) | 87 | : QVBox(parent, name) |
88 | { | 88 | { |
89 | initGUI(); | 89 | initGUI(); |
90 | 90 | ||
91 | // Set initial state | 91 | // Set initial state |
92 | enableBackgroundToggled(mBackgroundBox->isChecked()); | 92 | enableBackgroundToggled(mBackgroundBox->isChecked()); |
93 | } | 93 | } |
94 | 94 | ||
95 | void LookAndFeelPage::restoreSettings( KConfig *config ) | 95 | void LookAndFeelPage::restoreSettings( KConfig *config ) |
96 | { | 96 | { |
97 | mAlternateButton->setChecked(config->readBoolEntry("ABackground", true)); | 97 | mAlternateButton->setChecked(config->readBoolEntry("ABackground", true)); |
98 | mLineButton->setChecked(config->readBoolEntry("SingleLine", false)); | 98 | mLineButton->setChecked(config->readBoolEntry("SingleLine", false)); |
99 | mToolTipBox->setChecked(config->readBoolEntry("ToolTips", true)); | 99 | mToolTipBox->setChecked(config->readBoolEntry("ToolTips", true)); |
100 | 100 | ||
101 | if (!mAlternateButton->isChecked() & !mLineButton->isChecked()) | 101 | if (!mAlternateButton->isChecked() & !mLineButton->isChecked()) |
102 | mNoneButton->setChecked(true); | 102 | mNoneButton->setChecked(true); |
103 | 103 | ||
104 | mBackgroundBox->setChecked(config->readBoolEntry("Background", false)); | 104 | mBackgroundBox->setChecked(config->readBoolEntry("Background", false)); |
105 | mBackgroundName->lineEdit()->setText(config->readEntry("BackgroundName")); | 105 | mBackgroundName->lineEdit()->setText(config->readEntry("BackgroundName")); |
106 | 106 | ||
107 | // colors | 107 | // colors |
108 | cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); | 108 | cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); |
109 | QColor c; | 109 | QColor c; |
110 | qDebug("LookAndFeelPage::restoreSettings make base color configurable"); | 110 | //qDebug("LookAndFeelPage::restoreSettings make base color configurable"); |
111 | 111 | ||
112 | #ifndef KAB_EMBEDDED | 112 | #ifndef KAB_EMBEDDED |
113 | c = KGlobalSettings::baseColor(); | 113 | c = KGlobalSettings::baseColor(); |
114 | #else //KAB_EMBEDDED | 114 | #else //KAB_EMBEDDED |
115 | c = QColor(0,0,0); | 115 | c = QColor(0,0,0); |
116 | #endif //KAB_EMBEDDED | 116 | #endif //KAB_EMBEDDED |
117 | 117 | ||
118 | c = colorGroup().background(); | 118 | c = colorGroup().background(); |
119 | lbColors->insertItem( new ColorListItem( i18n("Background Color"), | 119 | lbColors->insertItem( new ColorListItem( i18n("Background Color"), |
120 | config->readColorEntry( "BackgroundColor", &c ) ) ); | 120 | config->readColorEntry( "BackgroundColor", &c ) ) ); |
121 | c = colorGroup().foreground(); | 121 | c = colorGroup().foreground(); |
122 | lbColors->insertItem( new ColorListItem( i18n("Text Color"), | 122 | lbColors->insertItem( new ColorListItem( i18n("Text Color"), |
123 | config->readColorEntry( "TextColor", &c ) ) ); | 123 | config->readColorEntry( "TextColor", &c ) ) ); |
124 | c = colorGroup().button(); | 124 | c = colorGroup().button(); |
125 | lbColors->insertItem( new ColorListItem( i18n("Header Background Color"), | 125 | lbColors->insertItem( new ColorListItem( i18n("Header Background Color"), |
126 | config->readColorEntry( "HeaderBackgroundColor", &c ) ) ); | 126 | config->readColorEntry( "HeaderBackgroundColor", &c ) ) ); |
127 | c = colorGroup().buttonText(); | 127 | c = colorGroup().buttonText(); |
128 | lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), | 128 | lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), |
129 | config->readColorEntry( "HeaderTextColor", &c ) ) ); | 129 | config->readColorEntry( "HeaderTextColor", &c ) ) ); |
130 | c = colorGroup().highlight(); | 130 | c = colorGroup().highlight(); |
131 | lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), | 131 | lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), |
132 | config->readColorEntry( "HighlightColor", &c ) ) ); | 132 | config->readColorEntry( "HighlightColor", &c ) ) ); |
133 | c = colorGroup().highlightedText(); | 133 | c = colorGroup().highlightedText(); |
134 | lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), | 134 | lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), |