summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-27 08:29:50 (UTC)
committer zautrix <zautrix>2005-01-27 08:29:50 (UTC)
commit3cc7fcfca62701f39c2626d48286b949a43313da (patch) (unidiff)
tree5c16e322d8d1c18b47fa825c64cc9d7b6db6fea0
parent5b73e9576949ec5123dbd34fd0fe94828af97f49 (diff)
downloadkdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.zip
kdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.tar.gz
kdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt7
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt6
-rw-r--r--kmicromail/mainwindow.cpp39
-rw-r--r--kmicromail/mainwindow.h3
-rw-r--r--version2
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,22 +1,25 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 1.9.21 ************ 3********** VERSION 2.0.0 ************
4
5Stable release 2.0.0!
4 6
5KO/Pi: 7KO/Pi:
6Fixed problem in edit dialog recreation at startup. 8Fixed problem in edit dialog recreation at startup.
7Made "toggle view*" menu items enabled context sensitive. 9Made "toggle view*" menu items enabled context sensitive.
8Changed agenda size menu to items 1-10. 10Changed agenda size menu to items 1-10.
9Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. 11Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
10 12OM/Pi:
13Added 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
14KO/Pi: 17KO/Pi:
15Added for the "dislplay one day" agenda mode 18Added for the "dislplay one day" agenda mode
16info in the caption and in the day lables: 19info in the caption and in the day lables:
17Now it is displayed, if the selected day is from "day before yesterday" 20Now it is displayed, if the selected day is from "day before yesterday"
18to "day after tomorrow". 21to "day after tomorrow".
19Made it possible to delete a Todo, which has sub-todos. 22Made it possible to delete a Todo, which has sub-todos.
20Fixed two small problems in the todo view. 23Fixed two small problems in the todo view.
21Added missing German translation for filter edit and print dialog. 24Added missing German translation for filter edit and print dialog.
22Made search dialog closeable by cancel key. 25Made search dialog closeable by cancel key.
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
@@ -244,17 +244,21 @@
244{ "Time Format","Zeit Format" }, 244{ "Time Format","Zeit Format" },
245{ "%1 groups subscribed","%1 Guppen abboniert" }, 245{ "%1 groups subscribed","%1 Guppen abboniert" },
246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, 246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
247{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, 247{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
248{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, 248{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
249{ "Save settings","Speichere Einstellungen" }, 249{ "Save settings","Speichere Einstellungen" },
250{ "Save standard","Speichere Standard" }, 250{ "Save standard","Speichere Standard" },
251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, 251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
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
@@ -11,24 +11,25 @@
11 11
12#ifdef DESKTOP_VERSION 12#ifdef DESKTOP_VERSION
13#include <qapplication.h> 13#include <qapplication.h>
14#include <qstatusbar.h> 14#include <qstatusbar.h>
15#include <kabc/stdaddressbook.h> 15#include <kabc/stdaddressbook.h>
16extern QStatusBar* globalSstatusBarMainWindow; 16extern QStatusBar* globalSstatusBarMainWindow;
17#else 17#else
18#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
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
27MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 28MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
28 : QMainWindow( parent, name ) //, flags ) 29 : QMainWindow( parent, name ) //, flags )
29{ 30{
30#ifdef DESKTOP_VERSION 31#ifdef DESKTOP_VERSION
31 globalSstatusBarMainWindow = statusBar(); 32 globalSstatusBarMainWindow = statusBar();
32#endif 33#endif
33 setCaption( i18n( "KOpieMail/Pi" ) ); 34 setCaption( i18n( "KOpieMail/Pi" ) );
34 setToolBarsMovable( false ); 35 setToolBarsMovable( false );
@@ -107,28 +108,38 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
107 codecMenu->insertItem( "Western (iso-8859-15)",2,2); 108 codecMenu->insertItem( "Western (iso-8859-15)",2,2);
108 codecMenu->insertItem( "Chinese (big-5)",3,3); 109 codecMenu->insertItem( "Chinese (big-5)",3,3);
109 codecMenu->insertItem( "Unicode (utf-8)",4,4); 110 codecMenu->insertItem( "Unicode (utf-8)",4,4);
110 codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5); 111 codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
111 //disabled 112 //disabled
112 //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu); 113 //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
113 //setCentralWidget( view ); 114 //setCentralWidget( view );
114 115
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" ) );
127 138
128 //layout->addWidget( folderView ); 139 //layout->addWidget( folderView );
129 140
130 mailView = new QListView( split ); 141 mailView = new QListView( split );
131 mailView->addColumn( i18n( " " ) ); 142 mailView->addColumn( i18n( " " ) );
132 mailView->addColumn( i18n( "Subject" ),QListView::Manual ); 143 mailView->addColumn( i18n( "Subject" ),QListView::Manual );
133 mailView->addColumn( i18n( "Sender" ),QListView::Manual ); 144 mailView->addColumn( i18n( "Sender" ),QListView::Manual );
134 mailView->addColumn( i18n( "Size" ),QListView::Manual); 145 mailView->addColumn( i18n( "Size" ),QListView::Manual);
@@ -140,33 +151,40 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
140 mailView->setRootIsDecorated( false ); 151 mailView->setRootIsDecorated( false );
141 statusWidget = new StatusWidget( wrapperBox ); 152 statusWidget = new StatusWidget( wrapperBox );
142 statusWidget->hide(); 153 statusWidget->hide();
143 154
144 //layout->addWidget( mailView ); 155 //layout->addWidget( mailView );
145 //layout->setStretchFactor( folderView, 1 ); 156 //layout->setStretchFactor( folderView, 1 );
146 //layout->setStretchFactor( mailView, 2 ); 157 //layout->setStretchFactor( mailView, 2 );
147 158
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,
156 SLOT( mailLeftClicked(QListViewItem*) ) ); 170 SLOT( mailLeftClicked(QListViewItem*) ) );
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() ) );
165 //mailView->setMultiSelection ( true ); 183 //mailView->setMultiSelection ( true );
166 mailView->setSelectionMode( QListView::Extended ); 184 mailView->setSelectionMode( QListView::Extended );
167 QValueList<int> list; 185 QValueList<int> list;
168 int fw = 100; 186 int fw = 100;
169 if ( QApplication::desktop()->width() > 320 ) 187 if ( QApplication::desktop()->width() > 320 )
170 fw = 50; 188 fw = 50;
171 list.append( fw ); 189 list.append( fw );
172 list.append( 100 ); 190 list.append( 100 );
@@ -197,24 +215,41 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
197 li->addTo(helpMenu); 215 li->addTo(helpMenu);
198 connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) ); 216 connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
199 slotSetCodec( KOPrefs::instance()->mCurrentCodec ); 217 slotSetCodec( KOPrefs::instance()->mCurrentCodec );
200#ifdef DESKTOP_VERSION 218#ifdef DESKTOP_VERSION
201 resize ( 640, 480 ); 219 resize ( 640, 480 );
202#endif 220#endif
203} 221}
204 222
205MainWindow::~MainWindow() 223MainWindow::~MainWindow()
206{ 224{
207} 225}
208 226
227void 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}
209void MainWindow::slotSetCodec( int codec ) 244void 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);
213 KOPrefs::instance()->mCurrentCodec = codec; 248 KOPrefs::instance()->mCurrentCodec = codec;
214 KOPrefs::instance()->isDirty = true; 249 KOPrefs::instance()->isDirty = true;
215 QString name; 250 QString name;
216 switch ( codec ) { 251 switch ( codec ) {
217 case 0: 252 case 0:
218 name = "iso-8859-1"; 253 name = "iso-8859-1";
219 break; 254 break;
220 case 1: 255 case 1:
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 016e44c..ddb3fca 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,20 +1,21 @@
1 1
2// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
3#ifndef MAINWINDOW_H 3#ifndef MAINWINDOW_H
4#define MAINWINDOW_H 4#define MAINWINDOW_H
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>
13#define QPEMenuBar QMenuBar 14#define QPEMenuBar QMenuBar
14#else 15#else
15#include <qpe/qpemenubar.h> 16#include <qpe/qpemenubar.h>
16#endif 17#endif
17 18
18#include "accountview.h" 19#include "accountview.h"
19#include "statuswidget.h" 20#include "statuswidget.h"
20 21
@@ -28,24 +29,25 @@ class MainWindow : public QMainWindow
28 Q_OBJECT 29 Q_OBJECT
29 30
30public: 31public:
31 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); 32 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
32 virtual ~MainWindow(); 33 virtual ~MainWindow();
33 34
34public slots: 35public slots:
35 virtual void slotAdjustColumns(); 36 virtual void slotAdjustColumns();
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
39protected slots: 40protected 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>&);
44 virtual void displayMail(); 46 virtual void displayMail();
45 virtual void slotGetMail() = 0; 47 virtual void slotGetMail() = 0;
46 virtual void slotGetAllMail() = 0; 48 virtual void slotGetAllMail() = 0;
47 virtual void slotDeleteMail(); 49 virtual void slotDeleteMail();
48 virtual void slotDeleteAllMail() = 0; 50 virtual void slotDeleteAllMail() = 0;
49 virtual void slotSetCodec(int); 51 virtual void slotSetCodec(int);
50 virtual void mailHold(int, QListViewItem *,const QPoint&,int); 52 virtual void mailHold(int, QListViewItem *,const QPoint&,int);
51 virtual void slotAdjustLayout(); 53 virtual void slotAdjustLayout();
@@ -55,16 +57,17 @@ protected slots:
55 void showAbout(); 57 void showAbout();
56 void showEtpanLicence(); 58 void showEtpanLicence();
57 59
58protected: 60protected:
59 QToolBar *toolBar; 61 QToolBar *toolBar;
60 StatusWidget *statusWidget; 62 StatusWidget *statusWidget;
61 QPEMenuBar *menuBar; 63 QPEMenuBar *menuBar;
62 QPopupMenu *mailMenu, *settingsMenu, *codecMenu; 64 QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
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
diff --git a/version b/version
index 02b0fb1..b972ae7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.20"; version = "2.0.0";