summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mailit/emailclient.cpp8
-rw-r--r--noncore/net/mailit/emailclient.h4
-rw-r--r--noncore/net/mailit/mailit.pro2
-rw-r--r--noncore/net/mailit/readmail.cpp6
-rw-r--r--noncore/unsupported/mailit/emailclient.cpp8
-rw-r--r--noncore/unsupported/mailit/emailclient.h4
-rw-r--r--noncore/unsupported/mailit/mailit.pro2
-rw-r--r--noncore/unsupported/mailit/readmail.cpp6
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
@@ -158,12 +158,12 @@ void EmailClient::init()
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 );
@@ -178,7 +178,7 @@ void EmailClient::init()
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 );
@@ -191,7 +191,7 @@ void EmailClient::init()
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}
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
@@ -29,7 +29,6 @@
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>
@@ -40,6 +39,7 @@
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"
@@ -138,7 +138,7 @@ private:
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
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
@@ -34,7 +34,7 @@ SOURCES = emailclient.cpp \
34 34
35INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
36DEPENDPATH += $(OPIEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
37LIBS += -lqpe 37LIBS += -lqpe -lopie
38# -lssl 38# -lssl
39MOC_DIR=qpeobj 39MOC_DIR=qpeobj
40OBJECTS_DIR=qpeobj 40OBJECTS_DIR=qpeobj
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
@@ -56,7 +56,7 @@ void ReadMail::init()
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
@@ -70,13 +70,13 @@ void ReadMail::init()
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);
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
@@ -158,12 +158,12 @@ void EmailClient::init()
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 );
@@ -178,7 +178,7 @@ void EmailClient::init()
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 );
@@ -191,7 +191,7 @@ void EmailClient::init()
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}
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
@@ -29,7 +29,6 @@
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>
@@ -40,6 +39,7 @@
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"
@@ -138,7 +138,7 @@ private:
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
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
@@ -34,7 +34,7 @@ SOURCES = emailclient.cpp \
34 34
35INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
36DEPENDPATH += $(OPIEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
37LIBS += -lqpe 37LIBS += -lqpe -lopie
38# -lssl 38# -lssl
39MOC_DIR=qpeobj 39MOC_DIR=qpeobj
40OBJECTS_DIR=qpeobj 40OBJECTS_DIR=qpeobj
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
@@ -56,7 +56,7 @@ void ReadMail::init()
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
@@ -70,13 +70,13 @@ void ReadMail::init()
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);