author | harlekin <harlekin> | 2003-12-21 13:29:48 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-21 13:29:48 (UTC) |
commit | 1281563b998508efeaa63739fb2c7c92e8316e9c (patch) (side-by-side diff) | |
tree | ff9aa7202b0fa81e0eec727414aef69ba82b7780 /noncore | |
parent | 228ff69db6e535a872a0f397ba157f832567af80 (diff) | |
download | opie-1281563b998508efeaa63739fb2c7c92e8316e9c.zip opie-1281563b998508efeaa63739fb2c7c92e8316e9c.tar.gz opie-1281563b998508efeaa63739fb2c7c92e8316e9c.tar.bz2 |
send mail later/ enqueue gui side implementation
-rw-r--r-- | noncore/net/mail/composemail.cpp | 11 | ||||
-rw-r--r-- | noncore/net/mail/composemailui.ui | 21 | ||||
-rw-r--r-- | noncore/net/mail/settingsdialog.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/settingsdialogui.ui | 48 |
4 files changed, 77 insertions, 9 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 @@ -1,19 +1,24 @@ #include <qt.h> #include <opie/ofiledialog.h> #include <qpe/resource.h> +#include <qpe/config.h> #include "composemail.h" #include "smtpwrapper.h" ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) : ComposeMailUI( parent, name, modal, flags ) { settings = s; + Config cfg( "mail" ); + cfg.setGroup( "Compose" ); + checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); + attList->addColumn( tr( "Name" ) ); attList->addColumn( tr( "Size" ) ); QList<Account> accounts = settings->getAccounts(); Account *it; for ( it = accounts.first(); it; it = accounts.next() ) { @@ -27,12 +32,13 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m if ( smtpAccounts.count() > 0 ) { fillValues( fromBox->currentItem() ); } else { 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 ) ) ); connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); @@ -150,12 +156,17 @@ void ComposeMail::removeAttachment() attList->takeItem( attList->currentItem() ); } } void ComposeMail::accept() { + if ( checkBoxLater->isChecked() ) { + qDebug( "Send later" ); + } + + qDebug( "Sending Mail with " + smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); Mail *mail = new Mail(); SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() ); mail->setMail( smtp->getMail() ); mail->setName( smtp->getName() ); 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 @@ -8,13 +8,13 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>264</width> + <width>260</width> <height>360</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Compose Message</string> @@ -25,18 +25,29 @@ <property> <name>layoutSpacing</name> </property> <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> <cstring>tabWidget</cstring> </property> @@ -56,17 +67,17 @@ <name>title</name> <string>Mail</string> </attribute> <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> <property stdset="1"> <name>name</name> <cstring>subjectLine</cstring> 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,7 +1,7 @@ -#include <qradiobutton.h> +#include <qcheckbox.h> #include <qpe/config.h> #include "settingsdialog.h" @@ -16,18 +16,22 @@ SettingsDialog::~SettingsDialog() { } 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() );; } void SettingsDialog::accept() { writeConfig(); QDialog::accept(); 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 @@ -8,13 +8,13 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>328</width> + <width>324</width> <height>379</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Settings Dialog</string> @@ -63,13 +63,13 @@ </property> <property stdset="1"> <name>spacing</name> <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> @@ -104,13 +104,55 @@ <property stdset="1"> <name>name</name> <cstring>tab</cstring> </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> </widget> </UI> |