summaryrefslogtreecommitdiff
authoralwin <alwin>2004-01-02 23:58:44 (UTC)
committer alwin <alwin>2004-01-02 23:58:44 (UTC)
commit86cac2c819dd683ac3f13be2c3bf1f28e0b83dab (patch) (side-by-side diff)
tree3ee125def2a60097d19c22bbd155ef1353f68f85
parent9dbd01bcb23a56171d7ec24a9ca3fcd6f62bc6ab (diff)
downloadopie-86cac2c819dd683ac3f13be2c3bf1f28e0b83dab.zip
opie-86cac2c819dd683ac3f13be2c3bf1f28e0b83dab.tar.gz
opie-86cac2c819dd683ac3f13be2c3bf1f28e0b83dab.tar.bz2
settings dialog will show when clicked.
slots are all virtual so always the right one is called! Note: It is better to make all slots declared virtual - or do not make any child-classes!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/mainwindow.cpp8
-rw-r--r--noncore/net/mail/mainwindow.h2
-rw-r--r--noncore/net/mail/opiemail.cpp6
-rw-r--r--noncore/net/mail/opiemail.h14
4 files changed, 14 insertions, 16 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index cf4cbe8..2a74286 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -12,5 +12,4 @@
#include "defines.h"
#include "mainwindow.h"
-#include "settingsdialog.h"
#include "viewmail.h"
#include "mailtypes.h"
@@ -81,5 +80,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
connect( editSettings, SIGNAL( activated() ),
SLOT( slotEditSettings() ) );
-
editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
0, 0, this );
@@ -158,8 +156,6 @@ void MainWindow::slotAdjustColumns()
}
-void MainWindow::slotEditSettings() {
- SettingsDialog settingsDialog( this, 0, true );
- settingsDialog.showMaximized();
- settingsDialog.exec();
+void MainWindow::slotEditSettings()
+{
}
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 638232a..0e077f6 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -22,5 +22,5 @@ public:
public slots:
- void slotAdjustColumns();
+ virtual void slotAdjustColumns();
protected slots:
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 2909893..e35f5b6 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,3 +1,4 @@
#include <qmessagebox.h>
+#include "settingsdialog.h"
#include "opiemail.h"
#include "editaccounts.h"
@@ -18,5 +19,4 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
- connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) );
connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
// Added by Stefan Eilers to allow starting by addressbook..
@@ -93,5 +93,7 @@ void OpieMail::slotSearchMails()
void OpieMail::slotEditSettings()
{
- qDebug( "Edit Settings" );
+ SettingsDialog settingsDialog( this, 0, true );
+ settingsDialog.showMaximized();
+ settingsDialog.exec();
}
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 8cbcaa4..4e3c974 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -14,12 +14,12 @@ public:
public slots:
- void slotwriteMail(const QString&name,const QString&email);
- void slotComposeMail();
- void appMessage(const QCString &msg, const QByteArray &data);
+ virtual void slotwriteMail(const QString&name,const QString&email);
+ virtual void slotComposeMail();
+ virtual void appMessage(const QCString &msg, const QByteArray &data);
protected slots:
- void slotSendQueued();
- void slotSearchMails();
- void slotEditSettings();
- void slotEditAccounts();
+ virtual void slotSendQueued();
+ virtual void slotSearchMails();
+ virtual void slotEditSettings();
+ virtual void slotEditAccounts();
private:
Settings *settings;