From 6c89efd80c1e94a0c070025d07c7a4c656f2a81e Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 24 Jan 2005 16:32:44 +0000 Subject: view source --- (limited to 'kmicromail') diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp index 342bbf3..2bae5f6 100644 --- a/kmicromail/koprefs.cpp +++ b/kmicromail/koprefs.cpp @@ -62,6 +62,7 @@ KOPrefs::KOPrefs() : addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") ); addItemBool("ViewMailAsHtml",&mViewAsHtml,false); addItemBool("SendMailLater",&mSendLater,true); + addItemBool("ShowToField",&mShowToField,false); addItemBool("UseKapi",&mUseKapi,false); addItemInt("CurrentCodec",&mCurrentCodec,0); diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h index 91f3fa3..f2c4fbb 100644 --- a/kmicromail/koprefs.h +++ b/kmicromail/koprefs.h @@ -72,7 +72,7 @@ class KOPrefs : public KPimPrefs QString mEmail; QString mCurrentCodeName; int mCurrentCodec; - bool mSendLater, mViewAsHtml, mUseKapi, isDirty; + bool mSendLater, mViewAsHtml, mUseKapi, isDirty, mShowToField; private: }; diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 13d6681..5c8a5a9 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp @@ -147,6 +147,9 @@ void KOPrefsDialog::setupMailTab() ttt = addWidBool(i18n("Send mails later"), &(KOPrefs::instance()->mSendLater),topFrame); topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); + ttt = addWidBool(i18n("Show \"To\" field in list view"), + &(KOPrefs::instance()->mShowToField),topFrame); + topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1); /* mCodecEdit = new QLineEdit(topFrame); topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1); diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp index 484a635..ffb835c 100644 --- a/kmicromail/mailistviewitem.cpp +++ b/kmicromail/mailistviewitem.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "koprefs.h" //#include MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) @@ -57,54 +58,10 @@ void MailListViewItem::showEntry() } setText(1,mail_data->getSubject()); setText(2,mail_data->getFrom()); -#if 0 - QString date = mail_data->getDate(); - - int kom = date.find( ",")+2; - if ( kom == 1 ) - kom = 0; - if ( date.mid(kom,1) == " ") - ++kom; - if ( date.mid(kom+1,1) == " " ) - date = "0" + date.mid( kom ); - else if ( kom ) - date = date.mid( kom ); - if ( kom || date.mid(2,1 ) == " ") { - QString mon = date.mid(3,3); - QString so = 00; - if ( mon == "Jan" ) - so = "01"; - else if ( mon == "Feb" ) - so = "02"; - else if ( mon == "Mar" ) - so = "03"; - else if ( mon == "Apr" ) - so = "04"; - else if ( mon == "May" ) - so = "05"; - else if ( mon == "Jun" ) - so = "06"; - else if ( mon == "Jul" ) - so = "07"; - else if ( mon == "Aug" ) - so = "08"; - else if ( mon == "Sep" ) - so = "09"; - else if ( mon == "Oct" ) - so = "10"; - else if ( mon == "Nov" ) - so = "11"; - else if ( mon == "Dec" ) - so = "12"; - date = date.mid(7,4)+so+date.left(2)+date.mid(12,14); - } - //qDebug("insert Date %s ", date.latin1()); - // if ( date.left(1) != "1" || date.left(1) != "2" ) - // date = date.mid(5); - mKeyMap.insert(4,date); -#endif mKeyMap.insert(4,mail_data->getIsoDate()); setText(4,mail_data->getDate()); + if ( KOPrefs::instance()->mShowToField ) + setText(5,mail_data->To()[0]); } void MailListViewItem::storeData(const RecMailP&data) diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 1dc374b..875ab77 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -133,6 +133,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) mailView->addColumn( i18n( "Sender" ),QListView::Manual ); mailView->addColumn( i18n( "Size" ),QListView::Manual); mailView->addColumn( i18n( "Date" ),QListView::Manual); + if ( KOPrefs::instance()->mShowToField ) + mailView->addColumn( i18n( "To" ),QListView::Manual); mailView->setAllColumnsShowFocus(true); //mailView->setSorting(-1); mailView->setRootIsDecorated( false ); @@ -303,6 +305,8 @@ void MainWindow::slotAdjustColumns() mailView->setColumnWidth( 2, 100 ); mailView->setColumnWidth( 3, 50 ); mailView->setColumnWidth( 4, 120 ); + if ( KOPrefs::instance()->mShowToField ) + mailView->setColumnWidth( 5, 100 ); } void MainWindow::slotEditSettings() diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 915b3e8..6e54bf4 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -1,6 +1,10 @@ // CHANGED 2004-09-31 Lutz Rogowski // CHANGED 2004-08-06 Lutz Rogowski + +#define protected public +#include +#undef protected #include "koprefsdialog.h" #include #include @@ -22,6 +26,7 @@ #include #include #include +#include #include #include @@ -41,7 +46,7 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) : MainWindow( parent, name) //, WStyle_ContextHelp ) { settings = new Settings(); - + tb = 0; setIcon(SmallIcon( "kmicromail" ) ); folderView->populate( settings->getAccounts() ); @@ -50,6 +55,8 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) OpieMail::~OpieMail() { if (settings) delete settings; + if ( tb ) + delete tb; } void OpieMail::appMessage(const QCString &msg, const QByteArray &data) @@ -303,6 +310,13 @@ void OpieMail::closeViewMail(ViewMail * vm) { vm->hide(); } + +void OpieMail::slotDownloadMail( ) +{ + qDebug("slotDownloadMail( ) "); +} + + void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) { QListViewItem*item = mailView->currentItem(); @@ -355,6 +369,7 @@ void OpieMail::displayMail() #endif connect( &readMail,SIGNAL( showNextMail(ViewMail *) ), this, SLOT( displayNextMail(ViewMail *) ) ); connect( &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) ); + connect( &readMail,SIGNAL( signalDownloadMail() ), this, SLOT( slotDownloadMail() ) ); readMail.exec(); diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h index a81a34c..b8a527f 100644 --- a/kmicromail/opiemail.h +++ b/kmicromail/opiemail.h @@ -46,7 +46,7 @@ protected slots: virtual void slotMoveCopyAllMail(); virtual void reEditMail(); void clearSelection(); - + void slotDownloadMail(); private: void closeViewMail(ViewMail * vm); QString mPendingEmail; @@ -54,6 +54,7 @@ private: QByteArray mPendingData; QCString mPendingMessage; Settings *settings; + QTextBrowser * tb; }; diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 6d88cad..767a369 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp @@ -203,6 +203,24 @@ void ViewMail::setBody(const RecBodyP&body ) } +void ViewMail::slotViewSource() +{ + + if ( !sourceOn ) { + sourceOn = true; + viewSource->setText(i18n("View Body Text")); + encodedString*st = 0; + st = m_recMail->Wrapper()->fetchRawBody(m_recMail); + if ( st ) { + QString source = QString::fromUtf8( st->Content(), st->Length()); + browser->setText( source ); + delete st; + } + } else + setText(); + + +} void ViewMail::slotShowHtml( bool state ) { m_showHtml = state; @@ -320,13 +338,15 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) { m_gotBody = false; deleted = false; - + sourceOn = false; connect( reply, SIGNAL(activated()), SLOT(slotReply())); connect( forward, SIGNAL(activated()), SLOT(slotForward())); connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) ); + connect( viewSource, SIGNAL( activated() ), SLOT( slotViewSource() ) ); + connect( downloadMail, SIGNAL( activated() ), SIGNAL( signalDownloadMail() ) ); attachments->setEnabled(m_gotBody); connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); @@ -346,6 +366,8 @@ void ViewMail::readConfig() void ViewMail::setText() { + viewSource->setText(i18n("View Source")); + sourceOn = false; QString toString; QString ccString; QString bccString; @@ -532,3 +554,4 @@ void MailImageDlg::setName(const QString&fname) qDebug("viewmail.cpp: MailImageDlg::setName Pending"); // m_imageview->setImage(fname); } + diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h index d85b8b2..561989e 100644 --- a/kmicromail/viewmail.h +++ b/kmicromail/viewmail.h @@ -45,6 +45,7 @@ public: signals: void showNextMail(ViewMail*); void deleteAndDisplayNextMail(ViewMail *); + void signalDownloadMail(); protected: QString deHtml(const QString &string); AttachItem* searchParent(const QValueList&path); @@ -58,10 +59,11 @@ protected slots: void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); void slotDeleteMail( ); void slotShowHtml( bool ); + void slotViewSource(); private: void readConfig(); - + bool sourceOn;; bool _inLoop; QString m_mailHtml; bool m_gotBody; diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index d21696a..9365c23 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp @@ -28,6 +28,14 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) toolbar->setHorizontalStretchable(true); addToolBar(toolbar); + viewSource = new QAction(i18n("View Source"), 0, 0, this); + viewSource->addTo(mailmenu); + + downloadMail= new QAction(i18n("Download Mail"),SmallIcon("add"), 0, 0, this); + downloadMail->addTo(toolbar); + downloadMail->addTo(mailmenu); + + reply = new QAction(i18n("Reply"),SmallIcon("reply"), 0, 0, this); reply->addTo(toolbar); reply->addTo(mailmenu); diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h index c97e9e3..7ad1eec 100644 --- a/kmicromail/viewmailbase.h +++ b/kmicromail/viewmailbase.h @@ -20,7 +20,7 @@ public: ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); protected: - QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail; + QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail, *downloadMail, *viewSource; QListView *attachments; QToolBar *toolbar; QTextBrowser *browser; -- cgit v0.9.0.2