summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/composemailui.ui11
-rw-r--r--kmicromail/libmailwrapper/libmailwrapper.pro2
-rw-r--r--kmicromail/mainwindow.cpp3
-rw-r--r--kmicromail/opiemail.cpp26
-rw-r--r--kmicromail/qpe/qdialog.h8
-rw-r--r--kmicromail/qpe/qdialog_hacked.cpp5
-rw-r--r--microkde/kapplication.cpp4
7 files changed, 38 insertions, 21 deletions
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index c66b0c8..029922c 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -1,35 +1,42 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>ComposeMailUI</class> 2<class>ComposeMailUI</class>
3<include location="local">tr.h</include> 3<include location="local">tr.h</include>
4<widget> 4<widget>
5 <class>QDialog</class> 5 <class>QDialog</class>
6 <property stdset="1"> 6 <property stdset="1">
7 <name>name</name> 7 <name>name</name>
8 <cstring>ComposeMailUI</cstring> 8 <cstring>ComposeMailUI</cstring>
9 </property> 9 </property>
10 <property stdset="1"> 10 <property stdset="1">
11 <name>geometry</name> 11 <name>geometry</name>
12 <rect> 12 <rect>
13 <x>0</x> 13 <x>0</x>
14 <y>0</y> 14 <y>0</y>
15 <width>276</width> 15 <width>579</width>
16 <height>263</height> 16 <height>476</height>
17 </rect> 17 </rect>
18 </property> 18 </property>
19 <property stdset="1"> 19 <property stdset="1">
20 <name>sizePolicy</name>
21 <sizepolicy>
22 <hsizetype>7</hsizetype>
23 <vsizetype>7</vsizetype>
24 </sizepolicy>
25 </property>
26 <property stdset="1">
20 <name>caption</name> 27 <name>caption</name>
21 <string>Compose Message</string> 28 <string>Compose Message</string>
22 </property> 29 </property>
23 <property> 30 <property>
24 <name>layoutMargin</name> 31 <name>layoutMargin</name>
25 </property> 32 </property>
26 <property> 33 <property>
27 <name>layoutSpacing</name> 34 <name>layoutSpacing</name>
28 </property> 35 </property>
29 <grid> 36 <grid>
30 <property stdset="1"> 37 <property stdset="1">
31 <name>margin</name> 38 <name>margin</name>
32 <number>2</number> 39 <number>2</number>
33 </property> 40 </property>
34 <property stdset="1"> 41 <property stdset="1">
35 <name>spacing</name> 42 <name>spacing</name>
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 10d45b1..0919cd2 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -22,33 +22,33 @@ HEADERS = mailwrapper.h \
22SOURCES = imapwrapper.cpp \ 22SOURCES = imapwrapper.cpp \
23 mailwrapper.cpp \ 23 mailwrapper.cpp \
24 mailtypes.cpp \ 24 mailtypes.cpp \
25 pop3wrapper.cpp \ 25 pop3wrapper.cpp \
26 abstractmail.cpp \ 26 abstractmail.cpp \
27 smtpwrapper.cpp \ 27 smtpwrapper.cpp \
28 genericwrapper.cpp \ 28 genericwrapper.cpp \
29 mboxwrapper.cpp \ 29 mboxwrapper.cpp \
30 settings.cpp \ 30 settings.cpp \
31 logindialog.cpp \ 31 logindialog.cpp \
32 sendmailprogress.cpp \ 32 sendmailprogress.cpp \
33 statusmail.cpp \ 33 statusmail.cpp \
34 mhwrapper.cpp \ 34 mhwrapper.cpp \
35 nntpwrapper.cpp \ 35 nntpwrapper.cpp \
36 generatemail.cpp \ 36 generatemail.cpp \
37 storemail.cpp \ 37 storemail.cpp \
38 ./qpe/qdialog_hacked.cpp \ 38 ../qpe/qdialog_hacked.cpp \
39 ../qpe/global.cpp 39 ../qpe/global.cpp
40 40
41INTERFACES = logindialogui.ui \ 41INTERFACES = logindialogui.ui \
42 sendmailprogressui.ui 42 sendmailprogressui.ui
43 43
44INCLUDEPATH += ../qpe .. ../../microkde ../../microkde/kdecore ../libetpan/include 44INCLUDEPATH += ../qpe .. ../../microkde ../../microkde/kdecore ../libetpan/include
45LIBS += -lssl -lcrypto 45LIBS += -lssl -lcrypto
46 46
47#-lqpe -letpan 47#-lqpe -letpan
48 48
49DESTDIR = ../../bin 49DESTDIR = ../../bin
50TARGET = micromailwrapper 50TARGET = micromailwrapper
51 51
52DEFINES += DESKTOP_VERSION 52DEFINES += DESKTOP_VERSION
53unix : { 53unix : {
54OBJECTS_DIR = obj/unix 54OBJECTS_DIR = obj/unix
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 7655385..4115276 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -166,32 +166,35 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
166 if ( QApplication::desktop()->width() > 320 ) 166 if ( QApplication::desktop()->width() > 320 )
167 closeMail->addTo(toolBar); 167 closeMail->addTo(toolBar);
168 closeMail->addTo(mailMenu); 168 closeMail->addTo(mailMenu);
169 169
170 170
171 QPopupMenu* helpMenu = new QPopupMenu( menuBar ); 171 QPopupMenu* helpMenu = new QPopupMenu( menuBar );
172 menuBar->insertItem( i18n( "Help" ), helpMenu ); 172 menuBar->insertItem( i18n( "Help" ), helpMenu );
173 QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 173 QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this);
174 connect( li, SIGNAL( activated() ), SLOT( showAbout()) ); 174 connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
175 li->addTo(helpMenu); 175 li->addTo(helpMenu);
176 li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 176 li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this);
177 connect( li, SIGNAL( activated() ), SLOT( showLicence()) ); 177 connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
178 li->addTo(helpMenu); 178 li->addTo(helpMenu);
179 li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 179 li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this);
180 connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) ); 180 connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
181 li->addTo(helpMenu); 181 li->addTo(helpMenu);
182#ifdef DESKTOP_VERSION
183 resize ( 640, 480 );
184#endif
182} 185}
183 186
184MainWindow::~MainWindow() 187MainWindow::~MainWindow()
185{ 188{
186} 189}
187 190
188void MainWindow::showLicence() 191void MainWindow::showLicence()
189{ 192{
190 KApplication::showLicence(); 193 KApplication::showLicence();
191} 194}
192void MainWindow::showAbout() 195void MainWindow::showAbout()
193{ 196{
194 QString version; 197 QString version;
195#include <../version> 198#include <../version>
196 199
197 QString cap = "About KOpieMail/Pi"; 200 QString cap = "About KOpieMail/Pi";
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index e088b9e..ca3faaf 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,54 +1,50 @@
1// CHANGED 2004-09-31 Lutz Rogowski 1// CHANGED 2004-09-31 Lutz Rogowski
2// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
3 3
4#include "koprefsdialog.h" 4#include "koprefsdialog.h"
5#include <kapplication.h>
5#include <libkdepim/externalapphandler.h> 6#include <libkdepim/externalapphandler.h>
6#include <libkdepim/kpimglobalprefs.h> 7#include <libkdepim/kpimglobalprefs.h>
7#ifdef MINIKDE_KDIALOG_H 8#ifdef MINIKDE_KDIALOG_H
8#undef MINIKDE_KDIALOG_H 9#undef MINIKDE_KDIALOG_H
9#endif 10#endif
10#include "settingsdialog.h" 11#include "settingsdialog.h"
11#include "opiemail.h" 12#include "opiemail.h"
12#include "editaccounts.h" 13#include "editaccounts.h"
13#include "composemail.h" 14#include "composemail.h"
14#include "mailistviewitem.h" 15#include "mailistviewitem.h"
15#include "viewmail.h" 16#include "viewmail.h"
16#include "selectstore.h" 17#include "selectstore.h"
17#include "selectsmtp.h" 18#include "selectsmtp.h"
18#include "accountitem.h" 19#include "accountitem.h"
19#include "klocale.h" 20#include "klocale.h"
20 21
21#include <qmessagebox.h> 22#include <qmessagebox.h>
22#include <qtimer.h> 23#include <qtimer.h>
23#include <qcursor.h> 24#include <qcursor.h>
24#include <qregexp.h> 25#include <qregexp.h>
25 26
26#ifdef DESKTOP_VERSION 27#ifdef DESKTOP_VERSION
27#include <qapplication.h> 28#include <qapplication.h>
28#else 29#else
29#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
30#endif 31#endif
31#include <libmailwrapper/smtpwrapper.h> 32#include <libmailwrapper/smtpwrapper.h>
32#include <libmailwrapper/mailtypes.h> 33#include <libmailwrapper/mailtypes.h>
33#include <libmailwrapper/abstractmail.h> 34#include <libmailwrapper/abstractmail.h>
34/* OPIE */
35//#include <qpe/resource.h>
36//#include <qpe/qpeapplication.h>
37
38/* QT */
39 35
40//using namespace Opie::Core; 36//using namespace Opie::Core;
41 37
42OpieMail::OpieMail( QWidget *parent, const char *name ) 38OpieMail::OpieMail( QWidget *parent, const char *name )
43 : MainWindow( parent, name) //, WStyle_ContextHelp ) 39 : MainWindow( parent, name) //, WStyle_ContextHelp )
44{ 40{
45 settings = new Settings(); 41 settings = new Settings();
46 42
47 folderView->populate( settings->getAccounts() ); 43 folderView->populate( settings->getAccounts() );
48 44
49} 45}
50 46
51OpieMail::~OpieMail() 47OpieMail::~OpieMail()
52{ 48{
53 if (settings) delete settings; 49 if (settings) delete settings;
54} 50}
@@ -208,64 +204,70 @@ void OpieMail::slotSendQueued()
208 SMTPwrapper * wrap = new SMTPwrapper(smtp); 204 SMTPwrapper * wrap = new SMTPwrapper(smtp);
209 if ( wrap->flushOutbox() ) 205 if ( wrap->flushOutbox() )
210 { 206 {
211 QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed")); 207 QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed"));
212 } 208 }
213 delete wrap; 209 delete wrap;
214 } 210 }
215} 211}
216 212
217void OpieMail::slotSearchMails() 213void OpieMail::slotSearchMails()
218{ 214{
219 qDebug("OpieMail::slotSearchMails():not implemented "); 215 qDebug("OpieMail::slotSearchMails():not implemented ");
220} 216}
221 217
222void OpieMail::slotEditSettings() 218void OpieMail::slotEditSettings()
223{ 219{
224#if 0 220
225 SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp );
226 settingsDialog.showMaximized();
227 settingsDialog.exec();
228#endif
229 KOPrefsDialog settingsDialog( this, "koprefs", true ); 221 KOPrefsDialog settingsDialog( this, "koprefs", true );
222#ifndef DESKTOP_VERSION
230 settingsDialog.showMaximized(); 223 settingsDialog.showMaximized();
224#endif
231 settingsDialog.exec(); 225 settingsDialog.exec();
226
227 // KApplication::execDialog(settingsDialog);
232} 228}
233 229
234void OpieMail::slotEditAccounts() 230void OpieMail::slotEditAccounts()
235{ 231{
236 EditAccounts eaDialog( settings, this, 0, true ); 232 EditAccounts eaDialog( settings, this, 0, true );
237 eaDialog.slotAdjustColumns(); 233 eaDialog.slotAdjustColumns();
234#ifndef DESKTOP_VERSION
238 eaDialog.showMaximized(); 235 eaDialog.showMaximized();
236#endif
239 eaDialog.exec(); 237 eaDialog.exec();
240 if ( settings ) delete settings; 238 if ( settings ) delete settings;
241 settings = new Settings(); 239 settings = new Settings();
242 240
243 folderView->populate( settings->getAccounts() ); 241 folderView->populate( settings->getAccounts() );
244} 242}
245 243
246void OpieMail::displayMail() 244void OpieMail::displayMail()
247{ 245{
248 QListViewItem*item = mailView->currentItem(); 246 QListViewItem*item = mailView->currentItem();
249 if (!item) return; 247 if (!item) return;
250 RecMailP mail = ((MailListViewItem*)item)->data(); 248 RecMailP mail = ((MailListViewItem*)item)->data();
251 RecBodyP body = folderView->fetchBody(mail); 249 RecBodyP body = folderView->fetchBody(mail);
252 ViewMail readMail( this,"", Qt::WType_Modal ); 250 ViewMail readMail( this,"", Qt::WType_Modal );
253 readMail.setBody( body ); 251 readMail.setBody( body );
254 readMail.setMail( mail ); 252 readMail.setMail( mail );
253#ifndef DESKTOP_VERSION
255 readMail.showMaximized(); 254 readMail.showMaximized();
255#else
256 readMail.resize( 640, 480);
257#endif
256 readMail.exec(); 258 readMail.exec();
257 259
258 if ( readMail.deleted ) 260 if ( readMail.deleted )
259 { 261 {
260 folderView->refreshCurrent(); 262 folderView->refreshCurrent();
261 } 263 }
262 else 264 else
263 { 265 {
264 ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); 266 ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
265 } 267 }
266} 268}
267void OpieMail::slotGetAllMail() 269void OpieMail::slotGetAllMail()
268{ 270{
269 QListViewItem * item = folderView->firstChild(); 271 QListViewItem * item = folderView->firstChild();
270 while ( item ){ 272 while ( item ){
271 ((AccountViewItem *)item)->contextMenuSelected( 101 ); 273 ((AccountViewItem *)item)->contextMenuSelected( 101 );
@@ -459,19 +461,23 @@ void OpieMail::slotMoveCopyAllMail()
459 return; 461 return;
460 } 462 }
461 sels.hide(); 463 sels.hide();
462 qApp->processEvents(); 464 qApp->processEvents();
463 //qDebug("hiding sels "); 465 //qDebug("hiding sels ");
464 mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails()); 466 mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
465 folderView->refreshCurrent(); 467 folderView->refreshCurrent();
466} 468}
467 469
468void OpieMail::reEditMail() 470void OpieMail::reEditMail()
469{ 471{
470 if (!mailView->currentItem()) return; 472 if (!mailView->currentItem()) return;
471 473
472 ComposeMail compose( settings, this, 0, true ); 474 ComposeMail compose( settings, this, 0, true );
473 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); 475 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
474 compose.slotAdjustColumns(); 476 compose.slotAdjustColumns();
477#ifndef DESKTOP_VERSION
475 compose.showMaximized(); 478 compose.showMaximized();
479#else
480 compose.resize(640,480);
481#endif
476 compose.exec(); 482 compose.exec();
477} 483}
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h
index d671e34..aafdf80 100644
--- a/kmicromail/qpe/qdialog.h
+++ b/kmicromail/qpe/qdialog.h
@@ -1,35 +1,33 @@
1 1
2#ifndef MINIKDE_KDIALOG_H 2#ifndef MINIKDE_KDIALOG_H
3 3
4#ifndef DEFINE_QDIALOG_HACK 4#ifndef DEFINE_QDIALOG_HACK
5#define DEFINE_QDIALOG_HACK 5#define DEFINE_QDIALOG_HACK
6#warning call of include <qdialog.h> 6#warning call of include <qdialog.h>
7#warning including /usr/local/qt/include/qdialog.h 7#warning including /usr/local/qt/include/qdialog.h
8#warning if you get an compiling error please adjust your path her 8#warning if you get a compiling error
9#warning please adjust your path here!
9 10
10#include "/usr/local/qt/include/qdialog.h" 11#include "/usr/local/qt/include/qdialog.h"
11class QDialog_hacked : public QDialog 12class QDialog_hacked : public QDialog
12{ 13{
13 //Q__OBJECT 14 //Q__OBJECT
14 15
15 public: 16 public:
16 QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 ); 17 QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 );
17 18
18}; 19};
19 20
20#define QDialog QDialog_hacked 21#define QDialog QDialog_hacked
21 22
22#endif 23#endif
23 24
24#else 25#else
25#warning ****************************************** 26#warning ******************************************
26#warning ****************************************** 27#warning ******************************************
27#warning ****************************************** 28#warning ******************************************
28#warning ****************************************** 29#warning ******************************************
29#warning ****************************************** 30#warning "/usr/local/qt/include/qdialog.h" for KDialog
30#warning ******************************************
31#warning ******************************************
32#warning ******************************************
33#include "/usr/local/qt/include/qdialog.h" 31#include "/usr/local/qt/include/qdialog.h"
34 32
35#endif 33#endif
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp
index e2ce21a..3669312 100644
--- a/kmicromail/qpe/qdialog_hacked.cpp
+++ b/kmicromail/qpe/qdialog_hacked.cpp
@@ -1,30 +1,31 @@
1 1
2#include <qdialog.h> 2#include <qdialog.h>
3#include <qhbox.h> 3#include <qhbox.h>
4#include <qpushbutton.h> 4#include <qpushbutton.h>
5#include <klocale.h> 5#include <klocale.h>
6#ifdef QDialog 6#ifdef QDialog
7#undef QDialog 7#undef QDialog
8#endif 8#endif
9 QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) 9 QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f )
10 : QDialog( parent,name,modal) 10 : QDialog( parent,name,modal, f)
11 { 11 {
12 qDebug("******************** "); 12 qDebug("******************** ");
13 qDebug("******************** "); 13 qDebug("******************** ");
14 qDebug("******************** "); 14 qDebug("******************** ");
15 qDebug("******************** "); 15 qDebug("******************** ");
16 qDebug("New hacked QDialog == KDialogBase "); 16 qDebug("New hacked QDialog for ompi ");
17 //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); 17 //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) );
18 18
19 setOrientation ( Vertical ); 19 setOrientation ( Vertical );
20 QHBox * hb = new QHBox ( this ); 20 QHBox * hb = new QHBox ( this );
21 QPushButton *ok = new QPushButton( i18n("OK"), hb ); 21 QPushButton *ok = new QPushButton( i18n("OK"), hb );
22 QPushButton *cancel = new QPushButton( i18n("Cancel"), hb ); 22 QPushButton *cancel = new QPushButton( i18n("Cancel"), hb );
23 setExtension ( hb ); 23 setExtension ( hb );
24 showExtension ( true ); 24 showExtension ( true );
25 connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); 25 connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) );
26 connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); 26 connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) );
27 //setWFlags(WStyle_MinMax );
27 28
28 } 29 }
29 30
30 31
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 56c01af..d6f556d 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -23,37 +23,39 @@ QString KApplication::randomString(int length)
23 QString str; 23 QString str;
24 while (length--) 24 while (length--)
25 { 25 {
26 int r=random() % 62; 26 int r=random() % 62;
27 r+=48; 27 r+=48;
28 if (r>57) r+=7; 28 if (r>57) r+=7;
29 if (r>90) r+=6; 29 if (r>90) r+=6;
30 str += char(r); 30 str += char(r);
31 // so what if I work backwards? 31 // so what if I work backwards?
32 } 32 }
33 return str; 33 return str;
34} 34}
35int KApplication::execDialog( QDialog* d ) 35int KApplication::execDialog( QDialog* d )
36{ 36{
37 if (QApplication::desktop()->width() <= 640 ) 37 if (QApplication::desktop()->width() <= 640 )
38 d->showMaximized(); 38 d->showMaximized();
39 else
40 ;//d->resize( 800, 600 );
39 return d->exec(); 41 return d->exec();
40} 42}
41void KApplication::showLicence() 43void KApplication::showLicence()
42{ 44{
43 KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" ); 45 KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" );
44} 46}
45 47
46void KApplication::showFile(QString caption, QString fn) 48void KApplication::showFile(QString caption, QString fn)
47{ 49{
48 QString text; 50 QString text;
49 QString fileName; 51 QString fileName;
50#ifndef DESKTOP_VERSION 52#ifndef DESKTOP_VERSION
51 fileName = getenv("QPEDIR"); 53 fileName = getenv("QPEDIR");
52 fileName += "/pics/" + fn ; 54 fileName += "/pics/" + fn ;
53#else 55#else
54 fileName = qApp->applicationDirPath () + "/" + fn; 56 fileName = qApp->applicationDirPath () + "/" + fn;
55#endif 57#endif
56 QFile file( fileName ); 58 QFile file( fileName );
57 if (!file.open( IO_ReadOnly ) ) { 59 if (!file.open( IO_ReadOnly ) ) {
58 return ; 60 return ;
59 } 61 }