1 files changed, 17 insertions, 2 deletions

diff --git a/core/pim/addressbook/abconfig.cpp b/core/pim/addressbook/abconfig.cpp
index 0b61614..4a0875b 100644
--- a/core/pim/addressbook/abconfig.cpp
+++ b/core/pim/addressbook/abconfig.cpp
@@ -9,12 +9,13 @@ AbConfig::AbConfig( ):
         m_useOpieMail( false ),
         m_useRegExp( false ),
         m_beCaseSensitive( false ),
         m_fontSize( 1 ),
         m_barPos( QMainWindow::Top ),
         m_fixedBars( true ),
+        m_lpSearchMode( LastName ),
         m_changed( false )
 {
 }
 
 AbConfig::~AbConfig()
 {
@@ -57,12 +58,17 @@ QMainWindow::ToolBarDock AbConfig::getToolBarPos() const
 
 bool AbConfig::fixedBars() const
 {
         return m_fixedBars;
 }
 
+AbConfig::LPSearchMode AbConfig::letterPickerSearch() const
+{
+        return ( AbConfig::LPSearchMode ) m_lpSearchMode;
+}
+
 void AbConfig::setUseRegExp( bool v )
 {
         m_useRegExp = v ;
         m_changed = true;
 }
 void AbConfig::setUseWildCards( bool v )
@@ -106,23 +112,30 @@ void AbConfig::setToolBarDock( const QMainWindow::ToolBarDock v )
 void AbConfig::setFixedBars( const bool fixed )
 {
         m_fixedBars = fixed;
         m_changed = true;
 }
 
+void AbConfig::setLetterPickerSearch( const AbConfig::LPSearchMode mode )
+{
+        m_lpSearchMode = mode;
+        m_changed = true;
+}
+
 void AbConfig::load()
 {
         // Read Config settings
         Config cfg("AddressBook");
 
         cfg.setGroup("Font");
         m_fontSize = cfg.readNumEntry( "fontSize", 1 );
 
         cfg.setGroup("Search");
-        m_useRegExp = cfg.readBoolEntry( "useRegExp" );
-        m_beCaseSensitive = cfg.readBoolEntry( "caseSensitive" );
+        m_useRegExp = cfg.readBoolEntry( "useRegExp", false );
+        m_beCaseSensitive = cfg.readBoolEntry( "caseSensitive", false );
+        m_lpSearchMode = cfg.readNumEntry( "lpSearchMode", FullName );
 
         cfg.setGroup("Mail");
         m_useQtMail = cfg.readBoolEntry( "useQtMail", true );
         m_useOpieMail=cfg.readBoolEntry( "useOpieMail" );
 
         cfg.setGroup("ContactOrder");
@@ -156,12 +169,13 @@ void AbConfig::save()
                 cfg.setGroup("Font");
                 cfg.writeEntry("fontSize", m_fontSize);
 
                 cfg.setGroup("Search");
                 cfg.writeEntry("useRegExp", m_useRegExp);
                 cfg.writeEntry("caseSensitive", m_beCaseSensitive);
+                cfg.writeEntry("lpSearchMode", m_lpSearchMode );
 
                 cfg.setGroup("Mail");
                 cfg.writeEntry( "useQtMail", m_useQtMail );
                 cfg.writeEntry( "useOpieMail", m_useOpieMail);
 
                 cfg.setGroup("ContactOrder");
@@ -191,8 +205,9 @@ void AbConfig::operator= ( const AbConfig& cnf )
         m_useRegExp = cnf.m_useRegExp;
         m_beCaseSensitive = cnf.m_beCaseSensitive;
         m_fontSize = cnf.m_fontSize;
         m_ordered = cnf.m_ordered;
         m_barPos = cnf.m_barPos;
         m_fixedBars = cnf.m_fixedBars;
+        m_lpSearchMode = cnf.m_lpSearchMode;
 }