author | groucho <groucho> | 2003-04-07 07:35:39 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-04-07 07:35:39 (UTC) |
commit | 1725b536c8a5a939a481196cce1dc35af2d9a63a (patch) (unidiff) | |
tree | 1e4c80853f2b484dd4193827225eafc1bd632330 /noncore | |
parent | 4c0390976930423c4e05394563564ab00faf8009 (diff) | |
download | opie-1725b536c8a5a939a481196cce1dc35af2d9a63a.zip opie-1725b536c8a5a939a481196cce1dc35af2d9a63a.tar.gz opie-1725b536c8a5a939a481196cce1dc35af2d9a63a.tar.bz2 |
Better look, crystal icons and path corrections
-rw-r--r-- | noncore/net/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mailit/emailclient.h | 4 | ||||
-rw-r--r-- | noncore/net/mailit/mailit.pro | 2 | ||||
-rw-r--r-- | noncore/net/mailit/readmail.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailclient.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailit.pro | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/readmail.cpp | 6 |
8 files changed, 20 insertions, 20 deletions
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index 2e82623..fc4276b 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp | |||
@@ -149,58 +149,58 @@ void EmailClient::init() | |||
149 | getMailButton->addTo(mail); | 149 | getMailButton->addTo(mail); |
150 | 150 | ||
151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0); | 151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0); |
152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); | 152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); |
153 | sendMailButton->addTo(bar); | 153 | sendMailButton->addTo(bar); |
154 | sendMailButton->addTo(mail); | 154 | sendMailButton->addTo(mail); |
155 | 155 | ||
156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); | 156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); |
157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); | 157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); |
158 | composeButton->addTo(bar); | 158 | composeButton->addTo(bar); |
159 | composeButton->addTo(mail); | 159 | composeButton->addTo(mail); |
160 | 160 | ||
161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("reset"), QString::null, 0, this, 0); | 161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); |
162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); | 162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); |
163 | cancelButton->addTo(mail); | 163 | cancelButton->addTo(mail); |
164 | cancelButton->setEnabled(FALSE); | 164 | cancelButton->setEnabled(FALSE); |
165 | 165 | ||
166 | mailboxView = new QTabWidget( this, "mailboxView" ); | 166 | mailboxView = new OTabWidget( this, "mailboxView" ); |
167 | 167 | ||
168 | QWidget* widget = new QWidget( mailboxView, "widget" ); | 168 | QWidget* widget = new QWidget( mailboxView, "widget" ); |
169 | grid_2 = new QGridLayout( widget ); | 169 | grid_2 = new QGridLayout( widget ); |
170 | // grid_2->setSpacing(6); | 170 | // grid_2->setSpacing(6); |
171 | // grid_2->setMargin( 11 ); | 171 | // grid_2->setMargin( 11 ); |
172 | 172 | ||
173 | inboxView = new QListView( widget, "inboxView" ); | 173 | inboxView = new QListView( widget, "inboxView" ); |
174 | inboxView->addColumn( tr( "From" ) ); | 174 | inboxView->addColumn( tr( "From" ) ); |
175 | inboxView->addColumn( tr( "Subject" ) ); | 175 | inboxView->addColumn( tr( "Subject" ) ); |
176 | inboxView->addColumn( tr( "Date" ) ); | 176 | inboxView->addColumn( tr( "Date" ) ); |
177 | inboxView->setMinimumSize( QSize( 0, 0 ) ); | 177 | inboxView->setMinimumSize( QSize( 0, 0 ) ); |
178 | inboxView->setAllColumnsShowFocus(TRUE); | 178 | inboxView->setAllColumnsShowFocus(TRUE); |
179 | 179 | ||
180 | grid_2->addWidget( inboxView, 2, 0 ); | 180 | grid_2->addWidget( inboxView, 2, 0 ); |
181 | mailboxView->insertTab( widget, tr( "Inbox" ) ); | 181 | mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) ); |
182 | 182 | ||
183 | QWidget* widget_2 = new QWidget( mailboxView, "widget_2" ); | 183 | QWidget* widget_2 = new QWidget( mailboxView, "widget_2" ); |
184 | grid_3 = new QGridLayout( widget_2 ); | 184 | grid_3 = new QGridLayout( widget_2 ); |
185 | // grid_3->setSpacing(6); | 185 | // grid_3->setSpacing(6); |
186 | // grid_3->setMargin( 11 ); | 186 | // grid_3->setMargin( 11 ); |
187 | 187 | ||
188 | outboxView = new QListView( widget_2, "outboxView" ); | 188 | outboxView = new QListView( widget_2, "outboxView" ); |
189 | outboxView->addColumn( tr( "To" ) ); | 189 | outboxView->addColumn( tr( "To" ) ); |
190 | outboxView->addColumn( tr( "Subject" ) ); | 190 | outboxView->addColumn( tr( "Subject" ) ); |
191 | outboxView->setAllColumnsShowFocus(TRUE); | 191 | outboxView->setAllColumnsShowFocus(TRUE); |
192 | 192 | ||
193 | grid_3->addWidget( outboxView, 0, 0 ); | 193 | grid_3->addWidget( outboxView, 0, 0 ); |
194 | mailboxView->insertTab( widget_2, tr( "Outbox" ) ); | 194 | mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); |
195 | 195 | ||
196 | setCentralWidget(mailboxView); | 196 | setCentralWidget(mailboxView); |
197 | } | 197 | } |
198 | 198 | ||
199 | void EmailClient::compose() | 199 | void EmailClient::compose() |
200 | { | 200 | { |
201 | emit composeRequested(); | 201 | emit composeRequested(); |
202 | } | 202 | } |
203 | 203 | ||
204 | void EmailClient::cancel() | 204 | void EmailClient::cancel() |
205 | { | 205 | { |
206 | emailHandler->cancel(); | 206 | emailHandler->cancel(); |
diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h index 135bfaa..80457f9 100644 --- a/noncore/net/mailit/emailclient.h +++ b/noncore/net/mailit/emailclient.h | |||
@@ -20,35 +20,35 @@ | |||
20 | #ifndef EMAILCLIENT_H | 20 | #ifndef EMAILCLIENT_H |
21 | #define EMAILCLIENT_H | 21 | #define EMAILCLIENT_H |
22 | 22 | ||
23 | #include <qlist.h> | 23 | #include <qlist.h> |
24 | #include <qcstring.h> | 24 | #include <qcstring.h> |
25 | #include <qmainwindow.h> | 25 | #include <qmainwindow.h> |
26 | 26 | ||
27 | #include <qtoolbar.h> | 27 | #include <qtoolbar.h> |
28 | #include <qcheckbox.h> | 28 | #include <qcheckbox.h> |
29 | #include <qlabel.h> | 29 | #include <qlabel.h> |
30 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
31 | #include <qlistview.h> | 31 | #include <qlistview.h> |
32 | #include <qtabwidget.h> | ||
33 | #include <qaction.h> | 32 | #include <qaction.h> |
34 | #include <qlayout.h> | 33 | #include <qlayout.h> |
35 | #include <qtooltip.h> | 34 | #include <qtooltip.h> |
36 | #include <qimage.h> | 35 | #include <qimage.h> |
37 | #include <qpixmap.h> | 36 | #include <qpixmap.h> |
38 | #include <qstringlist.h> | 37 | #include <qstringlist.h> |
39 | #include <qprogressbar.h> | 38 | #include <qprogressbar.h> |
40 | #include <qstatusbar.h> | 39 | #include <qstatusbar.h> |
41 | #include <qdir.h> | 40 | #include <qdir.h> |
42 | #include <stdlib.h> | 41 | #include <stdlib.h> |
42 | #include <opie/otabwidget.h> | ||
43 | 43 | ||
44 | #include "emailhandler.h" | 44 | #include "emailhandler.h" |
45 | #include "emaillistitem.h" | 45 | #include "emaillistitem.h" |
46 | #include "textparser.h" | 46 | #include "textparser.h" |
47 | #include "editaccount.h" | 47 | #include "editaccount.h" |
48 | #include "maillist.h" | 48 | #include "maillist.h" |
49 | #include "addresslist.h" | 49 | #include "addresslist.h" |
50 | 50 | ||
51 | #include <qpe/config.h> | 51 | #include <qpe/config.h> |
52 | 52 | ||
53 | class AccountList : public QList<MailAccount> | 53 | class AccountList : public QList<MailAccount> |
54 | { | 54 | { |
@@ -129,21 +129,21 @@ private: | |||
129 | QStatusBar *statusBar; | 129 | QStatusBar *statusBar; |
130 | QLabel *status1Label, *status2Label; | 130 | QLabel *status1Label, *status2Label; |
131 | QAction *getMailButton; | 131 | QAction *getMailButton; |
132 | QAction *sendMailButton; | 132 | QAction *sendMailButton; |
133 | QAction *composeButton; | 133 | QAction *composeButton; |
134 | QAction *cancelButton; | 134 | QAction *cancelButton; |
135 | 135 | ||
136 | QMenuBar *mb; | 136 | QMenuBar *mb; |
137 | QPopupMenu *selectAccountMenu; | 137 | QPopupMenu *selectAccountMenu; |
138 | QPopupMenu *editAccountMenu; | 138 | QPopupMenu *editAccountMenu; |
139 | QPopupMenu *deleteAccountMenu; | 139 | QPopupMenu *deleteAccountMenu; |
140 | 140 | ||
141 | QTabWidget* mailboxView; | 141 | OTabWidget* mailboxView; |
142 | QListView* inboxView; | 142 | QListView* inboxView; |
143 | QListView* outboxView; | 143 | QListView* outboxView; |
144 | 144 | ||
145 | QGridLayout* grid_2; | 145 | QGridLayout* grid_2; |
146 | QGridLayout* grid_3; | 146 | QGridLayout* grid_3; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | #endif // EMAILCLIENT_H | 149 | #endif // EMAILCLIENT_H |
diff --git a/noncore/net/mailit/mailit.pro b/noncore/net/mailit/mailit.pro index d51126a..a404884 100644 --- a/noncore/net/mailit/mailit.pro +++ b/noncore/net/mailit/mailit.pro | |||
@@ -25,19 +25,19 @@ SOURCES = emailclient.cpp \ | |||
25 | readmail.cpp \ | 25 | readmail.cpp \ |
26 | smtpclient.cpp \ | 26 | smtpclient.cpp \ |
27 | writemail.cpp \ | 27 | writemail.cpp \ |
28 | textparser.cpp \ | 28 | textparser.cpp \ |
29 | viewatt.cpp \ | 29 | viewatt.cpp \ |
30 | addatt.cpp \ | 30 | addatt.cpp \ |
31 | editaccount.cpp \ | 31 | editaccount.cpp \ |
32 | maillist.cpp \ | 32 | maillist.cpp \ |
33 | addresslist.cpp | 33 | addresslist.cpp |
34 | 34 | ||
35 | INCLUDEPATH += $(OPIEDIR)/include | 35 | INCLUDEPATH += $(OPIEDIR)/include |
36 | DEPENDPATH += $(OPIEDIR)/include | 36 | DEPENDPATH += $(OPIEDIR)/include |
37 | LIBS += -lqpe | 37 | LIBS += -lqpe -lopie |
38 | # -lssl | 38 | # -lssl |
39 | MOC_DIR=qpeobj | 39 | MOC_DIR=qpeobj |
40 | OBJECTS_DIR=qpeobj | 40 | OBJECTS_DIR=qpeobj |
41 | DESTDIR=$(OPIEDIR)/bin | 41 | DESTDIR=$(OPIEDIR)/bin |
42 | 42 | ||
43 | include ( $(OPIEDIR)/include.pro ) | 43 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp index 4954f34..2011ecf 100644 --- a/noncore/net/mailit/readmail.cpp +++ b/noncore/net/mailit/readmail.cpp | |||
@@ -47,45 +47,45 @@ void ReadMail::init() | |||
47 | 47 | ||
48 | menu = new QMenuBar( bar ); | 48 | menu = new QMenuBar( bar ); |
49 | 49 | ||
50 | viewMenu = new QPopupMenu(menu); | 50 | viewMenu = new QPopupMenu(menu); |
51 | menu->insertItem( tr( "&View" ), viewMenu); | 51 | menu->insertItem( tr( "&View" ), viewMenu); |
52 | 52 | ||
53 | mailMenu = new QPopupMenu(menu); | 53 | mailMenu = new QPopupMenu(menu); |
54 | menu->insertItem( tr( "&Mail" ), mailMenu); | 54 | menu->insertItem( tr( "&Mail" ), mailMenu); |
55 | 55 | ||
56 | bar = new QToolBar(this); | 56 | bar = new QToolBar(this); |
57 | 57 | ||
58 | //reply dependant on viewing inbox | 58 | //reply dependant on viewing inbox |
59 | replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "pass" ), | 59 | replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ), |
60 | QString::null, 0, this, 0 ); | 60 | QString::null, 0, this, 0 ); |
61 | connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); | 61 | connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); |
62 | 62 | ||
63 | previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); | 63 | previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); |
64 | connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) ); | 64 | connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) ); |
65 | previousButton->addTo(bar); | 65 | previousButton->addTo(bar); |
66 | previousButton->addTo(viewMenu); | 66 | previousButton->addTo(viewMenu); |
67 | 67 | ||
68 | nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); | 68 | nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); |
69 | connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) ); | 69 | connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) ); |
70 | nextButton->addTo(bar); | 70 | nextButton->addTo(bar); |
71 | nextButton->addTo(viewMenu); | 71 | nextButton->addTo(viewMenu); |
72 | 72 | ||
73 | attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 73 | attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 ); |
74 | connect( attatchmentsButton, SIGNAL( activated() ), this, | 74 | connect( attatchmentsButton, SIGNAL( activated() ), this, |
75 | SLOT( viewAttatchments() ) ); | 75 | SLOT( viewAttatchments() ) ); |
76 | attatchmentsButton->addTo(bar); | 76 | attatchmentsButton->addTo(bar); |
77 | attatchmentsButton->addTo(viewMenu); | 77 | attatchmentsButton->addTo(viewMenu); |
78 | 78 | ||
79 | plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0, TRUE); | 79 | plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE); |
80 | connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) ); | 80 | connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) ); |
81 | plainTextButton->addTo(bar); | 81 | plainTextButton->addTo(bar); |
82 | plainTextButton->addTo(viewMenu); | 82 | plainTextButton->addTo(viewMenu); |
83 | 83 | ||
84 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); | 84 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); |
85 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); | 85 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); |
86 | deleteButton->addTo(bar); | 86 | deleteButton->addTo(bar); |
87 | deleteButton->addTo(mailMenu); | 87 | deleteButton->addTo(mailMenu); |
88 | 88 | ||
89 | viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); | 89 | viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); |
90 | 90 | ||
91 | emailView = new QTextView( this, "emailView" ); | 91 | emailView = new QTextView( this, "emailView" ); |
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 2e82623..fc4276b 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp | |||
@@ -149,58 +149,58 @@ void EmailClient::init() | |||
149 | getMailButton->addTo(mail); | 149 | getMailButton->addTo(mail); |
150 | 150 | ||
151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0); | 151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0); |
152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); | 152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); |
153 | sendMailButton->addTo(bar); | 153 | sendMailButton->addTo(bar); |
154 | sendMailButton->addTo(mail); | 154 | sendMailButton->addTo(mail); |
155 | 155 | ||
156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); | 156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); |
157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); | 157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); |
158 | composeButton->addTo(bar); | 158 | composeButton->addTo(bar); |
159 | composeButton->addTo(mail); | 159 | composeButton->addTo(mail); |
160 | 160 | ||
161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("reset"), QString::null, 0, this, 0); | 161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); |
162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); | 162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); |
163 | cancelButton->addTo(mail); | 163 | cancelButton->addTo(mail); |
164 | cancelButton->setEnabled(FALSE); | 164 | cancelButton->setEnabled(FALSE); |
165 | 165 | ||
166 | mailboxView = new QTabWidget( this, "mailboxView" ); | 166 | mailboxView = new OTabWidget( this, "mailboxView" ); |
167 | 167 | ||
168 | QWidget* widget = new QWidget( mailboxView, "widget" ); | 168 | QWidget* widget = new QWidget( mailboxView, "widget" ); |
169 | grid_2 = new QGridLayout( widget ); | 169 | grid_2 = new QGridLayout( widget ); |
170 | // grid_2->setSpacing(6); | 170 | // grid_2->setSpacing(6); |
171 | // grid_2->setMargin( 11 ); | 171 | // grid_2->setMargin( 11 ); |
172 | 172 | ||
173 | inboxView = new QListView( widget, "inboxView" ); | 173 | inboxView = new QListView( widget, "inboxView" ); |
174 | inboxView->addColumn( tr( "From" ) ); | 174 | inboxView->addColumn( tr( "From" ) ); |
175 | inboxView->addColumn( tr( "Subject" ) ); | 175 | inboxView->addColumn( tr( "Subject" ) ); |
176 | inboxView->addColumn( tr( "Date" ) ); | 176 | inboxView->addColumn( tr( "Date" ) ); |
177 | inboxView->setMinimumSize( QSize( 0, 0 ) ); | 177 | inboxView->setMinimumSize( QSize( 0, 0 ) ); |
178 | inboxView->setAllColumnsShowFocus(TRUE); | 178 | inboxView->setAllColumnsShowFocus(TRUE); |
179 | 179 | ||
180 | grid_2->addWidget( inboxView, 2, 0 ); | 180 | grid_2->addWidget( inboxView, 2, 0 ); |
181 | mailboxView->insertTab( widget, tr( "Inbox" ) ); | 181 | mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) ); |
182 | 182 | ||
183 | QWidget* widget_2 = new QWidget( mailboxView, "widget_2" ); | 183 | QWidget* widget_2 = new QWidget( mailboxView, "widget_2" ); |
184 | grid_3 = new QGridLayout( widget_2 ); | 184 | grid_3 = new QGridLayout( widget_2 ); |
185 | // grid_3->setSpacing(6); | 185 | // grid_3->setSpacing(6); |
186 | // grid_3->setMargin( 11 ); | 186 | // grid_3->setMargin( 11 ); |
187 | 187 | ||
188 | outboxView = new QListView( widget_2, "outboxView" ); | 188 | outboxView = new QListView( widget_2, "outboxView" ); |
189 | outboxView->addColumn( tr( "To" ) ); | 189 | outboxView->addColumn( tr( "To" ) ); |
190 | outboxView->addColumn( tr( "Subject" ) ); | 190 | outboxView->addColumn( tr( "Subject" ) ); |
191 | outboxView->setAllColumnsShowFocus(TRUE); | 191 | outboxView->setAllColumnsShowFocus(TRUE); |
192 | 192 | ||
193 | grid_3->addWidget( outboxView, 0, 0 ); | 193 | grid_3->addWidget( outboxView, 0, 0 ); |
194 | mailboxView->insertTab( widget_2, tr( "Outbox" ) ); | 194 | mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); |
195 | 195 | ||
196 | setCentralWidget(mailboxView); | 196 | setCentralWidget(mailboxView); |
197 | } | 197 | } |
198 | 198 | ||
199 | void EmailClient::compose() | 199 | void EmailClient::compose() |
200 | { | 200 | { |
201 | emit composeRequested(); | 201 | emit composeRequested(); |
202 | } | 202 | } |
203 | 203 | ||
204 | void EmailClient::cancel() | 204 | void EmailClient::cancel() |
205 | { | 205 | { |
206 | emailHandler->cancel(); | 206 | emailHandler->cancel(); |
diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h index 135bfaa..80457f9 100644 --- a/noncore/unsupported/mailit/emailclient.h +++ b/noncore/unsupported/mailit/emailclient.h | |||
@@ -20,35 +20,35 @@ | |||
20 | #ifndef EMAILCLIENT_H | 20 | #ifndef EMAILCLIENT_H |
21 | #define EMAILCLIENT_H | 21 | #define EMAILCLIENT_H |
22 | 22 | ||
23 | #include <qlist.h> | 23 | #include <qlist.h> |
24 | #include <qcstring.h> | 24 | #include <qcstring.h> |
25 | #include <qmainwindow.h> | 25 | #include <qmainwindow.h> |
26 | 26 | ||
27 | #include <qtoolbar.h> | 27 | #include <qtoolbar.h> |
28 | #include <qcheckbox.h> | 28 | #include <qcheckbox.h> |
29 | #include <qlabel.h> | 29 | #include <qlabel.h> |
30 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
31 | #include <qlistview.h> | 31 | #include <qlistview.h> |
32 | #include <qtabwidget.h> | ||
33 | #include <qaction.h> | 32 | #include <qaction.h> |
34 | #include <qlayout.h> | 33 | #include <qlayout.h> |
35 | #include <qtooltip.h> | 34 | #include <qtooltip.h> |
36 | #include <qimage.h> | 35 | #include <qimage.h> |
37 | #include <qpixmap.h> | 36 | #include <qpixmap.h> |
38 | #include <qstringlist.h> | 37 | #include <qstringlist.h> |
39 | #include <qprogressbar.h> | 38 | #include <qprogressbar.h> |
40 | #include <qstatusbar.h> | 39 | #include <qstatusbar.h> |
41 | #include <qdir.h> | 40 | #include <qdir.h> |
42 | #include <stdlib.h> | 41 | #include <stdlib.h> |
42 | #include <opie/otabwidget.h> | ||
43 | 43 | ||
44 | #include "emailhandler.h" | 44 | #include "emailhandler.h" |
45 | #include "emaillistitem.h" | 45 | #include "emaillistitem.h" |
46 | #include "textparser.h" | 46 | #include "textparser.h" |
47 | #include "editaccount.h" | 47 | #include "editaccount.h" |
48 | #include "maillist.h" | 48 | #include "maillist.h" |
49 | #include "addresslist.h" | 49 | #include "addresslist.h" |
50 | 50 | ||
51 | #include <qpe/config.h> | 51 | #include <qpe/config.h> |
52 | 52 | ||
53 | class AccountList : public QList<MailAccount> | 53 | class AccountList : public QList<MailAccount> |
54 | { | 54 | { |
@@ -129,21 +129,21 @@ private: | |||
129 | QStatusBar *statusBar; | 129 | QStatusBar *statusBar; |
130 | QLabel *status1Label, *status2Label; | 130 | QLabel *status1Label, *status2Label; |
131 | QAction *getMailButton; | 131 | QAction *getMailButton; |
132 | QAction *sendMailButton; | 132 | QAction *sendMailButton; |
133 | QAction *composeButton; | 133 | QAction *composeButton; |
134 | QAction *cancelButton; | 134 | QAction *cancelButton; |
135 | 135 | ||
136 | QMenuBar *mb; | 136 | QMenuBar *mb; |
137 | QPopupMenu *selectAccountMenu; | 137 | QPopupMenu *selectAccountMenu; |
138 | QPopupMenu *editAccountMenu; | 138 | QPopupMenu *editAccountMenu; |
139 | QPopupMenu *deleteAccountMenu; | 139 | QPopupMenu *deleteAccountMenu; |
140 | 140 | ||
141 | QTabWidget* mailboxView; | 141 | OTabWidget* mailboxView; |
142 | QListView* inboxView; | 142 | QListView* inboxView; |
143 | QListView* outboxView; | 143 | QListView* outboxView; |
144 | 144 | ||
145 | QGridLayout* grid_2; | 145 | QGridLayout* grid_2; |
146 | QGridLayout* grid_3; | 146 | QGridLayout* grid_3; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | #endif // EMAILCLIENT_H | 149 | #endif // EMAILCLIENT_H |
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro index d51126a..a404884 100644 --- a/noncore/unsupported/mailit/mailit.pro +++ b/noncore/unsupported/mailit/mailit.pro | |||
@@ -25,19 +25,19 @@ SOURCES = emailclient.cpp \ | |||
25 | readmail.cpp \ | 25 | readmail.cpp \ |
26 | smtpclient.cpp \ | 26 | smtpclient.cpp \ |
27 | writemail.cpp \ | 27 | writemail.cpp \ |
28 | textparser.cpp \ | 28 | textparser.cpp \ |
29 | viewatt.cpp \ | 29 | viewatt.cpp \ |
30 | addatt.cpp \ | 30 | addatt.cpp \ |
31 | editaccount.cpp \ | 31 | editaccount.cpp \ |
32 | maillist.cpp \ | 32 | maillist.cpp \ |
33 | addresslist.cpp | 33 | addresslist.cpp |
34 | 34 | ||
35 | INCLUDEPATH += $(OPIEDIR)/include | 35 | INCLUDEPATH += $(OPIEDIR)/include |
36 | DEPENDPATH += $(OPIEDIR)/include | 36 | DEPENDPATH += $(OPIEDIR)/include |
37 | LIBS += -lqpe | 37 | LIBS += -lqpe -lopie |
38 | # -lssl | 38 | # -lssl |
39 | MOC_DIR=qpeobj | 39 | MOC_DIR=qpeobj |
40 | OBJECTS_DIR=qpeobj | 40 | OBJECTS_DIR=qpeobj |
41 | DESTDIR=$(OPIEDIR)/bin | 41 | DESTDIR=$(OPIEDIR)/bin |
42 | 42 | ||
43 | include ( $(OPIEDIR)/include.pro ) | 43 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp index 4954f34..2011ecf 100644 --- a/noncore/unsupported/mailit/readmail.cpp +++ b/noncore/unsupported/mailit/readmail.cpp | |||
@@ -47,45 +47,45 @@ void ReadMail::init() | |||
47 | 47 | ||
48 | menu = new QMenuBar( bar ); | 48 | menu = new QMenuBar( bar ); |
49 | 49 | ||
50 | viewMenu = new QPopupMenu(menu); | 50 | viewMenu = new QPopupMenu(menu); |
51 | menu->insertItem( tr( "&View" ), viewMenu); | 51 | menu->insertItem( tr( "&View" ), viewMenu); |
52 | 52 | ||
53 | mailMenu = new QPopupMenu(menu); | 53 | mailMenu = new QPopupMenu(menu); |
54 | menu->insertItem( tr( "&Mail" ), mailMenu); | 54 | menu->insertItem( tr( "&Mail" ), mailMenu); |
55 | 55 | ||
56 | bar = new QToolBar(this); | 56 | bar = new QToolBar(this); |
57 | 57 | ||
58 | //reply dependant on viewing inbox | 58 | //reply dependant on viewing inbox |
59 | replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "pass" ), | 59 | replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ), |
60 | QString::null, 0, this, 0 ); | 60 | QString::null, 0, this, 0 ); |
61 | connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); | 61 | connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); |
62 | 62 | ||
63 | previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); | 63 | previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); |
64 | connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) ); | 64 | connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) ); |
65 | previousButton->addTo(bar); | 65 | previousButton->addTo(bar); |
66 | previousButton->addTo(viewMenu); | 66 | previousButton->addTo(viewMenu); |
67 | 67 | ||
68 | nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); | 68 | nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); |
69 | connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) ); | 69 | connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) ); |
70 | nextButton->addTo(bar); | 70 | nextButton->addTo(bar); |
71 | nextButton->addTo(viewMenu); | 71 | nextButton->addTo(viewMenu); |
72 | 72 | ||
73 | attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 73 | attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 ); |
74 | connect( attatchmentsButton, SIGNAL( activated() ), this, | 74 | connect( attatchmentsButton, SIGNAL( activated() ), this, |
75 | SLOT( viewAttatchments() ) ); | 75 | SLOT( viewAttatchments() ) ); |
76 | attatchmentsButton->addTo(bar); | 76 | attatchmentsButton->addTo(bar); |
77 | attatchmentsButton->addTo(viewMenu); | 77 | attatchmentsButton->addTo(viewMenu); |
78 | 78 | ||
79 | plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0, TRUE); | 79 | plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE); |
80 | connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) ); | 80 | connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) ); |
81 | plainTextButton->addTo(bar); | 81 | plainTextButton->addTo(bar); |
82 | plainTextButton->addTo(viewMenu); | 82 | plainTextButton->addTo(viewMenu); |
83 | 83 | ||
84 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); | 84 | deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); |
85 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); | 85 | connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); |
86 | deleteButton->addTo(bar); | 86 | deleteButton->addTo(bar); |
87 | deleteButton->addTo(mailMenu); | 87 | deleteButton->addTo(mailMenu); |
88 | 88 | ||
89 | viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); | 89 | viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); |
90 | 90 | ||
91 | emailView = new QTextView( this, "emailView" ); | 91 | emailView = new QTextView( this, "emailView" ); |