-rw-r--r-- | core/pim/addressbook/abconfig.cpp | 8 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg_base.ui | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/pim/addressbook/abconfig.cpp b/core/pim/addressbook/abconfig.cpp index 2583327..9cc2668 100644 --- a/core/pim/addressbook/abconfig.cpp +++ b/core/pim/addressbook/abconfig.cpp | |||
@@ -2,14 +2,14 @@ | |||
2 | #include "version.h" | 2 | #include "version.h" |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/recordfields.h> | 5 | #include <qpe/recordfields.h> |
6 | 6 | ||
7 | AbConfig::AbConfig( ): | 7 | AbConfig::AbConfig( ): |
8 | m_useQtMail( true ), | 8 | m_useQtMail( false ), |
9 | m_useOpieMail( false ), | 9 | m_useOpieMail( true ), |
10 | m_useRegExp( false ), | 10 | m_useRegExp( false ), |
11 | m_beCaseSensitive( false ), | 11 | m_beCaseSensitive( false ), |
12 | m_fontSize( 1 ), | 12 | m_fontSize( 1 ), |
13 | m_barPos( QMainWindow::Top ), | 13 | m_barPos( QMainWindow::Top ), |
14 | m_fixedBars( true ), | 14 | m_fixedBars( true ), |
15 | m_lpSearchMode( LastName ), | 15 | m_lpSearchMode( LastName ), |
@@ -145,14 +145,14 @@ void AbConfig::load() | |||
145 | cfg.setGroup("Search"); | 145 | cfg.setGroup("Search"); |
146 | m_useRegExp = cfg.readBoolEntry( "useRegExp", false ); | 146 | m_useRegExp = cfg.readBoolEntry( "useRegExp", false ); |
147 | m_beCaseSensitive = cfg.readBoolEntry( "caseSensitive", false ); | 147 | m_beCaseSensitive = cfg.readBoolEntry( "caseSensitive", false ); |
148 | m_lpSearchMode = cfg.readNumEntry( "lpSearchMode", FileAs ); | 148 | m_lpSearchMode = cfg.readNumEntry( "lpSearchMode", FileAs ); |
149 | 149 | ||
150 | cfg.setGroup("Mail"); | 150 | cfg.setGroup("Mail"); |
151 | m_useQtMail = cfg.readBoolEntry( "useQtMail", true ); | 151 | m_useQtMail = cfg.readBoolEntry( "useQtMail", false ); |
152 | m_useOpieMail=cfg.readBoolEntry( "useOpieMail" ); | 152 | m_useOpieMail = cfg.readBoolEntry( "useOpieMail", true ); |
153 | 153 | ||
154 | cfg.setGroup("ContactOrder"); | 154 | cfg.setGroup("ContactOrder"); |
155 | int ID = 0; | 155 | int ID = 0; |
156 | int i = 0; | 156 | int i = 0; |
157 | ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 ); | 157 | ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 ); |
158 | while ( ID != 0 ){ | 158 | while ( ID != 0 ){ |
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui index f892d08..3f629ed 100644 --- a/core/pim/addressbook/configdlg_base.ui +++ b/core/pim/addressbook/configdlg_base.ui | |||
@@ -386,16 +386,12 @@ | |||
386 | <cstring>m_useQtMail</cstring> | 386 | <cstring>m_useQtMail</cstring> |
387 | </property> | 387 | </property> |
388 | <property stdset="1"> | 388 | <property stdset="1"> |
389 | <name>text</name> | 389 | <name>text</name> |
390 | <string>Prefer QT-Mail </string> | 390 | <string>Prefer QT-Mail </string> |
391 | </property> | 391 | </property> |
392 | <property stdset="1"> | ||
393 | <name>checked</name> | ||
394 | <bool>true</bool> | ||
395 | </property> | ||
396 | <property> | 392 | <property> |
397 | <name>whatsThis</name> | 393 | <name>whatsThis</name> |
398 | <string>Use Sharp's mail application if available</string> | 394 | <string>Use Sharp's mail application if available</string> |
399 | </property> | 395 | </property> |
400 | </widget> | 396 | </widget> |
401 | <widget> | 397 | <widget> |
@@ -405,12 +401,16 @@ | |||
405 | <cstring>m_useOpieMail</cstring> | 401 | <cstring>m_useOpieMail</cstring> |
406 | </property> | 402 | </property> |
407 | <property stdset="1"> | 403 | <property stdset="1"> |
408 | <name>text</name> | 404 | <name>text</name> |
409 | <string>Prefer Opie-Mail</string> | 405 | <string>Prefer Opie-Mail</string> |
410 | </property> | 406 | </property> |
407 | <property stdset="1"> | ||
408 | <name>checked</name> | ||
409 | <bool>true</bool> | ||
410 | </property> | ||
411 | <property> | 411 | <property> |
412 | <name>whatsThis</name> | 412 | <name>whatsThis</name> |
413 | <string>Use OPIE mail if installed</string> | 413 | <string>Use OPIE mail if installed</string> |
414 | </property> | 414 | </property> |
415 | </widget> | 415 | </widget> |
416 | <widget> | 416 | <widget> |