Better look, crystal icons and path corrections

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
@@ -157,14 +157,14 @@ void EmailClient::init()
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   
-  cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("reset"), QString::null, 0, this, 0);
+  cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->setEnabled(FALSE);
   
-  mailboxView = new QTabWidget( this, "mailboxView" );
+  mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
@@ -177,9 +177,9 @@ void EmailClient::init()
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
-  mailboxView->insertTab( widget, tr( "Inbox" ) );
+  mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
@@ -190,9 +190,9 @@ void EmailClient::init()
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
-  mailboxView->insertTab( widget_2, tr( "Outbox" ) );
+  mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
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
@@ -28,9 +28,8 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlistview.h>
-#include <qtabwidget.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qimage.h>
@@ -39,8 +38,9 @@
 #include <qprogressbar.h>
 #include <qstatusbar.h>
 #include <qdir.h>
 #include <stdlib.h>
+#include <opie/otabwidget.h>
 
 #include "emailhandler.h"
 #include "emaillistitem.h"
 #include "textparser.h"
@@ -137,9 +137,9 @@ private:
   QPopupMenu *selectAccountMenu;
   QPopupMenu *editAccountMenu;
   QPopupMenu *deleteAccountMenu;
 
-  QTabWidget* mailboxView;
+  OTabWidget* mailboxView;
   QListView* inboxView;
   QListView* outboxView;
 
   QGridLayout* grid_2;
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
@@ -33,9 +33,9 @@ SOURCES   = emailclient.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 # -lssl
 MOC_DIR=qpeobj
 OBJECTS_DIR=qpeobj
 DESTDIR=$(OPIEDIR)/bin
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
@@ -55,9 +55,9 @@ void ReadMail::init()
 
 	bar = new QToolBar(this);
 	
     	//reply dependant on viewing inbox
-	replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "pass" ),
+	replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
 		QString::null, 0, this, 0 );
 	connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
 
 	previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
@@ -69,15 +69,15 @@ void ReadMail::init()
 	connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) );
 	nextButton->addTo(bar);
 	nextButton->addTo(viewMenu);
 
-	attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
+	attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
 	connect( attatchmentsButton, SIGNAL( activated() ), this,
 		SLOT( viewAttatchments() ) );
 	attatchmentsButton->addTo(bar);
 	attatchmentsButton->addTo(viewMenu);
 	
-	plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0, TRUE);
+	plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE);
 	connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) );
 	plainTextButton->addTo(bar);
 	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
@@ -157,14 +157,14 @@ void EmailClient::init()
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   
-  cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("reset"), QString::null, 0, this, 0);
+  cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->setEnabled(FALSE);
   
-  mailboxView = new QTabWidget( this, "mailboxView" );
+  mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
@@ -177,9 +177,9 @@ void EmailClient::init()
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
-  mailboxView->insertTab( widget, tr( "Inbox" ) );
+  mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
@@ -190,9 +190,9 @@ void EmailClient::init()
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
-  mailboxView->insertTab( widget_2, tr( "Outbox" ) );
+  mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
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
@@ -28,9 +28,8 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlistview.h>
-#include <qtabwidget.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qimage.h>
@@ -39,8 +38,9 @@
 #include <qprogressbar.h>
 #include <qstatusbar.h>
 #include <qdir.h>
 #include <stdlib.h>
+#include <opie/otabwidget.h>
 
 #include "emailhandler.h"
 #include "emaillistitem.h"
 #include "textparser.h"
@@ -137,9 +137,9 @@ private:
   QPopupMenu *selectAccountMenu;
   QPopupMenu *editAccountMenu;
   QPopupMenu *deleteAccountMenu;
 
-  QTabWidget* mailboxView;
+  OTabWidget* mailboxView;
   QListView* inboxView;
   QListView* outboxView;
 
   QGridLayout* grid_2;
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
@@ -33,9 +33,9 @@ SOURCES   = emailclient.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 # -lssl
 MOC_DIR=qpeobj
 OBJECTS_DIR=qpeobj
 DESTDIR=$(OPIEDIR)/bin
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
@@ -55,9 +55,9 @@ void ReadMail::init()
 
 	bar = new QToolBar(this);
 	
     	//reply dependant on viewing inbox
-	replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "pass" ),
+	replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
 		QString::null, 0, this, 0 );
 	connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
 
 	previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
@@ -69,15 +69,15 @@ void ReadMail::init()
 	connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) );
 	nextButton->addTo(bar);
 	nextButton->addTo(viewMenu);
 
-	attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
+	attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
 	connect( attatchmentsButton, SIGNAL( activated() ), this,
 		SLOT( viewAttatchments() ) );
 	attatchmentsButton->addTo(bar);
 	attatchmentsButton->addTo(viewMenu);
 	
-	plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0, TRUE);
+	plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE);
 	connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) );
 	plainTextButton->addTo(bar);
 	plainTextButton->addTo(viewMenu);