summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-17 17:09:57 (UTC)
committer zautrix <zautrix>2005-08-17 17:09:57 (UTC)
commitb3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a (patch) (side-by-side diff)
treeed4d04abe2996cde745757632d8616b23a15670b
parentc21edc19916722f5dd4e939f1522d311a86411fd (diff)
downloadkdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.zip
kdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.tar.gz
kdepimpi-b3de38d3c4c3935a3fa428eeb4ad97fa8c60c43a.tar.bz2
view select fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--kaddressbook/viewmanager.cpp7
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
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
@@ -7,6 +7,7 @@ Fixed a problem displaying very long allday events in agenda view in single day
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 ************
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 )
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
@@ -290,6 +293,10 @@ void ViewManager::setActiveView( const QString &name )
//US performance optimization. setActiveFilter calls also mActiveView->refresh()
//US mActiveView->refresh();
+
+ mActionSelectView->setItems( mViewNameList );
+ mActionSelectView->setCurrentItem( mViewNameList.findIndex( mActiveView->caption() ) );
+
}
else
{
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 )
// 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();