4 files changed, 78 insertions, 10 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 048fa85..f680f5c 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -2,6 +2,7 @@
 
 #include <opie/ofiledialog.h>
 #include <qpe/resource.h>
+#include <qpe/config.h>
 
 #include "composemail.h"
 #include "smtpwrapper.h"
@@ -11,6 +12,10 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 {
     settings = s;
 
+    Config cfg( "mail" );
+    cfg.setGroup( "Compose" );
+    checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
+
     attList->addColumn( tr( "Name" ) );
     attList->addColumn( tr( "Size" ) );
 
@@ -30,6 +35,7 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
         QMessageBox::information( this, tr( "Problem" ),
                                   tr( "<p>Please create an SMTP account first.</p>" ),
                                   tr( "Ok" ) );
+        return;
     }
 
     connect( fromBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
@@ -153,6 +159,11 @@ void ComposeMail::removeAttachment()
 
 void ComposeMail::accept()
 {
+    if ( checkBoxLater->isChecked() ) {
+        qDebug(  "Send later" );
+    }
+
+
     qDebug( "Sending Mail with " +
             smtpAccounts.at( fromBox->currentItem() )->getAccountName() );
     Mail *mail = new Mail();
diff --git a/noncore/net/mail/composemailui.ui b/noncore/net/mail/composemailui.ui
index 9f5feb9..4d225e4 100644
--- a/noncore/net/mail/composemailui.ui
+++ b/noncore/net/mail/composemailui.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>264</width>
+            <width>260</width>
             <height>360</height>
         </rect>
     </property>
@@ -28,13 +28,24 @@
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>0</number>
+            <number>3</number>
         </property>
         <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>checkBoxLater</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>send later</string>
+            </property>
+        </widget>
+        <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -59,11 +70,11 @@
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>4</number>
+                        <number>-1</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>3</number>
+                        <number>-1</number>
                     </property>
                     <widget row="2"  column="1" >
                         <class>QLineEdit</class>
diff --git a/noncore/net/mail/settingsdialog.cpp b/noncore/net/mail/settingsdialog.cpp
index 9741e94..f9de405 100644
--- a/noncore/net/mail/settingsdialog.cpp
+++ b/noncore/net/mail/settingsdialog.cpp
@@ -1,4 +1,4 @@
-#include <qradiobutton.h>
+#include <qcheckbox.h>
 
 #include <qpe/config.h>
 
@@ -19,12 +19,16 @@ void SettingsDialog::readConfig() {
     Config cfg("mail");
     cfg.setGroup( "Settings" );
     showHtmlButton->setChecked( cfg.readBoolEntry( "showHtml", false ) );
+    cfg.setGroup( "Compose" );
+    checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
 }
 
 void SettingsDialog::writeConfig() {
     Config cfg( "mail" );
     cfg.setGroup( "Settings" );
     cfg.writeEntry( "showHtml", showHtmlButton->isChecked() );
+    cfg.setGroup( "Compose" );
+    cfg.writeEntry( "sendLater", checkBoxLater->isChecked() );;
 
 }
 
diff --git a/noncore/net/mail/settingsdialogui.ui b/noncore/net/mail/settingsdialogui.ui
index 3b03aeb..c5589dc 100644
--- a/noncore/net/mail/settingsdialogui.ui
+++ b/noncore/net/mail/settingsdialogui.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>328</width>
+            <width>324</width>
             <height>379</height>
         </rect>
     </property>
@@ -66,14 +66,14 @@
                         <number>3</number>
                     </property>
                     <widget>
-                        <class>QRadioButton</class>
+                        <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>showHtmlButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>View mail as Html </string>
+                            <string>View mail as Html</string>
                         </property>
                     </widget>
                     <spacer>
@@ -107,8 +107,50 @@
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>Tab 2</string>
+                    <string>Compose Mail</string>
                 </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>3</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>3</number>
+                    </property>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>checkBoxLater</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Send mails later ( enqueue in outbox )</string>
+                        </property>
+                    </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>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
             </widget>
         </widget>
     </vbox>