author | skyhusker <skyhusker> | 2005-04-14 18:08:11 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-04-14 18:08:11 (UTC) |
commit | a7776b930c9f7259a8ea52c90534952d183ad658 (patch) (unidiff) | |
tree | a0c931ea3fc3532bccb95c7d709b603f00953937 | |
parent | c643e152dc7d2167381d3fc0568ad4043de5604e (diff) | |
download | opie-a7776b930c9f7259a8ea52c90534952d183ad658.zip opie-a7776b930c9f7259a8ea52c90534952d183ad658.tar.gz opie-a7776b930c9f7259a8ea52c90534952d183ad658.tar.bz2 |
Change default mail application to Opie-Mail.
-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 | |||
@@ -1,33 +1,33 @@ | |||
1 | #include "abconfig.h" | 1 | #include "abconfig.h" |
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 ), |
16 | m_changed( false ) | 16 | m_changed( false ) |
17 | { | 17 | { |
18 | } | 18 | } |
19 | 19 | ||
20 | AbConfig::~AbConfig() | 20 | AbConfig::~AbConfig() |
21 | { | 21 | { |
22 | } | 22 | } |
23 | 23 | ||
24 | bool AbConfig::useRegExp() const | 24 | bool AbConfig::useRegExp() const |
25 | { | 25 | { |
26 | return m_useRegExp; | 26 | return m_useRegExp; |
27 | } | 27 | } |
28 | bool AbConfig::useWildCards() const | 28 | bool AbConfig::useWildCards() const |
29 | { | 29 | { |
30 | return !m_useRegExp; | 30 | return !m_useRegExp; |
31 | } | 31 | } |
32 | bool AbConfig::useQtMail() const | 32 | bool AbConfig::useQtMail() const |
33 | { | 33 | { |
@@ -127,50 +127,50 @@ void AbConfig::setLetterPickerSearch( const AbConfig::LPSearchMode mode ) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | void AbConfig::setCategory( const QString &cat ) | 129 | void AbConfig::setCategory( const QString &cat ) |
130 | { | 130 | { |
131 | m_category = cat; | 131 | m_category = cat; |
132 | } | 132 | } |
133 | 133 | ||
134 | void AbConfig::load() | 134 | void AbConfig::load() |
135 | { | 135 | { |
136 | // Read Config settings | 136 | // Read Config settings |
137 | Config cfg("AddressBook"); | 137 | Config cfg("AddressBook"); |
138 | 138 | ||
139 | cfg.setGroup( "View" ); | 139 | cfg.setGroup( "View" ); |
140 | m_category = cfg.readEntry( "Category", "All" ); | 140 | m_category = cfg.readEntry( "Category", "All" ); |
141 | 141 | ||
142 | cfg.setGroup("Font"); | 142 | cfg.setGroup("Font"); |
143 | m_fontSize = cfg.readNumEntry( "fontSize", 1 ); | 143 | m_fontSize = cfg.readNumEntry( "fontSize", 1 ); |
144 | 144 | ||
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 ){ |
159 | m_ordered.append( ID ); | 159 | m_ordered.append( ID ); |
160 | ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 ); | 160 | ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 ); |
161 | } | 161 | } |
162 | 162 | ||
163 | // If no contact order is defined, we set the default | 163 | // If no contact order is defined, we set the default |
164 | if ( m_ordered.count() == 0 ) { | 164 | if ( m_ordered.count() == 0 ) { |
165 | m_ordered.append( Qtopia::DefaultEmail ); | 165 | m_ordered.append( Qtopia::DefaultEmail ); |
166 | m_ordered.append( Qtopia::HomePhone); | 166 | m_ordered.append( Qtopia::HomePhone); |
167 | m_ordered.append( Qtopia::HomeMobile); | 167 | m_ordered.append( Qtopia::HomeMobile); |
168 | m_ordered.append( Qtopia::BusinessPhone); | 168 | m_ordered.append( Qtopia::BusinessPhone); |
169 | } | 169 | } |
170 | 170 | ||
171 | cfg.setGroup("ToolBar"); | 171 | cfg.setGroup("ToolBar"); |
172 | m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top ); | 172 | m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top ); |
173 | m_fixedBars= cfg.readBoolEntry( "fixedBars", true ); | 173 | m_fixedBars= cfg.readBoolEntry( "fixedBars", true ); |
174 | 174 | ||
175 | m_changed = false; | 175 | m_changed = false; |
176 | } | 176 | } |
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 | |||
@@ -368,67 +368,67 @@ | |||
368 | </property> | 368 | </property> |
369 | <property> | 369 | <property> |
370 | <name>whatsThis</name> | 370 | <name>whatsThis</name> |
371 | <string>Fontsettings for list and card view</string> | 371 | <string>Fontsettings for list and card view</string> |
372 | </property> | 372 | </property> |
373 | <vbox> | 373 | <vbox> |
374 | <property stdset="1"> | 374 | <property stdset="1"> |
375 | <name>margin</name> | 375 | <name>margin</name> |
376 | <number>11</number> | 376 | <number>11</number> |
377 | </property> | 377 | </property> |
378 | <property stdset="1"> | 378 | <property stdset="1"> |
379 | <name>spacing</name> | 379 | <name>spacing</name> |
380 | <number>6</number> | 380 | <number>6</number> |
381 | </property> | 381 | </property> |
382 | <widget> | 382 | <widget> |
383 | <class>QRadioButton</class> | 383 | <class>QRadioButton</class> |
384 | <property stdset="1"> | 384 | <property stdset="1"> |
385 | <name>name</name> | 385 | <name>name</name> |
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> |
402 | <class>QRadioButton</class> | 398 | <class>QRadioButton</class> |
403 | <property stdset="1"> | 399 | <property stdset="1"> |
404 | <name>name</name> | 400 | <name>name</name> |
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> |
417 | <class>QLabel</class> | 417 | <class>QLabel</class> |
418 | <property stdset="1"> | 418 | <property stdset="1"> |
419 | <name>name</name> | 419 | <name>name</name> |
420 | <cstring>TextLabel1</cstring> | 420 | <cstring>TextLabel1</cstring> |
421 | </property> | 421 | </property> |
422 | <property stdset="1"> | 422 | <property stdset="1"> |
423 | <name>text</name> | 423 | <name>text</name> |
424 | <string>Notice: QT-Mail is just | 424 | <string>Notice: QT-Mail is just |
425 | provided in the SHARP | 425 | provided in the SHARP |
426 | default ROM. Opie-Mail | 426 | default ROM. Opie-Mail |
427 | is provided free !</string> | 427 | is provided free !</string> |
428 | </property> | 428 | </property> |
429 | </widget> | 429 | </widget> |
430 | </vbox> | 430 | </vbox> |
431 | </widget> | 431 | </widget> |
432 | <spacer> | 432 | <spacer> |
433 | <property> | 433 | <property> |
434 | <name>name</name> | 434 | <name>name</name> |