-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,14 +1,17 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 1.9.21 ************ | 3 | ********** VERSION 2.0.0 ************ |
4 | |||
5 | Stable release 2.0.0! | ||
4 | 6 | ||
5 | KO/Pi: | 7 | KO/Pi: |
6 | Fixed problem in edit dialog recreation at startup. | 8 | Fixed problem in edit dialog recreation at startup. |
7 | Made "toggle view*" menu items enabled context sensitive. | 9 | Made "toggle view*" menu items enabled context sensitive. |
8 | Changed agenda size menu to items 1-10. | 10 | Changed agenda size menu to items 1-10. |
9 | Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. | 11 | Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. |
10 | 12 | OM/Pi: | |
13 | Added three info lines to display subject, from and to of selected mails. | ||
11 | 14 | ||
12 | ********** VERSION 1.9.20 ************ | 15 | ********** VERSION 1.9.20 ************ |
13 | 16 | ||
14 | KO/Pi: | 17 | KO/Pi: |
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 | |||
@@ -252,9 +252,13 @@ | |||
252 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 252 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, |
253 | { "Data storage path","Daten Speicherpfad" }, | 253 | { "Data storage path","Daten Speicherpfad" }, |
254 | { "userdefined","benutzerdefiniert" }, | 254 | { "userdefined","benutzerdefiniert" }, |
255 | { "Reply to this mail","Beantworte diese Mail" }, | 255 | { "Reply to this mail","Beantworte diese Mail" }, |
256 | { "","" }, | 256 | { "Su:","Be:" }, |
257 | { "Fr:","Vo:" }, | ||
258 | { "To:","An:" }, | ||
259 | { "Download Mail","Mail runterladen" }, | ||
260 | { "View Source","Zeige Source" }, | ||
257 | { "","" }, | 261 | { "","" }, |
258 | { "","" }, | 262 | { "","" }, |
259 | { "","" }, | 263 | { "","" }, |
260 | { "","" }, | 264 | { "","" }, |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 875ab77..250d114 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -19,8 +19,9 @@ extern QStatusBar* globalSstatusBarMainWindow; | |||
19 | #include <klocale.h> | 19 | #include <klocale.h> |
20 | #endif | 20 | #endif |
21 | #include "defines.h" | 21 | #include "defines.h" |
22 | #include "mainwindow.h" | 22 | #include "mainwindow.h" |
23 | #include "mailistviewitem.h" | ||
23 | #include <KDGanttMinimizeSplitter.h> | 24 | #include <KDGanttMinimizeSplitter.h> |
24 | 25 | ||
25 | #include "koprefs.h" | 26 | #include "koprefs.h" |
26 | 27 | ||
@@ -115,12 +116,22 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
115 | QVBox* wrapperBox = new QVBox( this ); | 116 | QVBox* wrapperBox = new QVBox( this ); |
116 | setCentralWidget( wrapperBox ); | 117 | setCentralWidget( wrapperBox ); |
117 | 118 | ||
118 | // QWidget *view = new QWidget( wrapperBox ); | 119 | // QWidget *view = new QWidget( wrapperBox ); |
119 | KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, wrapperBox); | 120 | KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox); |
121 | splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down); | ||
122 | KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor); | ||
120 | split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); | 123 | split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); |
121 | //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); | 124 | //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); |
122 | 125 | QWidget* infoBox = new QWidget( splithor ); | |
126 | QGridLayout *griLay = new QGridLayout( infoBox, 2,2); | ||
127 | griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); | ||
128 | griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 ); | ||
129 | griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 ); | ||
130 | griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ; | ||
131 | griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ; | ||
132 | griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ; | ||
133 | infoBox->setMaximumHeight( infoBox->sizeHint().height() ); | ||
123 | folderView = new AccountView( split ); | 134 | folderView = new AccountView( split ); |
124 | folderView->header()->hide(); | 135 | folderView->header()->hide(); |
125 | folderView->setRootIsDecorated( false ); | 136 | folderView->setRootIsDecorated( false ); |
126 | folderView->addColumn( i18n( "Mailbox" ) ); | 137 | folderView->addColumn( i18n( "Mailbox" ) ); |
@@ -148,8 +159,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
148 | slotAdjustLayout(); | 159 | slotAdjustLayout(); |
149 | #ifndef DESKTOP_VERSION | 160 | #ifndef DESKTOP_VERSION |
150 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); | 161 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); |
151 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); | 162 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); |
163 | QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold); | ||
164 | QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold); | ||
165 | QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold); | ||
152 | #endif | 166 | #endif |
153 | connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, | 167 | connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, |
154 | SLOT( mailLeftClicked(QListViewItem*) ) ); | 168 | SLOT( mailLeftClicked(QListViewItem*) ) ); |
155 | connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, | 169 | connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, |
@@ -157,8 +171,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
157 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 171 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
158 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); | 172 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); |
159 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), | 173 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), |
160 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); | 174 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); |
175 | |||
176 | connect( mailView, SIGNAL( currentChanged (QListViewItem* )),this, | ||
177 | SLOT( setInfoFields(QListViewItem*) ) ); | ||
178 | |||
161 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); | 179 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); |
162 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); | 180 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); |
163 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); | 181 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); |
164 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); | 182 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); |
@@ -205,8 +223,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
205 | MainWindow::~MainWindow() | 223 | MainWindow::~MainWindow() |
206 | { | 224 | { |
207 | } | 225 | } |
208 | 226 | ||
227 | void MainWindow::setInfoFields(QListViewItem* item ) | ||
228 | { | ||
229 | if ( item == 0) { | ||
230 | subLE->setText(""); | ||
231 | fromLE->setText(""); | ||
232 | toLE->setText(""); | ||
233 | return; | ||
234 | } | ||
235 | RecMailP mail = ((MailListViewItem*)item)->data(); | ||
236 | subLE->setText(mail->getSubject()); | ||
237 | fromLE->setText(mail->getFrom()); | ||
238 | toLE->setText(mail->To().join(";" )); | ||
239 | subLE->setCursorPosition(0); | ||
240 | fromLE->setCursorPosition(0); | ||
241 | toLE->setCursorPosition(0); | ||
242 | |||
243 | } | ||
209 | void MainWindow::slotSetCodec( int codec ) | 244 | void MainWindow::slotSetCodec( int codec ) |
210 | { | 245 | { |
211 | codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false ); | 246 | codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false ); |
212 | //qDebug("codec %d ", codec); | 247 | //qDebug("codec %d ", codec); |
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index 016e44c..ddb3fca 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h | |||
@@ -5,8 +5,9 @@ | |||
5 | 5 | ||
6 | #include <qmainwindow.h> | 6 | #include <qmainwindow.h> |
7 | #include <qlistview.h> | 7 | #include <qlistview.h> |
8 | #include <qaction.h> | 8 | #include <qaction.h> |
9 | #include <qlineedit.h> | ||
9 | 10 | ||
10 | #include <qtoolbar.h> | 11 | #include <qtoolbar.h> |
11 | #ifdef DESKTOP_VERSION | 12 | #ifdef DESKTOP_VERSION |
12 | #include <qmenubar.h> | 13 | #include <qmenubar.h> |
@@ -36,8 +37,9 @@ public slots: | |||
36 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 37 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
37 | virtual void slotComposeMail(); | 38 | virtual void slotComposeMail(); |
38 | 39 | ||
39 | protected slots: | 40 | protected slots: |
41 | virtual void setInfoFields(QListViewItem* ); | ||
40 | virtual void slotSendQueued(); | 42 | virtual void slotSendQueued(); |
41 | virtual void slotEditAccounts(); | 43 | virtual void slotEditAccounts(); |
42 | virtual void slotShowFolders( bool show ); | 44 | virtual void slotShowFolders( bool show ); |
43 | virtual void refreshMailView(const QValueList<RecMailP>&); | 45 | virtual void refreshMailView(const QValueList<RecMailP>&); |
@@ -63,8 +65,9 @@ protected: | |||
63 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, | 65 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |
64 | *editSettings, *editAccounts, *syncFolders; | 66 | *editSettings, *editAccounts, *syncFolders; |
65 | AccountView *folderView; | 67 | AccountView *folderView; |
66 | QListView *mailView; | 68 | QListView *mailView; |
69 | QLineEdit* toLE,*fromLE,*subLE; | ||
67 | //QBoxLayout *layout; | 70 | //QBoxLayout *layout; |
68 | }; | 71 | }; |
69 | 72 | ||
70 | #endif | 73 | #endif |
@@ -1 +1 @@ | |||
version = "1.9.20"; | version = "2.0.0"; | ||