summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-17 00:18:06 (UTC)
committer harlekin <harlekin>2003-12-17 00:18:06 (UTC)
commitfb054f9c69224e14f446f405098bd5166377f58d (patch) (side-by-side diff)
tree6c729398a7f69eedf5554aa3c2509784eb9806df
parent30e3e50ecb912e93faeeafbfff36f8032a904b84 (diff)
downloadopie-fb054f9c69224e14f446f405098bd5166377f58d.zip
opie-fb054f9c69224e14f446f405098bd5166377f58d.tar.gz
opie-fb054f9c69224e14f446f405098bd5166377f58d.tar.bz2
new account, changed account etc are there now without a restart ,)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/editaccounts.cpp29
-rw-r--r--noncore/net/mail/opiemail.cpp9
-rw-r--r--noncore/net/mail/opiemail.h5
3 files changed, 25 insertions, 18 deletions
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 1c80adb..1246037 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -17,10 +17,10 @@ EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool
qDebug( "New Account Configuration Widget" );
settings = s;
-
+
mailList->addColumn( tr( "Account" ) );
mailList->addColumn( tr( "Type" ) );
newsList->addColumn( tr( "Account" ) );
-
+
connect( newMail, SIGNAL( clicked() ), SLOT( slotNewMail() ) );
connect( editMail, SIGNAL( clicked() ), SLOT( slotEditMail() ) );
@@ -71,5 +71,5 @@ void EditAccounts::slotNewAccount( const QString &type )
account->save();
slotFillLists();
- } else {
+ } else {
account->remove();
}
@@ -95,4 +95,5 @@ void EditAccounts::slotNewAccount( const QString &type )
account->save();
slotFillLists();
+
} else {
account->remove();
@@ -148,5 +149,5 @@ void EditAccounts::slotEditAccount( Account *account )
void EditAccounts::slotDeleteAccount( Account *account )
{
- if ( QMessageBox::information( this, tr( "Question" ),
+ if ( QMessageBox::information( this, tr( "Question" ),
tr( "<p>Do you really want to delete the selected Account?</p>" ),
tr( "Yes" ), tr( "No" ) ) == 0 ) {
@@ -160,5 +161,5 @@ void EditAccounts::slotEditMail()
qDebug( "Edit Mail Account" );
if ( !mailList->currentItem() ) {
- QMessageBox::information( this, tr( "Error" ),
+ QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
tr( "Ok" ) );
@@ -173,10 +174,10 @@ void EditAccounts::slotDeleteMail()
{
if ( !mailList->currentItem() ) {
- QMessageBox::information( this, tr( "Error" ),
+ QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
tr( "Ok" ) );
return;
}
-
+
Account *a = ((AccountListItem *) mailList->currentItem())->getAccount();
slotDeleteAccount( a );
@@ -193,5 +194,5 @@ void EditAccounts::slotEditNews()
qDebug( "Edit News Account" );
if ( !newsList->currentItem() ) {
- QMessageBox::information( this, tr( "Error" ),
+ QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
tr( "Ok" ) );
@@ -207,10 +208,10 @@ void EditAccounts::slotDeleteNews()
qDebug( "Delete News Account" );
if ( !newsList->currentItem() ) {
- QMessageBox::information( this, tr( "Error" ),
+ QMessageBox::information( this, tr( "Error" ),
tr( "<p>Please select an account.</p>" ),
tr( "Ok" ) );
return;
}
-
+
Account *a = ((AccountListItem *) newsList->currentItem())->getAccount();
slotDeleteAccount( a );
@@ -220,5 +221,5 @@ void EditAccounts::slotAdjustColumns()
{
int currPage = configTab->currentPageIndex();
-
+
configTab->showPage( mailTab );
mailList->setColumnWidth( 0, mailList->visibleWidth() - 50 );
@@ -234,5 +235,5 @@ void EditAccounts::accept()
{
settings->saveAccounts();
-
+
QDialog::accept();
}
@@ -263,5 +264,5 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
{
data = account;
-
+
fillValues();
@@ -430,5 +431,5 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
connect( loginBox, SIGNAL( toggled( bool ) ), userLine, SLOT( setEnabled( bool ) ) );
connect( loginBox, SIGNAL( toggled( bool ) ), passLine, SLOT( setEnabled( bool ) ) );
-
+
fillValues();
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 93f3bb7..740e4cf 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -7,7 +7,7 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
{
settings = new Settings();
-
+
folderView->populate( settings->getAccounts() );
-
+
connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
@@ -48,3 +48,8 @@ void OpieMail::slotEditAccounts()
eaDialog.slotAdjustColumns();
eaDialog.exec();
+ if ( settings ) delete settings;
+ settings = new Settings();
+
+ folderView->populate( settings->getAccounts() );
}
+
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 7bcd818..ba60297 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -12,11 +12,12 @@ public:
OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
static QString appName() { return QString::fromLatin1("opiemail"); }
-protected slots:
+
+public slots:
void slotComposeMail();
+protected slots:
void slotSendQueued();
void slotSearchMails();
void slotEditSettings();
void slotEditAccounts();
-
private:
Settings *settings;