pics/mail is the picture folder for the new mailer

3 files changed, 18 insertions, 18 deletions

diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index c849f1a..9036658 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -1,40 +1,40 @@
 #ifndef DEFINE_CONSTANTS_H
 #define DEFINE_CONSTANTS_H
 
 #include <qpe/resource.h>
 
-#define USER_AGENT          "OpieMail v0.0.1-alpha"
+#define USER_AGENT          "OpieMail v0.1"
 
-#define PIC_COMPOSEMAIL     "opiemail/composemail"
-#define PIC_SENDQUEUED      "opiemail/sendqueued"
-#define PIC_SHOWFOLDERS     "opiemail/showfolders"
-#define PIC_SEARCHMAILS     "opiemail/searchmails"
-#define PIC_EDITSETTINGS    "opiemail/editsettings"
-#define PIC_EDITACCOUNTS    "opiemail/editaccounts"
-#define PIC_SYNC            "opiemail/sync"
-#define PIC_IMAPFOLDER      "opiemail/imapfolder"
-#define PIC_POP3FOLDER      "opiemail/pop3folder"
-#define PIC_INBOXFOLDER     "opiemail/inbox"
+#define PIC_COMPOSEMAIL     "mail/composemail"
+#define PIC_SENDQUEUED      "mail/sendqueued"
+#define PIC_SHOWFOLDERS     "mail/showfolders"
+#define PIC_SEARCHMAILS     "mail/searchmails"
+#define PIC_EDITSETTINGS    "mail/editsettings"
+#define PIC_EDITACCOUNTS    "mail/editaccounts"
+#define PIC_SYNC            "mail/sync"
+#define PIC_IMAPFOLDER      "mail/imapfolder"
+#define PIC_POP3FOLDER      "mail/pop3folder"
+#define PIC_INBOXFOLDER     "mail/inbox"
 
 #define ICON_COMPOSEMAIL    QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) 
 #define ICON_SENDQUEUED     QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) 
 #define ICON_SHOWFOLDERS    QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) 
 #define ICON_SEARCHMAILS    QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) 
 #define ICON_EDITSETTINGS   QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) 
 #define ICON_EDITACCOUNTS   QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) 
 #define ICON_SYNC           QIconSet( Resource::loadPixmap( PIC_SYNC ) ) 
 
 #define PIXMAP_IMAPFOLDER   QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) )
 #define PIXMAP_POP3FOLDER   QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) )
 #define PIXMAP_INBOXFOLDER  QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) )
 
 #define IMAP_PORT           "143"
 #define IMAP_SSL_PORT       "993"
 #define SMTP_PORT           "25"
 #define SMTP_SSL_PORT       "465"
 #define POP3_PORT           "110"
 #define POP3_SSL_PORT       "995"
 #define NNTP_PORT           "119"
 #define NNTP_SSL_PORT       "563"
 
 #endif
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 8e2132e..89530ab 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -83,142 +83,142 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->setRootIsDecorated( true );
     folderView->addColumn( tr( "Mailbox" ) );
     //folderView->hide();
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
     mailView->addColumn( tr( "" ) );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
     mailView->setSorting(-1);
 
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 
     connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this,
              SLOT( displayMail( QListViewItem * ) ) );
 
     connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
 
 }
 
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
   delete d;
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 );
     mailView->setColumnWidth( 2, 80 );
     mailView->setColumnWidth( 3, 50 );
 }
 
 void MainWindow::slotShowFolders( bool show )
 {
    qDebug( "Show Folders" );
     if ( show && folderView->isHidden() ) {
         qDebug( "-> showing" );
         folderView->show();
     } else if ( !show && !folderView->isHidden() ) {
         qDebug( "-> hiding" );
         folderView->hide();
     }
 }
 
 void MainWindow::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
     for (unsigned int i = 0; i < list->count();++i) {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
     }
 }
 void MainWindow::displayMail(QListViewItem*item)
 {
 
     if (!item) return;
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
 
     if (  readMail.deleted ) {
          folderView->refreshCurrent();
     } else {
-        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
     }
 }
 
 void MainWindow::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
        mail.Wrapper()->deleteMail( mail );
        folderView->refreshCurrent();
     }
 }
 
 
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     if ( mail_data.getFlags().testBit( FLAG_ANSWERED ) == true) {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgreplied") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgreplied") );
     } else if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true )  {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
     } else  {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgnew") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgnew") );
     }
     setText(1,mail_data.getSubject());
     setText(2,mail_data.getFrom());
     setText(3,mail_data.getDate());
 }
 
 void MailListViewItem::storeData(const RecMail&data)
 {
     mail_data = data;
 }
 
 const RecMail& MailListViewItem::data()const
 {
     return mail_data;
 }
 
 
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control
index 2ea860e..c1a4312 100644
--- a/noncore/net/mail/opie-mail.control
+++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
 Package: opie-mail
-Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png plugins/application/libopiemail.so*
+Files: bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png plugins/application/libopiemail.so*
 Priority: optional
 Section: opie/applications
-Maintainer: Juergen Graf <jgf@handhelds.org>
+Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: 0.0.1-$SUB_VERSION
+Version: 0.1-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Opie's mail and news client (POP3, IMAP and NNTP)
 License: LGPL