6 files changed, 4 insertions, 86 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 7ba5c75..2e82623 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -82,134 +82,134 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
   
   mailconf->write();
   delete mailconf;
   
 }
 
 void EmailClient::init()
 {
   statusBar = new QStatusBar(this);
   statusBar->setSizeGripEnabled(FALSE);
   
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   
   progressBar = new QProgressBar(statusBar);
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
   
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
-  getMailButton = new QAction(tr("Get all mail"), QPixmap("getmail.xpm"), QString::null, 0, this, 0);
+  getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0);
   connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) );
   getMailButton->addTo(bar);
   getMailButton->addTo(mail);
   
-  sendMailButton = new QAction(tr("Send mail"), QPixmap("sendmail.xpm"), QString::null, 0, this, 0);
+  sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
     
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   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);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->setEnabled(FALSE);
   
   mailboxView = new QTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->insertTab( widget, tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->insertTab( widget_2, tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
diff --git a/noncore/net/mailit/getmail.xpm b/noncore/net/mailit/getmail.xpm
deleted file mode 100644
index d294656..0000000
--- a/noncore/net/mailit/getmail.xpm
+++ b/dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char*getmail[]={
-"16 13 5 1",
-"# c #040404",
-"a c #c3c3c3",
-"c c #000000",
-". c None",
-"b c #ffffff",
-".........###....",
-"........#...#.#.",
-".............##.",
-"............###.",
-"................",
-"..............aa",
-".bbbbbbbbbbbbbba",
-".bbbcbbcbbbcccba",
-".bbcbccbbbbcbcba",
-".bbbbbbbbbbcccba",
-".bbcbcccbbbbbbba",
-".bbbcbbbbbbbbbba",
-".bbbbbbbbbbbbbba"};
diff --git a/noncore/net/mailit/sendmail.xpm b/noncore/net/mailit/sendmail.xpm
deleted file mode 100644
index 2803793..0000000
--- a/noncore/net/mailit/sendmail.xpm
+++ b/dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char*sendmail[]={
-"16 13 4 1",
-"a c #c3c3c3",
-"# c #000000",
-". c None",
-"b c #ffffff",
-".....#####aaa...",
-"....####aaaaa.a.",
-"....#.###...aaa.",
-"....#..###..aaa.",
-".......###......",
-"..............aa",
-".bbbbbbbbbbbbbba",
-".bbb#bb#bbb###ba",
-".bb#b##bbbb#b#ba",
-".bbbbbbbbbb###ba",
-".bb#b###bbbbbbba",
-".bbb#bbbbbbbbbba",
-".bbbbbbbbbbbbbba"};
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 7ba5c75..2e82623 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -82,134 +82,134 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
   
   mailconf->write();
   delete mailconf;
   
 }
 
 void EmailClient::init()
 {
   statusBar = new QStatusBar(this);
   statusBar->setSizeGripEnabled(FALSE);
   
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   
   progressBar = new QProgressBar(statusBar);
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
   
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
-  getMailButton = new QAction(tr("Get all mail"), QPixmap("getmail.xpm"), QString::null, 0, this, 0);
+  getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0);
   connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) );
   getMailButton->addTo(bar);
   getMailButton->addTo(mail);
   
-  sendMailButton = new QAction(tr("Send mail"), QPixmap("sendmail.xpm"), QString::null, 0, this, 0);
+  sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
     
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   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);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->setEnabled(FALSE);
   
   mailboxView = new QTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->insertTab( widget, tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->insertTab( widget_2, tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
diff --git a/noncore/unsupported/mailit/getmail.xpm b/noncore/unsupported/mailit/getmail.xpm
deleted file mode 100644
index d294656..0000000
--- a/noncore/unsupported/mailit/getmail.xpm
+++ b/dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char*getmail[]={
-"16 13 5 1",
-"# c #040404",
-"a c #c3c3c3",
-"c c #000000",
-". c None",
-"b c #ffffff",
-".........###....",
-"........#...#.#.",
-".............##.",
-"............###.",
-"................",
-"..............aa",
-".bbbbbbbbbbbbbba",
-".bbbcbbcbbbcccba",
-".bbcbccbbbbcbcba",
-".bbbbbbbbbbcccba",
-".bbcbcccbbbbbbba",
-".bbbcbbbbbbbbbba",
-".bbbbbbbbbbbbbba"};
diff --git a/noncore/unsupported/mailit/sendmail.xpm b/noncore/unsupported/mailit/sendmail.xpm
deleted file mode 100644
index 2803793..0000000
--- a/noncore/unsupported/mailit/sendmail.xpm
+++ b/dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char*sendmail[]={
-"16 13 4 1",
-"a c #c3c3c3",
-"# c #000000",
-". c None",
-"b c #ffffff",
-".....#####aaa...",
-"....####aaaaa.a.",
-"....#.###...aaa.",
-"....#..###..aaa.",
-".......###......",
-"..............aa",
-".bbbbbbbbbbbbbba",
-".bbb#bb#bbb###ba",
-".bb#b##bbbb#b#ba",
-".bbbbbbbbbb###ba",
-".bb#b###bbbbbbba",
-".bbb#bbbbbbbbbba",
-".bbbbbbbbbbbbbba"};