| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
| -rw-r--r-- | kaddressbook/viewmanager.cpp | 7 | ||||
| -rw-r--r-- | kaddressbook/views/configuretableviewdialog.cpp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 2e5cf50..18e94a7 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -4,12 +4,13 @@ Info about the changes in new versions of KDE-Pim/Pi KO/Pi: Fixed a problem displaying very long allday events in agenda view in single day mode. KA/Pi: Added a config option to turn on asking before a contact is deleted. +Fixed a problem with the default view and view selection at startup. ********** VERSION 2.2.0 ************ New stable release! Fixed some minor usability problems. Added writing of next alarm to a file for usage on pdaXrom. diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index c738ad8..b5d9419 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -238,12 +238,15 @@ void ViewManager::setActiveView( const QString &name ) ViewFactory *factory = mViewFactoryDict.find( type ); if ( factory ) view = factory->view( mCore->addressBook(), mViewWidgetStack ); if ( view ) { + if ( !mViewNameList.contains( name ) ) { + mViewNameList.append( name ); + } view->setCaption( name ); mViewDict.insert( name, view ); //US my version needs an int as second parameter to addWidget mViewWidgetStack->addWidget( view, -1 ); view->readConfig( config ); @@ -287,12 +290,16 @@ void ViewManager::setActiveView( const QString &name ) // Update the inc search widget to show the fields in the new active // view. mCore->setSearchFields( mActiveView->fields() ); //US performance optimization. setActiveFilter calls also mActiveView->refresh() //US mActiveView->refresh(); + + mActionSelectView->setItems( mViewNameList ); + mActionSelectView->setCurrentItem( mViewNameList.findIndex( mActiveView->caption() ) ); + } else { qDebug("ViewManager::setActiveView: unable to find view" ); } } 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 @@ -104,13 +104,13 @@ void LookAndFeelPage::restoreSettings( KConfig *config ) mBackgroundBox->setChecked(config->readBoolEntry("Background", false)); mBackgroundName->lineEdit()->setText(config->readEntry("BackgroundName")); // colors cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); QColor c; -qDebug("LookAndFeelPage::restoreSettings make base color configurable"); + //qDebug("LookAndFeelPage::restoreSettings make base color configurable"); #ifndef KAB_EMBEDDED c = KGlobalSettings::baseColor(); #else //KAB_EMBEDDED c = QColor(0,0,0); #endif //KAB_EMBEDDED |