summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/mail.pro2
-rw-r--r--noncore/net/mail/mainwindow.cpp1
2 files changed, 0 insertions, 3 deletions
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 098817a..c913826 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,42 +1,40 @@
1 CONFIG += qt warn_on debug quick-app 1 CONFIG += qt warn_on debug quick-app
2 2
3 HEADERS = defines.h \ 3 HEADERS = defines.h \
4 logindialog.h \ 4 logindialog.h \
5 settings.h \ 5 settings.h \
6 editaccounts.h \ 6 editaccounts.h \
7 mailwrapper.h \ 7 mailwrapper.h \
8 composemail.h \ 8 composemail.h \
9 accountview.h \ 9 accountview.h \
10 mainwindow.h \ 10 mainwindow.h \
11 readmailgui.h \
12 opiemail.h 11 opiemail.h
13 12
14 SOURCES = main.cpp \ 13 SOURCES = main.cpp \
15 opiemail.cpp \ 14 opiemail.cpp \
16 mainwindow.cpp \ 15 mainwindow.cpp \
17 accountview.cpp \ 16 accountview.cpp \
18 composemail.cpp \ 17 composemail.cpp \
19 mailwrapper.cpp \ 18 mailwrapper.cpp \
20 imapwrapper.cpp \ 19 imapwrapper.cpp \
21 addresspicker.cpp \ 20 addresspicker.cpp \
22 editaccounts.cpp \ 21 editaccounts.cpp \
23 logindialog.cpp \ 22 logindialog.cpp \
24 readmailgui.cpp \
25 settings.cpp 23 settings.cpp
26 24
27 INTERFACES = editaccountsui.ui \ 25 INTERFACES = editaccountsui.ui \
28 selectmailtypeui.ui \ 26 selectmailtypeui.ui \
29 imapconfigui.ui \ 27 imapconfigui.ui \
30 pop3configui.ui \ 28 pop3configui.ui \
31 nntpconfigui.ui \ 29 nntpconfigui.ui \
32 smtpconfigui.ui \ 30 smtpconfigui.ui \
33 addresspickerui.ui \ 31 addresspickerui.ui \
34 logindialogui.ui \ 32 logindialogui.ui \
35 composemailui.ui 33 composemailui.ui
36 34
37INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
38INCLUDEPATH += $(OPIEDIR)/include/libetpan 36INCLUDEPATH += $(OPIEDIR)/include/libetpan
39 LIBS += -lqpe -lopie -letpan -lssl -lcrypto -ldb 37 LIBS += -lqpe -lopie -letpan -lssl -lcrypto -ldb
40TARGET = opiemail 38TARGET = opiemail
41 39
42include ( $(OPIEDIR)/include.pro ) 40include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 0a433a0..28111d0 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,33 +1,32 @@
1#include <qlabel.h> 1#include <qlabel.h>
2#include <qvbox.h> 2#include <qvbox.h>
3#include <qheader.h> 3#include <qheader.h>
4#include <qtimer.h> 4#include <qtimer.h>
5 5
6#include <qpe/resource.h> 6#include <qpe/resource.h>
7 7
8#include "defines.h" 8#include "defines.h"
9#include "readmailgui.h"
10#include "mainwindow.h" 9#include "mainwindow.h"
11 10
12MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 11MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
13 : QMainWindow( parent, name, flags ) 12 : QMainWindow( parent, name, flags )
14{ 13{
15 setCaption( tr( "Opie-Mail" ) ); 14 setCaption( tr( "Opie-Mail" ) );
16 setToolBarsMovable( false ); 15 setToolBarsMovable( false );
17 16
18 toolBar = new QToolBar( this ); 17 toolBar = new QToolBar( this );
19 menuBar = new QMenuBar( toolBar ); 18 menuBar = new QMenuBar( toolBar );
20 mailMenu = new QPopupMenu( menuBar ); 19 mailMenu = new QPopupMenu( menuBar );
21 menuBar->insertItem( tr( "Mail" ), mailMenu ); 20 menuBar->insertItem( tr( "Mail" ), mailMenu );
22 settingsMenu = new QPopupMenu( menuBar ); 21 settingsMenu = new QPopupMenu( menuBar );
23 menuBar->insertItem( tr( "Settings" ), settingsMenu ); 22 menuBar->insertItem( tr( "Settings" ), settingsMenu );
24 23
25 addToolBar( toolBar ); 24 addToolBar( toolBar );
26 toolBar->setHorizontalStretchable( true ); 25 toolBar->setHorizontalStretchable( true );
27 26
28 QLabel *spacer = new QLabel( toolBar ); 27 QLabel *spacer = new QLabel( toolBar );
29 spacer->setBackgroundMode( QWidget::PaletteButton ); 28 spacer->setBackgroundMode( QWidget::PaletteButton );
30 toolBar->setStretchableWidget( spacer ); 29 toolBar->setStretchableWidget( spacer );
31 30
32 composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL, 31 composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
33 0, 0, this ); 32 0, 0, this );