| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 7 | ||||
| -rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 6 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 39 | ||||
| -rw-r--r-- | kmicromail/mainwindow.h | 3 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 51 insertions, 6 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 5b23488..9b70a36 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,5 +1,7 @@ Info about the changes in new versions of KDE-Pim/Pi -********** VERSION 1.9.21 ************ +********** VERSION 2.0.0 ************ + +Stable release 2.0.0! KO/Pi: @@ -8,5 +10,6 @@ Made "toggle view*" menu items enabled context sensitive. Changed agenda size menu to items 1-10. Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. - +OM/Pi: +Added three info lines to display subject, from and to of selected mails. ********** VERSION 1.9.20 ************ diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 6ebaafe..86819b7 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt @@ -254,5 +254,9 @@ { "userdefined","benutzerdefiniert" }, { "Reply to this mail","Beantworte diese Mail" }, -{ "","" }, +{ "Su:","Be:" }, +{ "Fr:","Vo:" }, +{ "To:","An:" }, +{ "Download Mail","Mail runterladen" }, +{ "View Source","Zeige Source" }, { "","" }, { "","" }, diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 875ab77..250d114 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -21,4 +21,5 @@ extern QStatusBar* globalSstatusBarMainWindow; #include "defines.h" #include "mainwindow.h" +#include "mailistviewitem.h" #include <KDGanttMinimizeSplitter.h> @@ -117,8 +118,18 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) // QWidget *view = new QWidget( wrapperBox ); - KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, wrapperBox); + KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox); + splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down); + KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor); split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); - + QWidget* infoBox = new QWidget( splithor ); + QGridLayout *griLay = new QGridLayout( infoBox, 2,2); + griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); + griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 ); + griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 ); + griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ; + griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ; + griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ; + infoBox->setMaximumHeight( infoBox->sizeHint().height() ); folderView = new AccountView( split ); folderView->header()->hide(); @@ -150,4 +161,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); + QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold); + QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold); + QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold); #endif connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, @@ -159,4 +173,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), this,SLOT(refreshMailView(const QValueList<RecMailP>&))); + + connect( mailView, SIGNAL( currentChanged (QListViewItem* )),this, + SLOT( setInfoFields(QListViewItem*) ) ); + connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); @@ -207,4 +225,21 @@ MainWindow::~MainWindow() } +void MainWindow::setInfoFields(QListViewItem* item ) +{ + if ( item == 0) { + subLE->setText(""); + fromLE->setText(""); + toLE->setText(""); + return; + } + RecMailP mail = ((MailListViewItem*)item)->data(); + subLE->setText(mail->getSubject()); + fromLE->setText(mail->getFrom()); + toLE->setText(mail->To().join(";" )); + subLE->setCursorPosition(0); + fromLE->setCursorPosition(0); + toLE->setCursorPosition(0); + +} void MainWindow::slotSetCodec( int codec ) { diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index 016e44c..ddb3fca 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h @@ -7,4 +7,5 @@ #include <qlistview.h> #include <qaction.h> +#include <qlineedit.h> #include <qtoolbar.h> @@ -38,4 +39,5 @@ public slots: protected slots: + virtual void setInfoFields(QListViewItem* ); virtual void slotSendQueued(); virtual void slotEditAccounts(); @@ -65,4 +67,5 @@ protected: AccountView *folderView; QListView *mailView; + QLineEdit* toLE,*fromLE,*subLE; //QBoxLayout *layout; }; @@ -1 +1 @@ -version = "1.9.20"; +version = "2.0.0"; |