-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.h | 14 |
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 | |||
@@ -13,3 +13,2 @@ | |||
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | #include "settingsdialog.h" | ||
15 | #include "viewmail.h" | 14 | #include "viewmail.h" |
@@ -82,3 +81,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
82 | SLOT( slotEditSettings() ) ); | 81 | SLOT( slotEditSettings() ) ); |
83 | |||
84 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, | 82 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, |
@@ -159,6 +157,4 @@ void MainWindow::slotAdjustColumns() | |||
159 | 157 | ||
160 | void MainWindow::slotEditSettings() { | 158 | void MainWindow::slotEditSettings() |
161 | SettingsDialog settingsDialog( this, 0, true ); | 159 | { |
162 | settingsDialog.showMaximized(); | ||
163 | settingsDialog.exec(); | ||
164 | } | 160 | } |
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 | |||
@@ -23,3 +23,3 @@ public: | |||
23 | public slots: | 23 | public slots: |
24 | void slotAdjustColumns(); | 24 | virtual void slotAdjustColumns(); |
25 | 25 | ||
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,2 +1,3 @@ | |||
1 | #include <qmessagebox.h> | 1 | #include <qmessagebox.h> |
2 | #include "settingsdialog.h" | ||
2 | #include "opiemail.h" | 3 | #include "opiemail.h" |
@@ -19,3 +20,2 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | |||
19 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); | 20 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); |
20 | connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) ); | ||
21 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); | 21 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); |
@@ -94,3 +94,5 @@ void OpieMail::slotEditSettings() | |||
94 | { | 94 | { |
95 | qDebug( "Edit Settings" ); | 95 | SettingsDialog settingsDialog( this, 0, true ); |
96 | settingsDialog.showMaximized(); | ||
97 | settingsDialog.exec(); | ||
96 | } | 98 | } |
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 | |||
@@ -15,10 +15,10 @@ public: | |||
15 | public slots: | 15 | public slots: |
16 | void slotwriteMail(const QString&name,const QString&email); | 16 | virtual void slotwriteMail(const QString&name,const QString&email); |
17 | void slotComposeMail(); | 17 | virtual void slotComposeMail(); |
18 | void appMessage(const QCString &msg, const QByteArray &data); | 18 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
19 | protected slots: | 19 | protected slots: |
20 | void slotSendQueued(); | 20 | virtual void slotSendQueued(); |
21 | void slotSearchMails(); | 21 | virtual void slotSearchMails(); |
22 | void slotEditSettings(); | 22 | virtual void slotEditSettings(); |
23 | void slotEditAccounts(); | 23 | virtual void slotEditAccounts(); |
24 | private: | 24 | private: |