Change default mail application to Opie-Mail.

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,41 +1,41 @@
 #include "abconfig.h"
 #include "version.h"
 
 #include <qpe/config.h>
 #include <qpe/recordfields.h>
 
 AbConfig::AbConfig( ):
-	m_useQtMail( true ),
-	m_useOpieMail( false ),
+	m_useQtMail( false ),
+	m_useOpieMail( true ),
 	m_useRegExp( false ),
 	m_beCaseSensitive( false ),
 	m_fontSize( 1 ),
 	m_barPos( QMainWindow::Top ),
 	m_fixedBars( true ),
 	m_lpSearchMode( LastName ),
 	m_changed( false )
 {
 }
 
 AbConfig::~AbConfig()
 {
 }
 
 bool AbConfig::useRegExp() const
 {
 	return m_useRegExp;
 }
 bool AbConfig::useWildCards() const
 {
 	return !m_useRegExp;
 }
 bool AbConfig::useQtMail() const
 {
 	return m_useQtMail;
 }
 bool AbConfig::useOpieMail() const
 {
 	return m_useOpieMail;
 }
 bool AbConfig::beCaseSensitive() const
 {
@@ -119,66 +119,66 @@ 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::setCategory( const QString &cat )
 {
     m_category = cat;
 }
 
 void AbConfig::load()
 {
 	// Read Config settings
 	Config cfg("AddressBook");
 
     cfg.setGroup( "View" );
     m_category = cfg.readEntry( "Category", "All" );
 
 	cfg.setGroup("Font");
 	m_fontSize = cfg.readNumEntry( "fontSize", 1 );
 
 	cfg.setGroup("Search");
 	m_useRegExp = cfg.readBoolEntry( "useRegExp", false );
 	m_beCaseSensitive = cfg.readBoolEntry( "caseSensitive", false );
 	m_lpSearchMode = cfg.readNumEntry( "lpSearchMode", FileAs );
 
 	cfg.setGroup("Mail");
-	m_useQtMail = cfg.readBoolEntry( "useQtMail", true );
-	m_useOpieMail=cfg.readBoolEntry( "useOpieMail" );
+	m_useQtMail = cfg.readBoolEntry( "useQtMail", false );
+	m_useOpieMail = cfg.readBoolEntry( "useOpieMail", true );
 
 	cfg.setGroup("ContactOrder");
 	int ID = 0;
 	int i = 0;
 	ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 );
 	while ( ID != 0 ){
 		m_ordered.append( ID );
 		ID = cfg.readNumEntry( "ContactID_"+QString::number(i++), 0 );
 	}
 
 	// If no contact order is defined, we set the default
 	if ( m_ordered.count() == 0 ) {
 		m_ordered.append( Qtopia::DefaultEmail );
 		m_ordered.append( Qtopia::HomePhone);
 		m_ordered.append( Qtopia::HomeMobile);
 		m_ordered.append( Qtopia::BusinessPhone);
 	}
 
 	cfg.setGroup("ToolBar");
 	m_barPos = cfg.readNumEntry( "Position", QMainWindow::Top );
 	m_fixedBars= cfg.readBoolEntry( "fixedBars", true );
 
 	m_changed = false;
 }
 
 void AbConfig::save()
 {
 	if ( m_changed ){
 		Config cfg("AddressBook");
         cfg.setGroup( "View" );
         cfg.writeEntry( "Category", m_category );
 
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
@@ -360,83 +360,83 @@
                         <class>QButtonGroup</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ButtonGroup2</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Mail</string>
                         </property>
                         <property>
                             <name>whatsThis</name>
                             <string>Fontsettings for list and card view</string>
                         </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_useQtMail</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Prefer QT-Mail </string>
                                 </property>
-                                <property stdset="1">
-                                    <name>checked</name>
-                                    <bool>true</bool>
-                                </property>
                                 <property>
                                     <name>whatsThis</name>
                                     <string>Use Sharp's mail application if available</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>m_useOpieMail</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Prefer Opie-Mail</string>
                                 </property>
+                                <property stdset="1">
+                                    <name>checked</name>
+                                    <bool>true</bool>
+                                </property>
                                 <property>
                                     <name>whatsThis</name>
                                     <string>Use OPIE mail if installed</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</string>
                                 </property>
                             </widget>
                         </vbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
                             <cstring>Spacer2</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>