summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountitem.cpp309
-rw-r--r--noncore/net/mail/accountview.cpp48
-rw-r--r--noncore/net/mail/addresspicker.cpp120
-rw-r--r--noncore/net/mail/editaccounts.cpp183
-rw-r--r--noncore/net/mail/opiemail.cpp113
-rw-r--r--noncore/net/mail/viewmail.cpp513
-rw-r--r--noncore/net/opieirc/ircservereditor.cpp10
-rw-r--r--noncore/net/opieirc/ircserverlist.cpp76
-rw-r--r--noncore/net/opieirc/ircsettings.cpp22
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.cc41
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp261
-rw-r--r--noncore/net/opietooth/manager/obexpopup.cpp22
-rw-r--r--noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp51
-rw-r--r--noncore/net/opietooth/manager/rfcpopup.cpp49
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp5
15 files changed, 1100 insertions, 723 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 2d3cd4b..c8f6ec4 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -1,12 +1,18 @@
+
#include "accountitem.h"
#include "accountview.h"
-#include <qpopupmenu.h>
-#include <qmessagebox.h>
#include "selectstore.h"
#include "newmaildir.h"
+#include "defines.h"
+
+/* OPIE */
#include <libmailwrapper/mailtypes.h>
#include <libmailwrapper/abstractmail.h>
#include <libmailwrapper/mailwrapper.h>
-#include "defines.h"
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qpopupmenu.h>
+#include <qmessagebox.h>
#define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
@@ -15,5 +21,5 @@
*/
POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent )
- : AccountViewItem( parent )
+ : AccountViewItem( parent )
{
account = a;
@@ -21,7 +27,10 @@ POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent )
SETPIX(PIXMAP_POP3FOLDER);
#if 0
- if (!account->getOffline()) {
+ if (!account->getOffline())
+ {
setPixmap( 0, );
- } else {
+ }
+ else
+ {
setPixmap( 0, PIXMAP_OFFLINE );
}
@@ -51,5 +60,6 @@ void POP3viewItem::refresh()
QList<Folder> *folders = wrapper->listFolders();
QListViewItem *child = firstChild();
- while ( child ) {
+ while ( child )
+ {
QListViewItem *tmp = child;
child = child->nextSibling();
@@ -58,5 +68,6 @@ void POP3viewItem::refresh()
Folder *it;
QListViewItem*item = 0;
- for ( it = folders->first(); it; it = folders->next() ) {
+ for ( it = folders->first(); it; it = folders->next() )
+ {
item = new POP3folderItem( it, this , item );
item->setSelectable(it->may_select());
@@ -76,9 +87,13 @@ QPopupMenu * POP3viewItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
- if (!account->getOffline()) {
+ if (m)
+ {
+ if (!account->getOffline())
+ {
m->insertItem(QObject::tr("Disconnect",contextName),0);
m->insertItem(QObject::tr("Set offline",contextName),1);
- } else {
+ }
+ else
+ {
m->insertItem(QObject::tr("Set online",contextName),1);
}
@@ -90,5 +105,6 @@ void POP3viewItem::disconnect()
{
QListViewItem *child = firstChild();
- while ( child ) {
+ while ( child )
+ {
QListViewItem *tmp = child;
child = child->nextSibling();
@@ -100,5 +116,6 @@ void POP3viewItem::disconnect()
void POP3viewItem::setOnOffline()
{
- if (!account->getOffline()) {
+ if (!account->getOffline())
+ {
disconnect();
}
@@ -111,5 +128,6 @@ void POP3viewItem::setOnOffline()
void POP3viewItem::contextMenuSelected(int which)
{
- switch (which) {
+ switch (which)
+ {
case 0:
disconnect();
@@ -122,15 +140,17 @@ void POP3viewItem::contextMenuSelected(int which)
POP3folderItem::~POP3folderItem()
-{
-}
+{}
POP3folderItem::POP3folderItem( Folder *folderInit, POP3viewItem *parent , QListViewItem*after )
- : AccountViewItem( parent,after )
+ : AccountViewItem( parent,after )
{
folder = folderInit;
pop3 = parent;
- if (folder->getDisplayName().lower()!="inbox") {
+ if (folder->getDisplayName().lower()!="inbox")
+ {
setPixmap( 0, PIXMAP_POP3FOLDER );
- } else {
+ }
+ else
+ {
setPixmap( 0, PIXMAP_INBOXFOLDER);
}
@@ -152,5 +172,6 @@ QPopupMenu * POP3folderItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
+ if (m)
+ {
m->insertItem(QObject::tr("Refresh header list",contextName),0);
m->insertItem(QObject::tr("Delete all mails",contextName),1);
@@ -170,5 +191,6 @@ void POP3folderItem::contextMenuSelected(int which)
{
AccountView * view = (AccountView*)listView();
- switch (which) {
+ switch (which)
+ {
case 0:
/* must be 'cause pop3 lists are cached */
@@ -191,5 +213,5 @@ void POP3folderItem::contextMenuSelected(int which)
*/
IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent )
- : AccountViewItem( parent )
+ : AccountViewItem( parent )
{
account = a;
@@ -223,5 +245,5 @@ void IMAPviewItem::refreshFolders(bool force)
{
if (childCount()>0 && force==false) return;
- if (account->getOffline()) return;
+ if (account->getOffline()) return;
removeChilds();
@@ -237,6 +259,8 @@ void IMAPviewItem::refreshFolders(bool force)
folders->setAutoDelete(false);
- for ( it = folders->first(); it; it = folders->next() ) {
- if (it->getDisplayName().lower()=="inbox") {
+ for ( it = folders->first(); it; it = folders->next() )
+ {
+ if (it->getDisplayName().lower()=="inbox")
+ {
item = new IMAPfolderItem( it, this , item );
folders->remove(it);
@@ -245,13 +269,16 @@ void IMAPviewItem::refreshFolders(bool force)
}
}
- for ( it = folders->first(); it; it = folders->next() ) {
+ for ( it = folders->first(); it; it = folders->next() )
+ {
fname = it->getDisplayName();
currentFolders.append(it->getName());
pos = fname.findRev(it->Separator());
- if (pos != -1) {
+ if (pos != -1)
+ {
fname = fname.left(pos);
}
IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
- if (pitem) {
+ if (pitem)
+ {
titem = item;
item = new IMAPfolderItem(it,pitem,pitem->firstChild(),this);
@@ -259,5 +286,7 @@ void IMAPviewItem::refreshFolders(bool force)
item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1));
item = titem;
- } else {
+ }
+ else
+ {
item = new IMAPfolderItem( it, this , item );
}
@@ -269,6 +298,8 @@ QPopupMenu * IMAPviewItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
- if (!account->getOffline()) {
+ if (m)
+ {
+ if (!account->getOffline())
+ {
m->insertItem(QObject::tr("Refresh folder list",contextName),0);
m->insertItem(QObject::tr("Create new folder",contextName),1);
@@ -276,5 +307,7 @@ QPopupMenu * IMAPviewItem::getContextMenu()
m->insertItem(QObject::tr("Disconnect",contextName),2);
m->insertItem(QObject::tr("Set offline",contextName),3);
- } else {
+ }
+ else
+ {
m->insertItem(QObject::tr("Set online",contextName),3);
}
@@ -286,14 +319,16 @@ void IMAPviewItem::createNewFolder()
{
Newmdirdlg ndirdlg;
- ndirdlg.showMaximized();
- if (ndirdlg.exec()) {
+ if ( QPEApplication::execDialog( &ndirdlg ))
+ {
QString ndir = ndirdlg.Newdir();
bool makesubs = ndirdlg.subpossible();
QString delemiter = "/";
IMAPfolderItem*item = (IMAPfolderItem*)firstChild();
- if (item) {
+ if (item)
+ {
delemiter = item->Delemiter();
}
- if (wrapper->createMbox(ndir,0,delemiter,makesubs)) {
+ if (wrapper->createMbox(ndir,0,delemiter,makesubs))
+ {
refreshFolders(true);
}
@@ -304,5 +339,6 @@ void IMAPviewItem::contextMenuSelected(int id)
{
qDebug("Id selected: %i",id);
- switch (id) {
+ switch (id)
+ {
case 0:
refreshFolders(true);
@@ -316,5 +352,6 @@ void IMAPviewItem::contextMenuSelected(int id)
break;
case 3:
- if (account->getOffline()==false) {
+ if (account->getOffline()==false)
+ {
removeChilds();
wrapper->logout();
@@ -324,5 +361,5 @@ void IMAPviewItem::contextMenuSelected(int id)
SETPIX(PIXMAP_IMAPFOLDER);
refreshFolders(false);
- break;
+ break;
default:
break;
@@ -341,11 +378,14 @@ bool IMAPviewItem::offline()
IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after )
- : AccountViewItem( parent , after )
+ : AccountViewItem( parent , after )
{
folder = folderInit;
imap = parent;
- if (folder->getDisplayName().lower()!="inbox") {
+ if (folder->getDisplayName().lower()!="inbox")
+ {
setPixmap( 0, PIXMAP_IMAPFOLDER );
- } else {
+ }
+ else
+ {
setPixmap( 0, PIXMAP_INBOXFOLDER);
}
@@ -354,11 +394,14 @@ IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QList
IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master )
- : AccountViewItem( parent,after )
+ : AccountViewItem( parent,after )
{
folder = folderInit;
imap = master;
- if (folder->getDisplayName().lower()!="inbox") {
+ if (folder->getDisplayName().lower()!="inbox")
+ {
setPixmap( 0, PIXMAP_IMAPFOLDER );
- } else {
+ }
+ else
+ {
setPixmap( 0, PIXMAP_INBOXFOLDER);
}
@@ -367,6 +410,5 @@ IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QLi
IMAPfolderItem::~IMAPfolderItem()
-{
-}
+{}
const QString& IMAPfolderItem::Delemiter()const
@@ -377,7 +419,10 @@ const QString& IMAPfolderItem::Delemiter()const
void IMAPfolderItem::refresh(QList<RecMail>&target)
{
- if (folder->may_select()) {
+ if (folder->may_select())
+ {
imap->getWrapper()->listMessages( folder->getName(),target );
- } else {
+ }
+ else
+ {
target.clear();
}
@@ -392,14 +437,18 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
- if (folder->may_select()) {
+ if (m)
+ {
+ if (folder->may_select())
+ {
m->insertItem(QObject::tr("Refresh header list",contextName),0);
m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);
m->insertItem(QObject::tr("Delete all mails",contextName),1);
}
- if (folder->no_inferior()==false) {
+ if (folder->no_inferior()==false)
+ {
m->insertItem(QObject::tr("Create new subfolder",contextName),2);
}
- if (folder->getDisplayName().lower()!="inbox") {
+ if (folder->getDisplayName().lower()!="inbox")
+ {
m->insertItem(QObject::tr("Delete folder",contextName),3);
}
@@ -411,10 +460,11 @@ void IMAPfolderItem::createNewFolder()
{
Newmdirdlg ndirdlg;
- ndirdlg.showMaximized();
- if (ndirdlg.exec()) {
+ if ( QPEApplication::execDialog( &ndirdlg ) )
+ {
QString ndir = ndirdlg.Newdir();
bool makesubs = ndirdlg.subpossible();
QString delemiter = Delemiter();
- if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs)) {
+ if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs))
+ {
imap->refreshFolders(true);
}
@@ -425,10 +475,12 @@ void IMAPfolderItem::deleteFolder()
{
int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
- QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
- QObject::tr("Yes",contextName),
- QObject::tr("No",contextName),QString::null,1,1);
+ QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+ QObject::tr("Yes",contextName),
+ QObject::tr("No",contextName),QString::null,1,1);
qDebug("Auswahl: %i",yesno);
- if (yesno == 0) {
- if (imap->getWrapper()->deleteMbox(folder)) {
+ if (yesno == 0)
+ {
+ if (imap->getWrapper()->deleteMbox(folder))
+ {
QListView*v=listView();
IMAPviewItem * box = imap;
@@ -436,5 +488,6 @@ void IMAPfolderItem::deleteFolder()
* any member of it after that call!!*/
imap->refreshFolders(true);
- if (v) {
+ if (v)
+ {
v->setSelected(box,true);
}
@@ -454,5 +507,6 @@ void IMAPfolderItem::contextMenuSelected(int id)
qDebug("Selected id: %i",id);
AccountView * view = (AccountView*)listView();
- switch(id) {
+ switch(id)
+ {
case 0:
view->refreshCurrent();
@@ -481,5 +535,5 @@ void IMAPfolderItem::contextMenuSelected(int id)
POP3 and MBOX */
MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
- : AccountViewItem( parent )
+ : AccountViewItem( parent )
{
m_Path = aPath;
@@ -519,8 +573,10 @@ void MHviewItem::refresh(bool force)
QString fname = "";
int pos;
- for ( it = folders->first(); it; it = folders->next() ) {
+ for ( it = folders->first(); it; it = folders->next() )
+ {
fname = it->getDisplayName();
/* this folder itself */
- if (fname=="/") {
+ if (fname=="/")
+ {
currentFolders.append(fname);
folder = it;
@@ -529,13 +585,19 @@ void MHviewItem::refresh(bool force)
currentFolders.append(fname);
pos = fname.findRev("/");
- if (pos > 0) {
+ if (pos > 0)
+ {
fname = fname.left(pos);
pmaster = (MHfolderItem*)findSubItem(fname);
- } else {
+ }
+ else
+ {
pmaster = 0;
}
- if (pmaster) {
+ if (pmaster)
+ {
item = new MHfolderItem( it, pmaster, item, this );
- } else {
+ }
+ else
+ {
item = new MHfolderItem( it, this , item );
}
@@ -556,5 +618,6 @@ QPopupMenu * MHviewItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
+ if (m)
+ {
m->insertItem(QObject::tr("Refresh folder list",contextName),0);
m->insertItem(QObject::tr("Create new folder",contextName),1);
@@ -568,8 +631,9 @@ void MHviewItem::createFolder()
{
Newmdirdlg ndirdlg(0,0,true);
- ndirdlg.showMaximized();
- if (ndirdlg.exec()) {
+ if ( QPEApplication::execDialog( &ndirdlg ) )
+ {
QString ndir = ndirdlg.Newdir();
- if (wrapper->createMbox(ndir)) {
+ if (wrapper->createMbox(ndir))
+ {
refresh(true);
}
@@ -591,5 +655,6 @@ QStringList MHviewItem::subFolders()
void MHviewItem::contextMenuSelected(int which)
{
- switch (which) {
+ switch (which)
+ {
case 0:
refresh(true);
@@ -610,9 +675,8 @@ void MHviewItem::contextMenuSelected(int which)
MHfolderItem::~MHfolderItem()
-{
-}
+{}
MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewItem*after )
- : AccountViewItem( parent,after )
+ : AccountViewItem( parent,after )
{
folder = folderInit;
@@ -622,5 +686,5 @@ MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewIt
MHfolderItem::MHfolderItem( Folder *folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master)
- : AccountViewItem( parent,after )
+ : AccountViewItem( parent,after )
{
folder = folderInit;
@@ -632,18 +696,25 @@ void MHfolderItem::initName()
{
QString bName = folder->getDisplayName();
- if (bName.startsWith("/")&&bName.length()>1) {
+ if (bName.startsWith("/")&&bName.length()>1)
+ {
bName.replace(0,1,"");
}
int pos = bName.findRev("/");
- if (pos > 0) {
+ if (pos > 0)
+ {
bName.replace(0,pos+1,"");
}
- if (bName.lower() == "outgoing") {
+ if (bName.lower() == "outgoing")
+ {
setPixmap( 0, PIXMAP_OUTBOXFOLDER );
- } else if (bName.lower() == "inbox") {
+ }
+ else if (bName.lower() == "inbox")
+ {
setPixmap( 0, PIXMAP_INBOXFOLDER);
- } else {
+ }
+ else
+ {
setPixmap( 0, PIXMAP_MBOXFOLDER );
- }
+ }
setText( 0, bName );
}
@@ -668,10 +739,12 @@ void MHfolderItem::deleteFolder()
{
int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
- QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
- QObject::tr("Yes",contextName),
- QObject::tr("No",contextName),QString::null,1,1);
+ QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+ QObject::tr("Yes",contextName),
+ QObject::tr("No",contextName),QString::null,1,1);
qDebug("Auswahl: %i",yesno);
- if (yesno == 0) {
- if (mbox->getWrapper()->deleteMbox(folder)) {
+ if (yesno == 0)
+ {
+ if (mbox->getWrapper()->deleteMbox(folder))
+ {
QListView*v=listView();
MHviewItem * box = mbox;
@@ -679,5 +752,6 @@ void MHfolderItem::deleteFolder()
* any member of it after that call!!*/
mbox->refresh(true);
- if (v) {
+ if (v)
+ {
v->setSelected(box,true);
}
@@ -689,5 +763,6 @@ QPopupMenu * MHfolderItem::getContextMenu()
{
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
+ if (m)
+ {
m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
m->insertItem(QObject::tr("Delete all mails",contextName),0);
@@ -708,8 +783,9 @@ void MHfolderItem::createFolder()
{
Newmdirdlg ndirdlg(0,0,true);
- ndirdlg.showMaximized();
- if (ndirdlg.exec()) {
+ if ( QPEApplication::execDialog( &ndirdlg ) )
+ {
QString ndir = ndirdlg.Newdir();
- if (mbox->getWrapper()->createMbox(ndir,folder)) {
+ if (mbox->getWrapper()->createMbox(ndir,folder))
+ {
QListView*v=listView();
MHviewItem * box = mbox;
@@ -717,5 +793,6 @@ void MHfolderItem::createFolder()
* any member of it after that call!!*/
mbox->refresh(true);
- if (v) {
+ if (v)
+ {
v->setSelected(box,true);
}
@@ -726,5 +803,6 @@ void MHfolderItem::createFolder()
void MHfolderItem::contextMenuSelected(int which)
{
- switch(which) {
+ switch(which)
+ {
case 0:
deleteAllMail(mbox->getWrapper(),folder);
@@ -750,6 +828,6 @@ void MHfolderItem::contextMenuSelected(int which)
const QString AccountViewItem::contextName="AccountViewItem";
-AccountViewItem::AccountViewItem( AccountView *parent )
- : QListViewItem( parent )
+AccountViewItem::AccountViewItem( AccountView *parent )
+ : QListViewItem( parent )
{
init();
@@ -758,5 +836,5 @@ AccountViewItem::AccountViewItem( AccountView *parent )
AccountViewItem::AccountViewItem( QListViewItem *parent)
- : QListViewItem( parent)
+ : QListViewItem( parent)
{
init();
@@ -764,5 +842,5 @@ AccountViewItem::AccountViewItem( QListViewItem *parent)
AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after )
- :QListViewItem( parent,after )
+ :QListViewItem( parent,after )
{
init();
@@ -791,11 +869,13 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
if (folder) fname = folder->getDisplayName();
int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
- QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
- arg(fname),
- QObject::tr("Yes",contextName),
- QObject::tr("No",contextName),QString::null,1,1);
+ QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
+ arg(fname),
+ QObject::tr("Yes",contextName),
+ QObject::tr("No",contextName),QString::null,1,1);
qDebug("Auswahl: %i",yesno);
- if (yesno == 0) {
- if (wrapper->deleteAllMail(folder)) {
+ if (yesno == 0)
+ {
+ if (wrapper->deleteAllMail(folder))
+ {
AccountView * view = (AccountView*)listView();
if (view) view->refreshCurrent();
@@ -807,5 +887,6 @@ void AccountViewItem::removeChilds()
{
QListViewItem *child = firstChild();
- while ( child ) {
+ while ( child )
+ {
QListViewItem *tmp = child;
child = child->nextSibling();
@@ -826,11 +907,15 @@ AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*
if (!start) pitem = (AccountViewItem*)firstChild();
else pitem = (AccountViewItem*)start->firstChild();
- while (pitem) {
- if (pitem->matchName(path)) {
+ while (pitem)
+ {
+ if (pitem->matchName(path))
+ {
break;
}
- if (pitem->childCount()>0) {
+ if (pitem->childCount()>0)
+ {
sitem = findSubItem(path,pitem);
- if (sitem) {
+ if (sitem)
+ {
pitem = sitem;
break;
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index d9792d4..2ddf834 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,20 +1,25 @@
+
#include "accountview.h"
#include "accountitem.h"
#include "selectstore.h"
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
+
+/* OPIE */
#include <libmailwrapper/settings.h>
#include <libmailwrapper/mailwrapper.h>
#include <libmailwrapper/mailtypes.h>
#include <libmailwrapper/abstractmail.h>
+#include <qpe/qpeapplication.h>
+/* QT */
+#include <qmessagebox.h>
+#include <qpopupmenu.h>
AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
- : QListView( parent, name, flags )
+ : QListView( parent, name, flags )
{
connect( this, SIGNAL( selectionChanged( QListViewItem * ) ),
- SLOT( refresh( QListViewItem * ) ) );
+ SLOT( refresh( QListViewItem * ) ) );
connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this,
- SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) );
+ SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) );
setSorting(0);
}
@@ -56,10 +61,14 @@ void AccountView::populate( QList<Account> list )
Account *it;
- for ( it = list.first(); it; it = list.next() ) {
- if ( it->getType().compare( "IMAP" ) == 0 ) {
+ for ( it = list.first(); it; it = list.next() )
+ {
+ if ( it->getType().compare( "IMAP" ) == 0 )
+ {
IMAPaccount *imap = static_cast<IMAPaccount *>(it);
qDebug( "added IMAP " + imap->getAccountName() );
imapAccounts.append(new IMAPviewItem( imap, this ));
- } else if ( it->getType().compare( "POP3" ) == 0 ) {
+ }
+ else if ( it->getType().compare( "POP3" ) == 0 )
+ {
POP3account *pop3 = static_cast<POP3account *>(it);
qDebug( "added POP3 " + pop3->getAccountName() );
@@ -70,8 +79,10 @@ void AccountView::populate( QList<Account> list )
}
-void AccountView::refresh(QListViewItem *item) {
+void AccountView::refresh(QListViewItem *item)
+{
qDebug("AccountView refresh...");
- if ( item ) {
+ if ( item )
+ {
m_currentItem = item;
QList<RecMail> headerlist;
@@ -96,5 +107,4 @@ void AccountView::refreshCurrent()
void AccountView::refreshAll()
{
-
}
@@ -109,13 +119,15 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
void AccountView::setupFolderselect(Selectstore*sels)
{
- sels->showMaximized();
+ QPEApplication::showDialog( sels );
QStringList sFolders;
unsigned int i = 0;
- for (i=0; i < mhAccounts.count();++i) {
+ for (i=0; i < mhAccounts.count();++i)
+ {
mhAccounts[i]->refresh(false);
sFolders = mhAccounts[i]->subFolders();
sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
}
- for (i=0; i < imapAccounts.count();++i) {
+ for (i=0; i < imapAccounts.count();++i)
+ {
if (imapAccounts[i]->offline())
continue;
@@ -135,10 +147,12 @@ void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
targetFolder = sels.currentFolder();
if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
- targetFolder.isEmpty()) {
+ targetFolder.isEmpty())
+ {
return;
}
- if (sels.newFolder() && !targetMail->createMbox(targetFolder)) {
+ if (sels.newFolder() && !targetMail->createMbox(targetFolder))
+ {
QMessageBox::critical(0,tr("Error creating new Folder"),
- tr("<center>Error while creating<br>new folder - breaking.</center>"));
+ tr("<center>Error while creating<br>new folder - breaking.</center>"));
return;
}
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index f4f4cea..8cdabde 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,2 +1,12 @@
+
+#include "composemail.h"
+
+/* OPIE */
+#include <opie2/ocontactaccess.h>
+#include <opie2/ocontact.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qpushbutton.h>
#include <qmessagebox.h>
@@ -5,15 +15,9 @@
#include <qfile.h>
-#include <qpe/resource.h>
-#include <opie2/ocontactaccess.h>
-#include <opie2/ocontact.h>
-
-
+/* STD */
#include <stdlib.h>
-#include "composemail.h"
-
-AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags )
- : AddressPickerUI( parent, name, modal, flags )
+AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags )
+ : AddressPickerUI( parent, name, modal, flags )
{
okButton->setIconSet( Resource::loadPixmap( "enter" ) );
@@ -27,35 +31,44 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
/* what name has to set here???? */
Opie::OContactAccess m_contactdb("opiemail");
-
+
QStringList mails;
QString pre,suf;
Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
- for ( it = m_list.begin(); it != m_list.end(); ++it ) {
- if ((*it).defaultEmail().length()!=0) {
+ for ( it = m_list.begin(); it != m_list.end(); ++it )
+ {
+ if ((*it).defaultEmail().length()!=0)
+ {
mails = (*it).emailList();
- if ((*it).fileAs().length()>0) {
+ if ((*it).fileAs().length()>0)
+ {
pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
suf = ">";
- } else {
+ }
+ else
+ {
pre = "";
suf = "";
}
QStringList::ConstIterator sit = mails.begin();
- for (;sit!=mails.end();++sit) {
+ for (;sit!=mails.end();++sit)
+ {
contactLine=pre+(*sit)+suf;
addressList->insertItem(contactLine);
- }
+ }
}
}
- if ( addressList->count() <= 0 ) {
+ if ( addressList->count() <= 0 )
+ {
#if 0
- // makes this realy sense??
- addressList->insertItem(
+ // makes this realy sense??
+ addressList->insertItem(
tr( "There are no entries in the addressbook." ) );
#endif
- addressList->setEnabled( false );
- okButton->setEnabled( false );
- } else {
-// addressList->sort();
+ addressList->setEnabled( false );
+ okButton->setEnabled( false );
+ }
+ else
+ {
+ // addressList->sort();
}
}
@@ -63,38 +76,39 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
void AddressPicker::accept()
{
- QListBoxItem *item = addressList->firstItem();
- QString names;
-
- while ( item ) {
- if ( item->selected() )
- names += item->text() + ", ";
- item = item->next();
- }
- names.replace( names.length() - 2, 2, "" );
-
- if ( names.isEmpty() ) {
- QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
- " at least one address entry.</p>"), tr("Ok"));
- return;
- }
-
- selectedNames = names;
- QDialog::accept();
+ QListBoxItem *item = addressList->firstItem();
+ QString names;
+
+ while ( item )
+ {
+ if ( item->selected() )
+ names += item->text() + ", ";
+ item = item->next();
+ }
+ names.replace( names.length() - 2, 2, "" );
+
+ if ( names.isEmpty() )
+ {
+ QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
+ " at least one address entry.</p>"), tr("Ok"));
+ return;
+ }
+
+ selectedNames = names;
+ QDialog::accept();
}
QString AddressPicker::getNames()
{
- QString names = 0;
-
- AddressPicker picker(0, 0, true);
- picker.showMaximized();
- picker.show();
-
- int ret = picker.exec();
- if ( QDialog::Accepted == ret ) {
- return picker.selectedNames;
- }
-
- return 0;
+ QString names = 0;
+
+ AddressPicker picker(0, 0, true);
+
+ int ret = QPEApplication::execDialog( &picker );
+ if ( QDialog::Accepted == ret )
+ {
+ return picker.selectedNames;
+ }
+
+ return 0;
}
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 1cb202e..60bffa5 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -1,9 +1,14 @@
-#include <qt.h>
#include "defines.h"
#include "editaccounts.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qt.h>
+
AccountListItem::AccountListItem( QListView *parent, Account *a)
- : QListViewItem( parent )
+ : QListViewItem( parent )
{
account = a;
@@ -13,5 +18,5 @@ AccountListItem::AccountListItem( QListView *parent, Account *a)
EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
- : EditAccountsUI( parent, name, modal, flags )
+ : EditAccountsUI( parent, name, modal, flags )
{
qDebug( "New Account Configuration Widget" );
@@ -40,8 +45,12 @@ void EditAccounts::slotFillLists()
QList<Account> accounts = settings->getAccounts();
Account *it;
- for ( it = accounts.first(); it; it = accounts.next() ) {
- if ( it->getType().compare( "NNTP" ) == 0 ) {
+ for ( it = accounts.first(); it; it = accounts.next() )
+ {
+ if ( it->getType().compare( "NNTP" ) == 0 )
+ {
(void) new AccountListItem( newsList, it );
- } else {
+ }
+ else
+ {
(void) new AccountListItem( mailList, it );
}
@@ -55,5 +64,6 @@ void EditAccounts::slotNewMail()
SelectMailType selType( selection, this, 0, true );
selType.show();
- if ( QDialog::Accepted == selType.exec() ) {
+ if ( QDialog::Accepted == selType.exec() )
+ {
slotNewAccount( *selection );
}
@@ -62,51 +72,66 @@ void EditAccounts::slotNewMail()
void EditAccounts::slotNewAccount( const QString &type )
{
- if ( type.compare( "IMAP" ) == 0 ) {
+ if ( type.compare( "IMAP" ) == 0 )
+ {
qDebug( "-> config IMAP" );
IMAPaccount *account = new IMAPaccount();
IMAPconfig imap( account, this, 0, true );
- imap.showMaximized();
- if ( QDialog::Accepted == imap.exec() ) {
+ if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) )
+ {
settings->addAccount( account );
account->save();
slotFillLists();
- } else {
+ }
+ else
+ {
account->remove();
}
- } else if ( type.compare( "POP3" ) == 0 ) {
+ }
+ else if ( type.compare( "POP3" ) == 0 )
+ {
qDebug( "-> config POP3" );
POP3account *account = new POP3account();
POP3config pop3( account, this, 0, true, WStyle_ContextHelp );
- pop3.showMaximized();
- if ( QDialog::Accepted == pop3.exec() ) {
+ if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) )
+ {
settings->addAccount( account );
account->save();
slotFillLists();
- } else {
+ }
+ else
+ {
account->remove();
}
- } else if ( type.compare( "SMTP" ) == 0 ) {
+ }
+ else if ( type.compare( "SMTP" ) == 0 )
+ {
qDebug( "-> config SMTP" );
SMTPaccount *account = new SMTPaccount();
SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp );
- smtp.showMaximized();
- if ( QDialog::Accepted == smtp.exec() ) {
+ if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) )
+ {
settings->addAccount( account );
account->save();
slotFillLists();
- } else {
+ }
+ else
+ {
account->remove();
}
- } else if ( type.compare( "NNTP" ) == 0 ) {
+ }
+ else if ( type.compare( "NNTP" ) == 0 )
+ {
qDebug( "-> config NNTP" );
NNTPaccount *account = new NNTPaccount();
NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp );
- nntp.showMaximized();
- if ( QDialog::Accepted == nntp.exec() ) {
+ if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) )
+ {
settings->addAccount( account );
account->save();
slotFillLists();
- } else {
+ }
+ else
+ {
account->remove();
}
@@ -116,31 +141,38 @@ void EditAccounts::slotNewAccount( const QString &type )
void EditAccounts::slotEditAccount( Account *account )
{
- if ( account->getType().compare( "IMAP" ) == 0 ) {
+ if ( account->getType().compare( "IMAP" ) == 0 )
+ {
IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account);
IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp );
- imap.showMaximized();
- if ( QDialog::Accepted == imap.exec() ) {
- slotFillLists();
+ if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) )
+ {
+ slotFillLists();
}
- } else if ( account->getType().compare( "POP3" ) == 0 ) {
+ }
+ else if ( account->getType().compare( "POP3" ) == 0 )
+ {
POP3account *pop3Acc = static_cast<POP3account *>(account);
POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp );
- pop3.showMaximized();
- if ( QDialog::Accepted == pop3.exec() ) {
- slotFillLists();
+ if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) )
+ {
+ slotFillLists();
}
- } else if ( account->getType().compare( "SMTP" ) == 0 ) {
+ }
+ else if ( account->getType().compare( "SMTP" ) == 0 )
+ {
SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account);
SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp );
- smtp.showMaximized();
- if ( QDialog::Accepted == smtp.exec() ) {
- slotFillLists();
+ if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) )
+ {
+ slotFillLists();
}
- } else if ( account->getType().compare( "NNTP" ) == 0 ) {
+ }
+ else if ( account->getType().compare( "NNTP" ) == 0 )
+ {
NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account);
NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp );
- nntp.showMaximized();
- if ( QDialog::Accepted == nntp.exec() ) {
- slotFillLists();
+ if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) )
+ {
+ slotFillLists();
}
}
@@ -150,6 +182,7 @@ void EditAccounts::slotDeleteAccount( Account *account )
{
if ( QMessageBox::information( this, tr( "Question" ),
- tr( "<p>Do you really want to delete the selected Account?</p>" ),
- tr( "Yes" ), tr( "No" ) ) == 0 ) {
+ tr( "<p>Do you really want to delete the selected Account?</p>" ),
+ tr( "Yes" ), tr( "No" ) ) == 0 )
+ {
settings->delAccount( account );
slotFillLists();
@@ -160,5 +193,6 @@ void EditAccounts::slotEditMail()
{
qDebug( "Edit Mail Account" );
- if ( !mailList->currentItem() ) {
+ if ( !mailList->currentItem() )
+ {
QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
@@ -173,5 +207,6 @@ void EditAccounts::slotEditMail()
void EditAccounts::slotDeleteMail()
{
- if ( !mailList->currentItem() ) {
+ if ( !mailList->currentItem() )
+ {
QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
@@ -193,5 +228,6 @@ void EditAccounts::slotEditNews()
{
qDebug( "Edit News Account" );
- if ( !newsList->currentItem() ) {
+ if ( !newsList->currentItem() )
+ {
QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
@@ -207,5 +243,6 @@ void EditAccounts::slotDeleteNews()
{
qDebug( "Delete News Account" );
- if ( !newsList->currentItem() ) {
+ if ( !newsList->currentItem() )
+ {
QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
@@ -244,5 +281,5 @@ void EditAccounts::accept()
SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, WFlags flags )
- : SelectMailTypeUI( parent, name, modal, flags )
+ : SelectMailTypeUI( parent, name, modal, flags )
{
selected = selection;
@@ -261,5 +298,5 @@ void SelectMailType::slotSelection( const QString &sel )
IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
- : IMAPconfigUI( parent, name, modal, flags )
+ : IMAPconfigUI( parent, name, modal, flags )
{
data = account;
@@ -278,10 +315,15 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
void IMAPconfig::slotConnectionToggle( int index )
{
- if ( index == 2 ) {
- portLine->setText( IMAP_SSL_PORT );
- } else if ( index == 3 ) {
+ if ( index == 2 )
+ {
+ portLine->setText( IMAP_SSL_PORT );
+ }
+ else if ( index == 3 )
+ {
portLine->setText( IMAP_PORT );
CommandEdit->show();
- } else {
+ }
+ else
+ {
portLine->setText( IMAP_PORT );
}
@@ -317,5 +359,5 @@ void IMAPconfig::accept()
POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, WFlags flags )
- : POP3configUI( parent, name, modal, flags )
+ : POP3configUI( parent, name, modal, flags )
{
data = account;
@@ -334,10 +376,15 @@ void POP3config::slotConnectionToggle( int index )
{
// 2 is ssl connection
- if ( index == 2 ) {
- portLine->setText( POP3_SSL_PORT );
- } else if ( index == 3 ) {
+ if ( index == 2 )
+ {
+ portLine->setText( POP3_SSL_PORT );
+ }
+ else if ( index == 3 )
+ {
portLine->setText( POP3_PORT );
CommandEdit->show();
- } else {
+ }
+ else
+ {
portLine->setText( POP3_PORT );
}
@@ -371,5 +418,5 @@ void POP3config::accept()
SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
- : SMTPconfigUI( parent, name, modal, flags )
+ : SMTPconfigUI( parent, name, modal, flags )
{
data = account;
@@ -392,10 +439,15 @@ void SMTPconfig::slotConnectionToggle( int index )
{
// 2 is ssl connection
- if ( index == 2 ) {
- portLine->setText( SMTP_SSL_PORT );
- } else if ( index == 3 ) {
+ if ( index == 2 )
+ {
+ portLine->setText( SMTP_SSL_PORT );
+ }
+ else if ( index == 3 )
+ {
portLine->setText( SMTP_PORT );
CommandEdit->show();
- } else {
+ }
+ else
+ {
portLine->setText( SMTP_PORT );
}
@@ -431,5 +483,5 @@ void SMTPconfig::accept()
NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
- : NNTPconfigUI( parent, name, modal, flags )
+ : NNTPconfigUI( parent, name, modal, flags )
{
data = account;
@@ -445,7 +497,10 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
void NNTPconfig::slotSSL( bool enabled )
{
- if ( enabled ) {
+ if ( enabled )
+ {
portLine->setText( NNTP_SSL_PORT );
- } else {
+ }
+ else
+ {
portLine->setText( NNTP_PORT );
}
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 0795436..abf93dc 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,21 +1,27 @@
-#include <qmessagebox.h>
+
#include "settingsdialog.h"
#include "opiemail.h"
#include "editaccounts.h"
#include "composemail.h"
+#include "mailistviewitem.h"
+#include "viewmail.h"
+#include "selectstore.h"
+#include "selectsmtp.h"
+
+/* OPIE */
#include <libmailwrapper/smtpwrapper.h>
+#include <libmailwrapper/mailtypes.h>
+#include <libmailwrapper/abstractmail.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qmessagebox.h>
#include <qaction.h>
#include <qapplication.h>
-#include <libmailwrapper/mailtypes.h>
-#include <libmailwrapper/abstractmail.h>
-#include "mailistviewitem.h"
-#include "viewmail.h"
-#include "selectstore.h"
-#include "selectsmtp.h"
OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
- : MainWindow( parent, name, WStyle_ContextHelp )
+ : MainWindow( parent, name, WStyle_ContextHelp )
{
settings = new Settings();
@@ -32,5 +38,6 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
{
// copied from old mail2
- if (msg == "writeMail(QString,QString)") {
+ if (msg == "writeMail(QString,QString)")
+ {
QDataStream stream(data,IO_ReadOnly);
QString name, email;
@@ -38,5 +45,7 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
// removing the whitespaces at beginning and end is needed!
slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
- } else if (msg == "newMail()") {
+ }
+ else if (msg == "newMail()")
+ {
slotComposeMail();
}
@@ -46,14 +55,17 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
{
ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
- if (!email.isEmpty()) {
- if (!name.isEmpty()) {
+ if (!email.isEmpty())
+ {
+ if (!name.isEmpty())
+ {
compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
- } else {
+ }
+ else
+ {
compose.setTo(email);
}
}
- compose.showMaximized();
compose.slotAdjustColumns();
- compose.exec();
+ QPEApplication::execDialog( &compose );
}
@@ -73,28 +85,36 @@ void OpieMail::slotSendQueued()
smtpList.setAutoDelete(false);
Account *it;
- for ( it = list.first(); it; it = list.next() ) {
- if ( it->getType().compare( "SMTP" ) == 0 ) {
+ for ( it = list.first(); it; it = list.next() )
+ {
+ if ( it->getType().compare( "SMTP" ) == 0 )
+ {
smtp = static_cast<SMTPaccount *>(it);
smtpList.append(smtp);
}
}
- if (smtpList.count()==0) {
+ if (smtpList.count()==0)
+ {
QMessageBox::information(0,tr("Info"),tr("Define a smtp account first"));
return;
}
- if (smtpList.count()==1) {
+ if (smtpList.count()==1)
+ {
smtp = smtpList.at(0);
- } else {
+ }
+ else
+ {
smtp = 0;
selectsmtp selsmtp;
selsmtp.setSelectionlist(&smtpList);
- selsmtp.showMaximized();
- if (selsmtp.exec()==QDialog::Accepted) {
+ if ( QPEApplication::execDialog( &selsmtp ) == QDialog::Accepted )
+ {
smtp = selsmtp.selected_smtp();
}
}
- if (smtp) {
+ if (smtp)
+ {
SMTPwrapper * wrap = new SMTPwrapper(smtp);
- if ( wrap->flushOutbox() ) {
+ if ( wrap->flushOutbox() )
+ {
QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
}
@@ -111,6 +131,5 @@ void OpieMail::slotEditSettings()
{
SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp );
- settingsDialog.showMaximized();
- settingsDialog.exec();
+ QPEApplication::execDialog( &settingsDialog );
}
@@ -119,7 +138,6 @@ void OpieMail::slotEditAccounts()
qDebug( "Edit Accounts" );
EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp );
- eaDialog.showMaximized();
eaDialog.slotAdjustColumns();
- eaDialog.exec();
+ QPEApplication::execDialog( &eaDialog );
if ( settings ) delete settings;
settings = new Settings();
@@ -140,7 +158,10 @@ void OpieMail::displayMail()
readMail.exec();
- if ( readMail.deleted ) {
- folderView->refreshCurrent();
- } else {
+ if ( readMail.deleted )
+ {
+ folderView->refreshCurrent();
+ }
+ else
+ {
( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) );
}
@@ -151,7 +172,8 @@ void OpieMail::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();
+ 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();
}
}
@@ -164,5 +186,6 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
if (!item) return;
QPopupMenu *m = new QPopupMenu(0);
- if (m) {
+ if (m)
+ {
m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
@@ -176,9 +199,12 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
void OpieMail::slotShowFolders( bool show )
{
- qDebug( "Show Folders" );
- if ( show && folderView->isHidden() ) {
+ qDebug( "Show Folders" );
+ if ( show && folderView->isHidden() )
+ {
qDebug( "-> showing" );
folderView->show();
- } else if ( !show && !folderView->isHidden() ) {
+ }
+ else if ( !show && !folderView->isHidden() )
+ {
qDebug( "-> hiding" );
folderView->hide();
@@ -190,5 +216,6 @@ void OpieMail::refreshMailView(QList<RecMail>*list)
MailListViewItem*item = 0;
mailView->clear();
- for (unsigned int i = 0; i < list->count();++i) {
+ for (unsigned int i = 0; i < list->count();++i)
+ {
item = new MailListViewItem(mailView,item);
item->storeData(*(list->at(i)));
@@ -217,10 +244,12 @@ void OpieMail::slotMoveCopyMail()
targetFolder = sels.currentFolder();
if ( (mail.Wrapper()==targetMail && mail.getMbox()==targetFolder) ||
- targetFolder.isEmpty()) {
+ targetFolder.isEmpty())
+ {
return;
}
- if (sels.newFolder() && !targetMail->createMbox(targetFolder)) {
+ if (sels.newFolder() && !targetMail->createMbox(targetFolder))
+ {
QMessageBox::critical(0,tr("Error creating new Folder"),
- tr("<center>Error while creating<br>new folder - breaking.</center>"));
+ tr("<center>Error while creating<br>new folder - breaking.</center>"));
return;
}
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 99965d4..f015228 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,2 +1,16 @@
+#include "composemail.h"
+#include "viewmail.h"
+#include "accountview.h"
+
+/* OPIE */
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
+
+#include <opie2/ofiledialog.h>
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qtextbrowser.h>
#include <qmessagebox.h>
@@ -8,34 +22,23 @@
#include <qvaluelist.h>
-#include <qpe/config.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <libmailwrapper/settings.h>
-#include "composemail.h"
-#include "viewmail.h"
-#include <libmailwrapper/abstractmail.h>
-#include "accountview.h"
-#include <libmailwrapper/mailtypes.h>
-
AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
- const QString&fsize,int num,const QValueList<int>&path)
- : QListViewItem(parent,after),_partNum(num)
+ const QString&fsize,int num,const QValueList<int>&path)
+ : QListViewItem(parent,after),_partNum(num)
{
_path=path;
- setText(0, mime);
- setText(1, desc);
- setText(2, file);
+ setText(0, mime);
+ setText(1, desc);
+ setText(2, file);
setText(3, fsize);
}
AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
- const QString&fsize,int num,const QValueList<int>&path)
- : QListViewItem(parent,after),_partNum(num)
+ const QString&fsize,int num,const QValueList<int>&path)
+ : QListViewItem(parent,after),_partNum(num)
{
_path=path;
- setText(0, mime);
- setText(1, desc);
- setText(2, file);
+ setText(0, mime);
+ setText(1, desc);
+ setText(2, file);
setText(3, fsize);
}
@@ -47,5 +50,6 @@ bool AttachItem::isParentof(const QValueList<int>&path)
/* the parent must have one digit less then a child */
if (path.count()!=_path.count()+1) return false;
- for (unsigned int i=0; i < _path.count();++i) {
+ for (unsigned int i=0; i < _path.count();++i)
+ {
if (_path[i]!=path[i]) return false;
}
@@ -56,5 +60,6 @@ AttachItem* ViewMail::searchParent(const QValueList<int>&path)
{
QListViewItemIterator it( attachments );
- for ( ; it.current(); ++it ) {
+ for ( ; it.current(); ++it )
+ {
AttachItem*ati = (AttachItem*)it.current();
if (ati->isParentof(path)) return ati;
@@ -69,5 +74,6 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
if (!item) return item;
AttachItem*temp=0;
- while( (temp=(AttachItem*)item->nextSibling())) {
+ while( (temp=(AttachItem*)item->nextSibling()))
+ {
item = temp;
}
@@ -75,71 +81,33 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
}
-void ViewMail::setBody( RecBody body ) {
-
-m_body = body;
-m_mail[2] = body.Bodytext();
-attachbutton->setEnabled(body.Parts().count()>0);
-attachments->setEnabled(body.Parts().count()>0);
-if (body.Parts().count()==0) {
- return;
-}
-AttachItem * curItem=0;
-AttachItem * parentItem = 0;
-QString type=body.Description().Type()+"/"+body.Description().Subtype();
-QString desc,fsize;
-double s = body.Description().Size();
-int w;
-w=0;
-
-while (s>1024) {
- s/=1024;
- ++w;
- if (w>=2) break;
-}
-
-QString q="";
-switch(w) {
-case 1:
- q="k";
- break;
-case 2:
- q="M";
- break;
-default:
- break;
-}
-
+void ViewMail::setBody( RecBody body )
{
- /* I did not found a method to make a CONTENT reset on a QTextStream
- so I use this construct that the stream will re-constructed in each
- loop. To let it work, the textstream is packed into a own area of
- code is it will be destructed after finishing its small job.
- */
- QTextOStream o(&fsize);
- if (w>0) o.precision(2); else o.precision(0);
- o.setf(QTextStream::fixed);
- o << s << " " << q << "Byte";
-}
-
-curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Description().Positionlist());
-QString filename = "";
-for (unsigned int i = 0; i < body.Parts().count();++i) {
- type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype();
- part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin();
- for (;it!=body.Parts()[i].Parameters().end();++it) {
- qDebug(it.key());
- if (it.key().lower()=="name") {
- filename=it.data();
- }
+ m_body = body;
+ m_mail[2] = body.Bodytext();
+ attachbutton->setEnabled(body.Parts().count()>0);
+ attachments->setEnabled(body.Parts().count()>0);
+ if (body.Parts().count()==0)
+ {
+ return;
}
- s = body.Parts()[i].Size();
- w = 0;
- while (s>1024) {
+ AttachItem * curItem=0;
+ AttachItem * parentItem = 0;
+ QString type=body.Description().Type()+"/"+body.Description().Subtype();
+ QString desc,fsize;
+ double s = body.Description().Size();
+ int w;
+ w=0;
+
+ while (s>1024)
+ {
s/=1024;
++w;
if (w>=2) break;
}
- switch(w) {
+
+ QString q="";
+ switch(w)
+ {
case 1:
q="k";
@@ -149,85 +117,148 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
break;
default:
- q="";
break;
}
- QTextOStream o(&fsize);
- if (w>0) o.precision(2); else o.precision(0);
- o.setf(QTextStream::fixed);
- o << s << " " << q << "Byte";
- desc = body.Parts()[i].Description();
- parentItem = searchParent(body.Parts()[i].Positionlist());
- if (parentItem) {
- AttachItem*temp = lastChild(parentItem);
- if (temp) curItem = temp;
- curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
- attachments->setRootIsDecorated(true);
- curItem = parentItem;
- } else {
- curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+
+ {
+ /* I did not found a method to make a CONTENT reset on a QTextStream
+ so I use this construct that the stream will re-constructed in each
+ loop. To let it work, the textstream is packed into a own area of
+ code is it will be destructed after finishing its small job.
+ */
+ QTextOStream o(&fsize);
+ if (w>0) o.precision(2); else o.precision(0);
+ o.setf(QTextStream::fixed);
+ o << s << " " << q << "Byte";
+ }
+
+ curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Description().Positionlist());
+ QString filename = "";
+
+ for (unsigned int i = 0; i < body.Parts().count();++i)
+ {
+ type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype();
+ part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin();
+ for (;it!=body.Parts()[i].Parameters().end();++it)
+ {
+ qDebug(it.key());
+ if (it.key().lower()=="name")
+ {
+ filename=it.data();
+ }
+ }
+ s = body.Parts()[i].Size();
+ w = 0;
+ while (s>1024)
+ {
+ s/=1024;
+ ++w;
+ if (w>=2) break;
+ }
+ switch(w)
+ {
+ case 1:
+ q="k";
+ break;
+ case 2:
+ q="M";
+ break;
+ default:
+ q="";
+ break;
+ }
+ QTextOStream o(&fsize);
+ if (w>0) o.precision(2); else o.precision(0);
+ o.setf(QTextStream::fixed);
+ o << s << " " << q << "Byte";
+ desc = body.Parts()[i].Description();
+ parentItem = searchParent(body.Parts()[i].Positionlist());
+ if (parentItem)
+ {
+ AttachItem*temp = lastChild(parentItem);
+ if (temp) curItem = temp;
+ curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+ attachments->setRootIsDecorated(true);
+ curItem = parentItem;
+ }
+ else
+ {
+ curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+ }
}
-}
}
-void ViewMail::slotShowHtml( bool state ) {
+void ViewMail::slotShowHtml( bool state )
+{
m_showHtml = state;
setText();
}
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
+{
if (!item )
return;
- if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
+ if ( ( ( AttachItem* )item )->Partnumber() == -1 )
+ {
setText();
return;
}
QPopupMenu *menu = new QPopupMenu();
- int ret=0;
-
- if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" ) {
- menu->insertItem( tr( "Show Text" ), 1 );
- }
- menu->insertItem( tr( "Save Attachment" ), 0 );
- menu->insertSeparator(1);
-
- ret = menu->exec( point, 0 );
-
- switch(ret) {
- case 0:
- { MimeTypes types;
- types.insert( "all", "*" );
- QString str = Opie::OFileDialog::getSaveFileName( 1,
- "/", item->text( 2 ) , types, 0 );
-
- if( !str.isEmpty() ) {
- encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
- if (content) {
- QFile output(str);
- output.open(IO_WriteOnly);
- output.writeBlock(content->Content(),content->Length());
- output.close();
- delete content;
- }
- }
- }
+ int ret=0;
+
+ if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
+ {
+ menu->insertItem( tr( "Show Text" ), 1 );
+ }
+ menu->insertItem( tr( "Save Attachment" ), 0 );
+ menu->insertSeparator(1);
+
+ ret = menu->exec( point, 0 );
+
+ switch(ret)
+ {
+ case 0:
+ {
+ MimeTypes types;
+ types.insert( "all", "*" );
+ QString str = Opie::OFileDialog::getSaveFileName( 1,
+ "/", item->text( 2 ) , types, 0 );
+
+ if( !str.isEmpty() )
+ {
+ encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
+ if (content)
+ {
+ QFile output(str);
+ output.open(IO_WriteOnly);
+ output.writeBlock(content->Content(),content->Length());
+ output.close();
+ delete content;
+ }
+ }
+ }
break ;
- case 1:
- if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
- setText();
- } else {
- if ( m_recMail.Wrapper() != 0l ) { // make sure that there is a wrapper , even after delete or simular actions
+ case 1:
+ if ( ( ( AttachItem* )item )->Partnumber() == -1 )
+ {
+ setText();
+ }
+ else
+ {
+ if ( m_recMail.Wrapper() != 0l )
+ { // make sure that there is a wrapper , even after delete or simular actions
browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
- }
- }
+ }
+ }
break;
- }
- delete menu;
+ }
+ delete menu;
}
-void ViewMail::setMail( RecMail mail ) {
+void ViewMail::setMail( RecMail mail )
+{
m_recMail = mail;
@@ -248,22 +279,23 @@ void ViewMail::setMail( RecMail mail ) {
ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
- : ViewMailBase(parent, name, fl), _inLoop(false)
+ : ViewMailBase(parent, name, fl), _inLoop(false)
{
- m_gotBody = false;
- deleted = false;
+ m_gotBody = false;
+ deleted = false;
- connect( reply, SIGNAL(activated()), SLOT(slotReply()));
- connect( forward, SIGNAL(activated()), SLOT(slotForward()));
- connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) );
- connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );
+ connect( reply, SIGNAL(activated()), SLOT(slotReply()));
+ connect( forward, SIGNAL(activated()), SLOT(slotForward()));
+ connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) );
+ connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );
- attachments->setEnabled(m_gotBody);
- connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) );
+ attachments->setEnabled(m_gotBody);
+ connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) );
- readConfig();
+ readConfig();
attachments->setSorting(-1);
}
-void ViewMail::readConfig() {
+void ViewMail::readConfig()
+{
Config cfg( "mail" );
cfg.setGroup( "Settings" );
@@ -279,11 +311,14 @@ void ViewMail::setText()
QString bccString;
- for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
+ for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
+ {
toString += (*it);
}
- for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
+ for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
+ {
ccString += (*it);
}
- for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
+ for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
+ {
bccString += (*it);
}
@@ -301,8 +336,11 @@ void ViewMail::setText()
"</td></tr></table><font face=fixed>";
- if ( !m_showHtml ) {
- browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
- } else {
- browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
+ if ( !m_showHtml )
+ {
+ browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
+ }
+ else
+ {
+ browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
}
// remove later in favor of a real handling
@@ -314,16 +352,17 @@ ViewMail::~ViewMail()
{
m_recMail.Wrapper()->cleanMimeCache();
- hide();
+ hide();
}
void ViewMail::hide()
{
- QWidget::hide();
+ QWidget::hide();
- if (_inLoop) {
- _inLoop = false;
- qApp->exit_loop();
+ if (_inLoop)
+ {
+ _inLoop = false;
+ qApp->exit_loop();
- }
+ }
}
@@ -331,10 +370,11 @@ void ViewMail::hide()
void ViewMail::exec()
{
- show();
+ show();
- if (!_inLoop) {
- _inLoop = true;
- qApp->enter_loop();
- }
+ if (!_inLoop)
+ {
+ _inLoop = true;
+ qApp->enter_loop();
+ }
}
@@ -342,43 +382,45 @@ void ViewMail::exec()
QString ViewMail::deHtml(const QString &string)
{
- QString string_ = string;
- string_.replace(QRegExp("&"), "&amp;");
- string_.replace(QRegExp("<"), "&lt;");
- string_.replace(QRegExp(">"), "&gt;");
- string_.replace(QRegExp("\\n"), "<br>");
- return string_;
+ QString string_ = string;
+ string_.replace(QRegExp("&"), "&amp;");
+ string_.replace(QRegExp("<"), "&lt;");
+ string_.replace(QRegExp(">"), "&gt;");
+ string_.replace(QRegExp("\\n"), "<br>");
+ return string_;
}
void ViewMail::slotReply()
{
- if (!m_gotBody) {
- QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
- return;
- }
-
- QString rtext;
- rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
- .arg( m_mail[0] )
- .arg( m_mail[3] );
-
- QString text = m_mail[2];
- QStringList lines = QStringList::split(QRegExp("\\n"), text);
- QStringList::Iterator it;
- for (it = lines.begin(); it != lines.end(); it++) {
- rtext += "> " + *it + "\n";
- }
- rtext += "\n";
-
- QString prefix;
- if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
- else prefix = "Re: "; // no i18n on purpose
-
- Settings *settings = new Settings();
- ComposeMail composer( settings ,this, 0, true);
- composer.setTo( m_mail[0] );
- composer.setSubject( "Re: " + m_mail[1] );
- composer.setMessage( rtext );
- composer.showMaximized();
- if ( QDialog::Accepted==composer.exec()) {
+ if (!m_gotBody)
+ {
+ QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
+ return;
+ }
+
+ QString rtext;
+ rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
+ .arg( m_mail[0] )
+ .arg( m_mail[3] );
+
+ QString text = m_mail[2];
+ QStringList lines = QStringList::split(QRegExp("\\n"), text);
+ QStringList::Iterator it;
+ for (it = lines.begin(); it != lines.end(); it++)
+ {
+ rtext += "> " + *it + "\n";
+ }
+ rtext += "\n";
+
+ QString prefix;
+ if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
+ else prefix = "Re: "; // no i18n on purpose
+
+ Settings *settings = new Settings();
+ ComposeMail composer( settings ,this, 0, true);
+ composer.setTo( m_mail[0] );
+ composer.setSubject( "Re: " + m_mail[1] );
+ composer.setMessage( rtext );
+ if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
+ {
m_recMail.Wrapper()->answeredMail(m_recMail);
}
@@ -387,34 +429,34 @@ void ViewMail::slotReply()
void ViewMail::slotForward()
{
- if (!m_gotBody) {
- QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
- return;
- }
-
- QString ftext;
- ftext += QString("\n----- Forwarded message from %1 -----\n\n")
- .arg( m_mail[0] );
- if (!m_mail[3].isNull())
- ftext += QString("Date: %1\n")
- .arg( m_mail[3] );
- if (!m_mail[0].isNull())
- ftext += QString("From: %1\n")
- .arg( m_mail[0] );
- if (!m_mail[1].isNull())
- ftext += QString("Subject: %1\n")
- .arg( m_mail[1] );
-
- ftext += QString("\n%1\n")
- .arg( m_mail[2]);
-
- ftext += QString("----- End forwarded message -----\n");
-
- Settings *settings = new Settings();
- ComposeMail composer( settings ,this, 0, true);
- composer.setSubject( "Fwd: " + m_mail[1] );
- composer.setMessage( ftext );
- composer.showMaximized();
- if ( QDialog::Accepted==composer.exec()) {
+ if (!m_gotBody)
+ {
+ QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
+ return;
+ }
+ QString ftext;
+ ftext += QString("\n----- Forwarded message from %1 -----\n\n")
+ .arg( m_mail[0] );
+ if (!m_mail[3].isNull())
+ ftext += QString("Date: %1\n")
+ .arg( m_mail[3] );
+ if (!m_mail[0].isNull())
+ ftext += QString("From: %1\n")
+ .arg( m_mail[0] );
+ if (!m_mail[1].isNull())
+ ftext += QString("Subject: %1\n")
+ .arg( m_mail[1] );
+
+ ftext += QString("\n%1\n")
+ .arg( m_mail[2]);
+
+ ftext += QString("----- End forwarded message -----\n");
+
+ Settings *settings = new Settings();
+ ComposeMail composer( settings ,this, 0, true);
+ composer.setSubject( "Fwd: " + m_mail[1] );
+ composer.setMessage( ftext );
+ if ( QDialog::Accepted == QPEApplication::execDialog( &composer ))
+ {
}
}
@@ -422,5 +464,6 @@ void ViewMail::slotForward()
void ViewMail::slotDeleteMail( )
{
- if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+ if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+ {
m_recMail.Wrapper()->deleteMail( m_recMail );
hide();
diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp
index 60274d1..2d11bf0 100644
--- a/noncore/net/opieirc/ircservereditor.cpp
+++ b/noncore/net/opieirc/ircservereditor.cpp
@@ -1,7 +1,12 @@
+#include "ircservereditor.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qmessagebox.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qwhatsthis.h>
-#include "ircservereditor.h"
IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
@@ -44,5 +49,6 @@ IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char*
layout->addWidget(m_channels, 6, 1);
setCaption(tr("Edit server information"));
- showMaximized();
+
+ QPEApplication::showDialog( this );
}
diff --git a/noncore/net/opieirc/ircserverlist.cpp b/noncore/net/opieirc/ircserverlist.cpp
index 595ae3e..62bfc17 100644
--- a/noncore/net/opieirc/ircserverlist.cpp
+++ b/noncore/net/opieirc/ircserverlist.cpp
@@ -1,2 +1,10 @@
+
+#include "ircserverlist.h"
+#include "ircservereditor.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qlayout.h>
#include <qlabel.h>
@@ -4,18 +12,20 @@
#include <qpushbutton.h>
#include <qwhatsthis.h>
-#include "ircserverlist.h"
-#include "ircservereditor.h"
-class IRCListBoxServer : public QListBoxText {
+class IRCListBoxServer : public QListBoxText
+{
public:
- IRCListBoxServer(IRCServer server) : QListBoxText(server.name()) {
+ IRCListBoxServer(IRCServer server) : QListBoxText(server.name())
+ {
m_server = server;
}
- IRCServer server() {
+ IRCServer server()
+ {
return m_server;
}
-
- void setServer(IRCServer server) {
+
+ void setServer(IRCServer server)
+ {
m_server = server;
setText(m_server.name());
@@ -25,5 +35,6 @@ protected:
};
-IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
+IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp)
+{
QVBoxLayout *layout = new QVBoxLayout(this, 5, 5);
setCaption(tr("Serverlist Browser"));
@@ -49,9 +60,12 @@ IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFla
m_config->setGroup("OpieIRC");
int count = m_config->readNumEntry("ServerCount", 0);
- if (count) {
- for (int i=0; i<count; i++) {
+ if (count)
+ {
+ for (int i=0; i<count; i++)
+ {
m_config->setGroup("OpieIRC");
QString name = m_config->readEntry("Server"+QString::number(i));
- if (name.length() > 0) {
+ if (name.length() > 0)
+ {
IRCServer server;
m_config->setGroup(name);
@@ -68,12 +82,14 @@ IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFla
}
}
-
- showMaximized();
+
+ QPEApplication::showDialog( this );
}
-void IRCServerList::addServer() {
+void IRCServerList::addServer()
+{
IRCServer server;
IRCServerEditor editor(server, this, "ServerEditor", TRUE);
- if (editor.exec() == QDialog::Accepted) {
+ if (editor.exec() == QDialog::Accepted)
+ {
server = editor.getServer();
/* Gets deleted by QListBox, so this is ok */
@@ -82,18 +98,23 @@ void IRCServerList::addServer() {
}
-void IRCServerList::delServer() {
+void IRCServerList::delServer()
+{
int index = m_list->currentItem();
- if (index != -1) {
+ if (index != -1)
+ {
m_list->removeItem(index);
}
}
-void IRCServerList::editServer() {
+void IRCServerList::editServer()
+{
int index = m_list->currentItem();
- if (index != -1) {
+ if (index != -1)
+ {
IRCListBoxServer *item = (IRCListBoxServer *)m_list->item(index);
IRCServer server = item->server();
IRCServerEditor editor(server, this, "ServerEditor", TRUE);
- if (editor.exec() == QDialog::Accepted) {
+ if (editor.exec() == QDialog::Accepted)
+ {
server = editor.getServer();
item->setServer(server);
@@ -102,10 +123,12 @@ void IRCServerList::editServer() {
}
-int IRCServerList::exec() {
+int IRCServerList::exec()
+{
int returncode = QDialog::exec();
/* Now save the changes */
m_config->setGroup("OpieIRC");
m_config->writeEntry("ServerCount", QString::number(m_list->count()));
- for (unsigned int i=0; i<m_list->count(); i++) {
+ for (unsigned int i=0; i<m_list->count(); i++)
+ {
IRCServer server = ((IRCListBoxServer *)m_list->item(i))->server();
m_config->setGroup("OpieIRC");
@@ -123,13 +146,16 @@ int IRCServerList::exec() {
}
-bool IRCServerList::hasServer() {
+bool IRCServerList::hasServer()
+{
return (m_list->currentItem() != -1);
}
-IRCServer IRCServerList::server() {
+IRCServer IRCServerList::server()
+{
return ((IRCListBoxServer *)m_list->item(m_list->currentItem()))->server();
}
-IRCServerList::~IRCServerList() {
+IRCServerList::~IRCServerList()
+{
delete m_config;
}
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index 2862296..f69d2c4 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -1,10 +1,17 @@
+
+#include "ircsettings.h"
+#include "irctab.h"
+
+/* OPIE */
#include <opie/ocolorbutton.h>
#include <opie/otabwidget.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
#include <qvalidator.h>
#include <qwhatsthis.h>
-#include "ircsettings.h"
-#include "irctab.h"
-IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
+IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp)
+{
setCaption(tr("Settings") );
m_config = new Config("OpieIRC");
@@ -71,8 +78,10 @@ IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags)
tw->addTab(view, "opieirc/colors", tr("Colors"));
tw->setCurrentTab( genwidget );
- showMaximized();
+
+ QPEApplication::showDialog( this );
}
-void IRCSettings::accept() {
+void IRCSettings::accept()
+{
IRCTab::m_backgroundColor = m_background->color().name();
IRCTab::m_textColor = m_text->color().name();
@@ -94,5 +103,6 @@ void IRCSettings::accept() {
}
-IRCSettings::~IRCSettings() {
+IRCSettings::~IRCSettings()
+{
delete m_config;
}
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index 7d60d6c..9418a20 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -1,5 +1,10 @@
-#include <stdio.h>
+#include "pindlg.h"
+
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+/* QT */
#include <qcheckbox.h>
#include <qlabel.h>
@@ -7,7 +12,6 @@
#include <qtimer.h>
-#include <qpe/config.h>
-
-#include "pindlg.h"
+/* STD */
+#include <stdio.h>
using namespace OpieTooth;
@@ -16,27 +20,32 @@ PinDlg::PinDlg( const QString& status,
const QString& mac, QWidget* parent,
const char* name )
- : PinDlgBase( parent, name, WType_Modal )
+ : PinDlgBase( parent, name, WType_Modal )
{
m_mac = mac;
test( mac );
txtStatus->setText(status);
- showMaximized();
+ QPEApplication::showDialog( this );
}
-PinDlg::~PinDlg() {
-}
-void PinDlg::setMac( const QString& mac ) {
+PinDlg::~PinDlg()
+{}
+void PinDlg::setMac( const QString& mac )
+{
txtStatus->setText( mac );
}
-QString PinDlg::pin() const{
+QString PinDlg::pin() const
+{
return lnePin->text();
}
-void PinDlg::test( const QString& mac ) {
- if (!mac.isEmpty() ) {
+void PinDlg::test( const QString& mac )
+{
+ if (!mac.isEmpty() )
+ {
Config cfg("bluepin");
cfg.setGroup(mac);
lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) );
- if ( !lnePin->text().isEmpty() ) {
+ if ( !lnePin->text().isEmpty() )
+ {
//QTimer::singleShot(100, this, SLOT(accept() ) );
}
@@ -45,6 +54,8 @@ void PinDlg::test( const QString& mac ) {
}
-void PinDlg::accept() {
- if ( ckbPin->isChecked() ) {
+void PinDlg::accept()
+{
+ if ( ckbPin->isChecked() )
+ {
Config cfg("bluepin");
cfg.setGroup(m_mac );
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 2e68984..0ea45d2 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -23,9 +23,10 @@
#include "rfcommassigndialogimpl.h"
-#include <remotedevice.h>
-#include <services.h>
-
-#include <stdlib.h>
+/* OPIE */
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+/* QT */
#include <qframe.h>
#include <qlabel.h>
@@ -47,13 +48,14 @@
#include <qlist.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-
+/* STD */
+#include <remotedevice.h>
+#include <services.h>
+#include <stdlib.h>
using namespace OpieTooth;
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
- : BluetoothBase( parent, name, fl ) {
+ : BluetoothBase( parent, name, fl )
+{
m_localDevice = new Manager( "hci0" );
@@ -63,5 +65,5 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) );
-// not good since lib is async
+ // not good since lib is async
// connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
// this, SLOT( addServicesToDevice( QListViewItem * ) ) );
@@ -77,5 +79,5 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
connect( m_localDevice, SIGNAL( signalStrength( const QString&, const QString& ) ),
- this, SLOT( addSignalStrength( const QString&, const QString& ) ) );
+ this, SLOT( addSignalStrength( const QString&, const QString& ) ) );
@@ -116,5 +118,6 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
* Reads all options from the config file
*/
-void BlueBase::readConfig() {
+void BlueBase::readConfig()
+{
Config cfg( "bluetoothmanager" );
@@ -132,5 +135,6 @@ void BlueBase::readConfig() {
* Writes all options to the config file
*/
-void BlueBase::writeConfig() {
+void BlueBase::writeConfig()
+{
Config cfg( "bluetoothmanager" );
@@ -150,5 +154,6 @@ void BlueBase::writeConfig() {
* Modify the hcid.conf file to our needs
*/
-void BlueBase::writeToHciConfig() {
+void BlueBase::writeToHciConfig()
+{
qWarning("writeToHciConfig");
HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
@@ -167,5 +172,6 @@ void BlueBase::writeToHciConfig() {
* Read the list of allready known devices
*/
-void BlueBase::readSavedDevices() {
+void BlueBase::readSavedDevices()
+{
QValueList<RemoteDevice> loadedDevices;
@@ -180,10 +186,12 @@ void BlueBase::readSavedDevices() {
* Write the list of allready known devices
*/
-void BlueBase::writeSavedDevices() {
+void BlueBase::writeSavedDevices()
+{
QListViewItemIterator it( ListView2 );
BTListItem* item;
BTDeviceItem* device;
RemoteDevice::ValueList list;
- for ( ; it.current(); ++it ) {
+ for ( ; it.current(); ++it )
+ {
item = (BTListItem*)it.current();
if(item->typeId() != BTListItem::Device )
@@ -206,5 +214,6 @@ void BlueBase::writeSavedDevices() {
* Set up the gui
*/
-void BlueBase::initGui() {
+void BlueBase::initGui()
+{
StatusLabel->setText( status() ); // maybe move it to getStatus()
cryptCheckBox->setChecked( m_useEncryption );
@@ -223,5 +232,6 @@ void BlueBase::initGui() {
* @return QString the status informations gathered
*/
-QString BlueBase::status()const{
+QString BlueBase::status()const
+{
QString infoString = tr( "<b>Device name : </b> Ipaq" );
infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
@@ -235,5 +245,6 @@ QString BlueBase::status()const{
* Read the current values from the gui and invoke writeConfig()
*/
-void BlueBase::applyConfigChanges() {
+void BlueBase::applyConfigChanges()
+{
m_deviceName = deviceNameLine->text();
m_defaultPasskey = passkeyLine->text();
@@ -252,10 +263,10 @@ void BlueBase::applyConfigChanges() {
*
*/
-void BlueBase::rfcommDialog() {
+void BlueBase::rfcommDialog()
+{
RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp );
- rfcommAssign.showMaximized();
-
- if ( rfcommAssign.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
+ {
rfcommAssign.saveConfig();
}
@@ -266,9 +277,11 @@ void BlueBase::rfcommDialog() {
*
*/
-void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
+void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
+{
BTDeviceItem * deviceItem;
QValueList<RemoteDevice>::ConstIterator it;
- for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
+ for( it = newDevices.begin(); it != newDevices.end() ; ++it )
+ {
if (find( (*it) )) // is already inserted
@@ -291,6 +304,6 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
* Action that is toggled on entrys on click
*/
-void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
-}
+void BlueBase::startServiceActionClicked( QListViewItem */*item*/ )
+{}
@@ -298,5 +311,6 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
* Action that are toggled on hold (mostly QPopups i guess)
*/
-void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
+void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ )
+{
if (!item )
return;
@@ -305,5 +319,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
int ret=0;
- if ( ((BTListItem*)item)->type() == "device") {
+ if ( ((BTListItem*)item)->type() == "device")
+ {
QPopupMenu *groups = new QPopupMenu();
@@ -317,5 +332,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
ret = menu->exec( point , 0);
- switch(ret) {
+ switch(ret)
+ {
case -1:
break;
@@ -344,19 +360,24 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
*
*/
- else if ( ((BTListItem*)item)->type() == "service") {
+ else if ( ((BTListItem*)item)->type() == "service")
+ {
BTServiceItem* service = (BTServiceItem*)item;
QMap<int, QString> list = service->services().classIdList();
QMap<int, QString>::Iterator it = list.begin();
QPopupMenu *popup =0l;
- if ( it != list.end() ) {
- qWarning("Searching id %d %s", it.key(), it.data().latin1() );
+ if ( it != list.end() )
+ {
+ qWarning("Searching id %d %s", it.key(), it.data().latin1() );
popup = m_popHelper.find( it.key(),
service->services(),
(BTDeviceItem*)service->parent() );
- }else {
- qWarning("Empty");
- }
+ }
+ else
+ {
+ qWarning("Empty");
+ }
- if ( popup == 0l ) {
+ if ( popup == 0l )
+ {
qWarning("factory returned 0l");
popup = new QPopupMenu();
@@ -366,7 +387,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
ret = popup->exec( point );
qWarning("returned from exec() ");
- if ( ret == -1 ) {
+ if ( ret == -1 )
+ {
;
- } else if ( ret == test1 ) {
+ }
+ else if ( ret == test1 )
+ {
;
}
@@ -381,5 +405,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
* @param item the service item returned
*/
-void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
+void BlueBase::addServicesToDevice( BTDeviceItem * item )
+{
qDebug("addServicesToDevice");
// row of mac adress text(3)
@@ -397,5 +422,6 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
* @param servicesList the list with the service the device has.
*/
-void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) {
+void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList )
+{
qDebug("fill services list");
@@ -413,7 +439,8 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
tempList.setAutoDelete( true );
QListViewItem * child = deviceItem->firstChild();
- while( child ) {
- tempList.append( child );
- child = child->nextSibling();
+ while( child )
+ {
+ tempList.append( child );
+ child = child->nextSibling();
}
tempList.clear();
@@ -423,14 +450,17 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
- if (!servicesList.isEmpty() ) {
+ if (!servicesList.isEmpty() )
+ {
// add services
QMap<int, QString> list;
QMap<int, QString>::Iterator classIt;
- for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
+ for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 )
+ {
serviceItem = new BTServiceItem( deviceItem, (*it2) );
list = (*it2).classIdList();
classIt = list.begin();
int classId=0;
- if ( classIt != list.end() ) {
+ if ( classIt != list.end() )
+ {
classId = classIt.key();
}
@@ -438,5 +468,7 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) );
}
- } else {
+ }
+ else
+ {
Services s1;
s1.setServiceName( tr("no services found") );
@@ -451,22 +483,27 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
-void BlueBase::addSignalStrength() {
+void BlueBase::addSignalStrength()
+{
- QListViewItemIterator it( ListView4 );
- for ( ; it.current(); ++it ) {
- m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
- }
+ QListViewItemIterator it( ListView4 );
+ for ( ; it.current(); ++it )
+ {
+ m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
+ }
- QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
+ QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
}
-void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) {
+void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
+{
- QListViewItemIterator it( ListView4 );
- for ( ; it.current(); ++it ) {
- if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) {
- ((BTConnectionItem*)it.current() )->setSignalStrength( strength );
- }
- }
+ QListViewItemIterator it( ListView4 );
+ for ( ; it.current(); ++it )
+ {
+ if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
+ {
+ ((BTConnectionItem*)it.current() )->setSignalStrength( strength );
+ }
+ }
}
@@ -475,6 +512,7 @@ void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
* This one triggers the search
*/
-void BlueBase::addConnectedDevices() {
- m_localDevice->searchConnections();
+void BlueBase::addConnectedDevices()
+{
+ m_localDevice->searchConnections();
}
@@ -483,48 +521,61 @@ void BlueBase::addConnectedDevices() {
* @param connectionList the ValueList with all current connections
*/
-void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
+void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
+{
QValueList<OpieTooth::ConnectionState>::Iterator it;
BTConnectionItem * connectionItem;
- if ( !connectionList.isEmpty() ) {
+ if ( !connectionList.isEmpty() )
+ {
- for (it = connectionList.begin(); it != connectionList.end(); ++it) {
+ for (it = connectionList.begin(); it != connectionList.end(); ++it)
+ {
QListViewItemIterator it2( ListView4 );
- bool found = false;
- for ( ; it2.current(); ++it2 ) {
- if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) {
- found = true;
- }
- }
+ bool found = false;
+ for ( ; it2.current(); ++it2 )
+ {
+ if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
+ {
+ found = true;
+ }
+ }
- if ( found == false ) {
- connectionItem = new BTConnectionItem( ListView4, (*it) );
+ if ( found == false )
+ {
+ connectionItem = new BTConnectionItem( ListView4, (*it) );
- if( m_deviceList.find((*it).mac()).data() ) {
- connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
- }
- }
+ if( m_deviceList.find((*it).mac()).data() )
+ {
+ connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
+ }
+ }
- }
+ }
QListViewItemIterator it2( ListView4 );
- for ( ; it2.current(); ++it2 ) {
- bool found = false;
- for (it = connectionList.begin(); it != connectionList.end(); ++it) {
- if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) {
- found = true;
- }
+ for ( ; it2.current(); ++it2 )
+ {
+ bool found = false;
+ for (it = connectionList.begin(); it != connectionList.end(); ++it)
+ {
+ if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )
+ {
+ found = true;
+ }
}
- if ( !found ) {
- delete it2.current();
- }
+ if ( !found )
+ {
+ delete it2.current();
+ }
}
- } else {
+ }
+ else
+ {
ListView4->clear();
ConnectionState con;
@@ -542,5 +593,6 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
* @param device
*/
-void BlueBase::deviceActive( const RemoteDevice &device ) {
+void BlueBase::deviceActive( const RemoteDevice &device )
+{
// search by mac, async, gets a signal back
// We should have a BTDeviceItem there or where does it get added to the map -zecke
@@ -554,5 +606,6 @@ void BlueBase::deviceActive( const RemoteDevice &device ) {
* @param connected - if it is avail. or not
*/
-void BlueBase::deviceActive( const QString& device, bool connected ) {
+void BlueBase::deviceActive( const QString& device, bool connected )
+{
qDebug("deviceActive slot");
@@ -566,7 +619,10 @@ void BlueBase::deviceActive( const QString& device, bool connected ) {
- if ( connected ) {
+ if ( connected )
+ {
deviceItem->setPixmap( 1, m_onPix );
- } else {
+ }
+ else
+ {
deviceItem->setPixmap( 1, m_offPix );
}
@@ -578,5 +634,6 @@ void BlueBase::deviceActive( const QString& device, bool connected ) {
* Open the "scan for devices" dialog
*/
-void BlueBase::startScan() {
+void BlueBase::startScan()
+{
ScanDialog *scan = new ScanDialog( this, "ScanDialog",
true, WDestructiveClose );
@@ -584,5 +641,5 @@ void BlueBase::startScan() {
this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) );
- scan->showMaximized();
+ QPEApplication::showDialog( scan );
}
@@ -591,5 +648,6 @@ void BlueBase::startScan() {
* Set the informations about the local device in information Tab
*/
-void BlueBase::setInfo() {
+void BlueBase::setInfo()
+{
StatusLabel->setText( status() );
}
@@ -599,5 +657,6 @@ void BlueBase::setInfo() {
* Decontructor
*/
-BlueBase::~BlueBase() {
+BlueBase::~BlueBase()
+{
writeSavedDevices();
delete m_iconLoader;
@@ -611,9 +670,11 @@ BlueBase::~BlueBase() {
* @return returns true if found
*/
-bool BlueBase::find( const RemoteDevice& rem ) {
+bool BlueBase::find( const RemoteDevice& rem )
+{
QListViewItemIterator it( ListView2 );
BTListItem* item;
BTDeviceItem* device;
- for (; it.current(); ++it ) {
+ for (; it.current(); ++it )
+ {
item = (BTListItem*) it.current();
if ( item->typeId() != BTListItem::Device )
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp
index a550648..d147d52 100644
--- a/noncore/net/opietooth/manager/obexpopup.cpp
+++ b/noncore/net/opietooth/manager/obexpopup.cpp
@@ -1,8 +1,12 @@
-#include <qtimer.h>
-
#include "obexdialog.h"
#include "obexpopup.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qtimer.h>
+
using namespace OpieTooth;
@@ -11,5 +15,6 @@ using namespace OpieTooth;
*/
ObexPopup::ObexPopup()
- : QPopupMenu() {
+ : QPopupMenu()
+{
qWarning("RfcCommPopup c'tor");
@@ -25,16 +30,15 @@ ObexPopup::ObexPopup()
-ObexPopup::~ObexPopup() {
-}
+ObexPopup::~ObexPopup()
+{}
-void ObexPopup::slotPush() {
+void ObexPopup::slotPush()
+{
qWarning("push something");
-
ObexDialog obexDialog;
- obexDialog.showMaximized();
- obexDialog.exec();
+ QPEApplication::execDialog( &obexDialog );
}
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
index b5cc074..fc76301 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -4,6 +4,9 @@
#include "rfcommconfhandler.h"
+/* OPIE */
#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+/* QT */
#include <qlayout.h>
@@ -16,5 +19,6 @@ using namespace OpieTooth;
RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
- : RfcommAssignDialogBase( parent, name, modal, fl ) {
+ : RfcommAssignDialogBase( parent, name, modal, fl )
+{
m_range = 5;
@@ -34,6 +38,8 @@ RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool
}
-RfcommAssignDialog::~RfcommAssignDialog() {
- if ( confHandler ) {
+RfcommAssignDialog::~RfcommAssignDialog()
+{
+ if ( confHandler )
+ {
delete confHandler;
}
@@ -41,19 +47,23 @@ RfcommAssignDialog::~RfcommAssignDialog() {
-void RfcommAssignDialog::newDevice( const QString & mac ) {
+void RfcommAssignDialog::newDevice( const QString & mac )
+{
- for ( int i = 0 ; i < m_range; i++ ) {
+ for ( int i = 0 ; i < m_range; i++ )
+ {
QMap<QString, RfCommConfObject*>::Iterator it;
it = confHandler->foundEntries().find( QString("%1").arg( i ) );
// make sure that rfcommX is not assigned yet
- if ( it == confHandler->foundEntries().end() ) {
+ if ( it == confHandler->foundEntries().end() )
+ {
QDialog dialog( this, "newdevice", true, WStyle_ContextHelp );
- dialog.showMaximized();
+
RfcommDialogItem *newDev = new RfcommDialogItem( &dialog );
newDev->setIdent( i );
newDev->setMac( mac );
- if ( dialog.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted )
+ {
RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
m_itemList.insert( i , rfcomm );
@@ -68,9 +78,11 @@ void RfcommAssignDialog::newDevice( const QString & mac ) {
}
-void RfcommAssignDialog::loadConfig() {
+void RfcommAssignDialog::loadConfig()
+{
//Config cfg( "bluetoothmanager-rfcommbind" );
- for ( int i = 0 ; i < m_range; i++ ) {
+ for ( int i = 0 ; i < m_range; i++ )
+ {
// cfg.setGroup( QString("%1").arg( i ) );
RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
@@ -79,5 +91,6 @@ void RfcommAssignDialog::loadConfig() {
QMap<QString, RfCommConfObject*>::Iterator it;
it = confHandler->foundEntries().find( QString("%1").arg( i ) );
- if ( it != confHandler->foundEntries().end() ) {
+ if ( it != confHandler->foundEntries().end() )
+ {
qDebug( "Found key in foundEntries() " );
rfcomm->setMac( it.data()->mac() );
@@ -85,14 +98,15 @@ void RfcommAssignDialog::loadConfig() {
rfcomm->setComment( it.data()->comment() );
}
- /* Use rfcomm.conf directly for now
- * rfcomm->setMac( cfg.readEntry( "mac", "" ) );
- * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) );
- * rfcomm->setComment( cfg.readEntry( "comment", "" ) );
- */
+ /* Use rfcomm.conf directly for now
+ * rfcomm->setMac( cfg.readEntry( "mac", "" ) );
+ * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) );
+ * rfcomm->setComment( cfg.readEntry( "comment", "" ) );
+ */
}
}
-void RfcommAssignDialog::saveConfig() {
+void RfcommAssignDialog::saveConfig()
+{
//Config cfg( "bluetoothmanager-rfcommbind" );
@@ -102,5 +116,6 @@ void RfcommAssignDialog::saveConfig() {
QMap< QString, RfCommConfObject*> outMap;
- for( it = m_itemList.begin(); it != m_itemList.end(); ++it ) {
+ for( it = m_itemList.begin(); it != m_itemList.end(); ++it )
+ {
//cfg.setGroup( QString("%1").arg( it.key() ) );
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index d95f14b..04bfe48 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -1,9 +1,13 @@
-#include <qtimer.h>
-
#include "pppdialog.h"
#include "rfcpopup.h"
#include "rfcommassigndialogimpl.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qtimer.h>
+
using namespace OpieTooth;
@@ -12,5 +16,6 @@ using namespace OpieTooth;
*/
RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
- : QPopupMenu() {
+ : QPopupMenu()
+{
qWarning("RfcCommPopup c'tor");
@@ -33,5 +38,5 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
a->addTo( this );
connect( a, SIGNAL( activated() ) ,
- this, SLOT( slotDisconnect() ) );
+ this, SLOT( slotDisconnect() ) );
@@ -41,5 +46,5 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
a->addTo( this );
connect( a, SIGNAL( activated() ),
- this, SLOT( slotBind() ) );
+ this, SLOT( slotBind() ) );
@@ -49,41 +54,42 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
a->addTo( this );
connect( a, SIGNAL( activated() ),
- this, SLOT( slotBar() ) );
+ this, SLOT( slotBar() ) );
};
-RfcCommPopup::~RfcCommPopup() {
-/* delete m_con;
- delete m_dis;
- delete m_foo;
- delete m_bar; */
+RfcCommPopup::~RfcCommPopup()
+{
+ /* delete m_con;
+ delete m_dis;
+ delete m_foo;
+ delete m_bar; */
}
-void RfcCommPopup::slotConnect() {
+void RfcCommPopup::slotConnect()
+{
qWarning("connect");
-
-
PPPDialog pppDialog;
- pppDialog.showMaximized();
- pppDialog.exec();
+ QPEApplication::execDialog( &pppDialog );
}
-void RfcCommPopup::slotDisconnect() {
+void RfcCommPopup::slotDisconnect()
+{
qWarning("slot disconnected");
}
-void RfcCommPopup::slotBind() {
+void RfcCommPopup::slotBind()
+{
RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp );
- rfcommAssign.showMaximized();
rfcommAssign.newDevice( m_item->mac() );
- if ( rfcommAssign.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
+ {
rfcommAssign.saveConfig();
}
@@ -91,5 +97,6 @@ void RfcCommPopup::slotBind() {
-void RfcCommPopup::slotBar() {
+void RfcCommPopup::slotBar()
+{
qWarning("slotBar");
};
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 3729ed0..95a8294 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -178,8 +178,5 @@ void WellenreiterMainWindow::showConfigure()
qDebug( "show configure..." );
cw->setCaption( tr( "Configure" ) );
- #ifdef QWS
- cw->showMaximized();
- #endif
- int result = cw->exec();
+ int result = QPEApplication::execDialog( cw );
if ( result ) updateToolButtonState();