author | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
commit | e8ca3ebcf4cf356497670a455f43e08a16c0f2aa (patch) (unidiff) | |
tree | 0fa7ad39387559a527bee58d24cbc4ac50a35e23 /noncore | |
parent | c361d36374d9c333ffe4b853067858df5636e1a5 (diff) | |
download | opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.zip opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.gz opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.bz2 |
more updated to the mail viewer
-rw-r--r-- | noncore/net/mail/composemail.cpp | 17 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 50 |
3 files changed, 39 insertions, 31 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 88dd780..96787e4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -11,6 +11,6 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
11 | settings = s; | 11 | settings = s; |
12 | 12 | ||
13 | attList->addColumn( tr( "Name" ) ); | 13 | attList->addColumn( tr( "Name" ) ); |
14 | attList->addColumn( tr( "Size" ) ); | 14 | attList->addColumn( tr( "Size" ) ); |
15 | 15 | ||
16 | QList<Account> accounts = settings->getAccounts(); | 16 | QList<Account> accounts = settings->getAccounts(); |
@@ -28,3 +28,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
28 | } else { | 28 | } else { |
29 | QMessageBox::information( this, tr( "Problem" ), | 29 | QMessageBox::information( this, tr( "Problem" ), |
30 | tr( "<p>Please create an SMTP account first.</p>" ), | 30 | tr( "<p>Please create an SMTP account first.</p>" ), |
@@ -52,2 +52,3 @@ void ComposeMail::pickAddress( QLineEdit *line ) | |||
52 | 52 | ||
53 | |||
53 | void ComposeMail::pickAddressTo() | 54 | void ComposeMail::pickAddressTo() |
@@ -95,3 +96,3 @@ void ComposeMail::slotAdjustColumns() | |||
95 | int currPage = tabWidget->currentPageIndex(); | 96 | int currPage = tabWidget->currentPageIndex(); |
96 | 97 | ||
97 | tabWidget->showPage( attachTab ); | 98 | tabWidget->showPage( attachTab ); |
@@ -115,3 +116,3 @@ void ComposeMail::removeAttachment() | |||
115 | if ( !attList->currentItem() ) { | 116 | if ( !attList->currentItem() ) { |
116 | QMessageBox::information( this, tr( "Error" ), | 117 | QMessageBox::information( this, tr( "Error" ), |
117 | tr( "<p>Please select a File.</p>" ), | 118 | tr( "<p>Please select a File.</p>" ), |
@@ -125,3 +126,3 @@ void ComposeMail::accept() | |||
125 | { | 126 | { |
126 | qDebug( "Sending Mail with " + | 127 | qDebug( "Sending Mail with " + |
127 | smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); | 128 | smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); |
@@ -166,4 +167,4 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | |||
166 | qDebug( att->getMimeType() ); | 167 | qDebug( att->getMimeType() ); |
167 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 168 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
168 | Resource::loadPixmap( "UnknownDocument-14" ) : | 169 | Resource::loadPixmap( "UnknownDocument-14" ) : |
169 | attachment->getDocLnk().pixmap() ); | 170 | attachment->getDocLnk().pixmap() ); |
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index c7ae22a..196a471 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h | |||
@@ -37,2 +37,3 @@ public slots: | |||
37 | 37 | ||
38 | |||
38 | protected slots: | 39 | protected slots: |
@@ -50,2 +51,4 @@ private slots: | |||
50 | 51 | ||
52 | |||
53 | |||
51 | private: | 54 | private: |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index cba9948..ed3ece9 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -5,4 +5,4 @@ | |||
5 | 5 | ||
6 | //#include "mailfactory.h" | 6 | #include "settings.h" |
7 | //#include "composer.h" | 7 | #include "composemail.h" |
8 | #include "viewmail.h" | 8 | #include "viewmail.h" |
@@ -75,3 +75,3 @@ void ViewMail::setText() | |||
75 | "<html><body>" | 75 | "<html><body>" |
76 | "<div align=center><b>%1</b></div>" | 76 | "<div align=center><b><font color=#FF2222>%1</b></font></div>" |
77 | "<b>From:</b> %2<br>" | 77 | "<b>From:</b> %2<br>" |
@@ -81,3 +81,3 @@ void ViewMail::setText() | |||
81 | "<b>Date:</b> %6<hr>" | 81 | "<b>Date:</b> %6<hr>" |
82 | "<font face=fixed>%7</font>") | 82 | "<font face=fixed>") |
83 | .arg( deHtml( m_mail[1] ) ) | 83 | .arg( deHtml( m_mail[1] ) ) |
@@ -87,5 +87,6 @@ void ViewMail::setText() | |||
87 | .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) ) | 87 | .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) ) |
88 | .arg( m_mail[3] ) | 88 | .arg( m_mail[3] ); |
89 | .arg("%1"); | 89 | browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" ); |
90 | browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) ); | 90 | // remove later in favor of a real handling |
91 | _gotBody = true; | ||
91 | } | 92 | } |
@@ -137,12 +138,12 @@ void ViewMail::slotReply() | |||
137 | QString rtext; | 138 | QString rtext; |
138 | // rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose | 139 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose |
139 | // .arg(_mail.envelope().from()[0].toString()) | 140 | .arg( m_mail[1] ) |
140 | // .arg(_mail.envelope().mailDate()); | 141 | .arg( m_mail[3] ); |
141 | 142 | ||
142 | //QString text = _mail.bodyPart(1).data(); | 143 | QString text = m_mail[2]; |
143 | //QStringList lines = QStringList::split(QRegExp("\\n"), text); | 144 | QStringList lines = QStringList::split(QRegExp("\\n"), text); |
144 | QStringList::Iterator it; | 145 | QStringList::Iterator it; |
145 | //for (it = lines.begin(); it != lines.end(); it++) { | 146 | for (it = lines.begin(); it != lines.end(); it++) { |
146 | // rtext += "> " + *it + "\n"; | 147 | rtext += "> " + *it + "\n"; |
147 | //} | 148 | } |
148 | rtext += "\n"; | 149 | rtext += "\n"; |
@@ -150,4 +151,4 @@ void ViewMail::slotReply() | |||
150 | QString prefix; | 151 | QString prefix; |
151 | //if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = ""; | 152 | if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = ""; |
152 | // else prefix = "Re: "; // no i18n on purpose | 153 | else prefix = "Re: "; // no i18n on purpose |
153 | 154 | ||
@@ -159,6 +160,9 @@ void ViewMail::slotReply() | |||
159 | 160 | ||
160 | //Composer composer(this, 0, true); | 161 | |
161 | //composer.setSendMail(sendMail); | 162 | /* ComposeMail composer(this, 0, true); |
162 | //composer.showMaximized(); | 163 | composer.setMessage( ); |
163 | //composer.exec(); | 164 | composer.showMaximized(); |
165 | composer.exec(); | ||
166 | */ | ||
167 | qDebug ( rtext ); | ||
164 | } | 168 | } |