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 | |||
@@ -241,6 +241,9 @@ void ViewManager::setActiveView( const QString &name ) | |||
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 |
@@ -290,6 +293,10 @@ void ViewManager::setActiveView( const QString &name ) | |||
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 | { |
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 | |||
@@ -107,7 +107,7 @@ void LookAndFeelPage::restoreSettings( KConfig *config ) | |||
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(); |