Diffstat (limited to 'noncore/net/mail/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 9a37510..d3b9c34 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -12,8 +12,10 @@ | |||
12 | #include "defines.h" | 12 | #include "defines.h" |
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | #include "settingsdialog.h" | ||
14 | #include "viewmail.h" | 15 | #include "viewmail.h" |
15 | #include "mailtypes.h" | 16 | #include "mailtypes.h" |
16 | #include "mailistviewitem.h" | 17 | #include "mailistviewitem.h" |
17 | 18 | ||
19 | |||
18 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 20 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
19 | : QMainWindow( parent, name, flags ) | 21 | : QMainWindow( parent, name, flags ) |
@@ -46,8 +48,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
46 | sendQueued->addTo( mailMenu ); | 48 | sendQueued->addTo( mailMenu ); |
47 | 49 | ||
50 | /* | ||
48 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, | 51 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, |
49 | 0, 0, this ); | 52 | 0, 0, this ); |
50 | syncFolders->addTo( toolBar ); | 53 | syncFolders->addTo( toolBar ); |
51 | syncFolders->addTo( mailMenu ); | 54 | syncFolders->addTo( mailMenu ); |
55 | */ | ||
52 | 56 | ||
53 | showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS, | 57 | showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS, |
@@ -59,8 +63,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
59 | SLOT( slotShowFolders( bool ) ) ); | 63 | SLOT( slotShowFolders( bool ) ) ); |
60 | 64 | ||
61 | searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS, | 65 | /* |
66 | searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS, | ||
62 | 0, 0, this ); | 67 | 0, 0, this ); |
63 | searchMails->addTo( toolBar ); | 68 | searchMails->addTo( toolBar ); |
64 | searchMails->addTo( mailMenu ); | 69 | searchMails->addTo( mailMenu ); |
70 | */ | ||
65 | 71 | ||
66 | deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); | 72 | deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); |
@@ -73,4 +79,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
73 | 0, 0, this ); | 79 | 0, 0, this ); |
74 | editSettings->addTo( settingsMenu ); | 80 | editSettings->addTo( settingsMenu ); |
81 | connect( editSettings, SIGNAL( activated() ), | ||
82 | SLOT( slotEditSettings() ) ); | ||
75 | 83 | ||
76 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, | 84 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, |
@@ -78,5 +86,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
78 | editAccounts->addTo( settingsMenu ); | 86 | editAccounts->addTo( settingsMenu ); |
79 | 87 | ||
80 | QWidget *view = new QWidget( this ); | 88 | QWidget *view = new QWidget( this ); |
81 | setCentralWidget( view ); | 89 | setCentralWidget( view ); |
82 | 90 | ||
@@ -100,8 +108,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
100 | mailView->setSorting(-1); | 108 | mailView->setSorting(-1); |
101 | 109 | ||
110 | statusWidget = new StatusWidget( view ); | ||
111 | |||
102 | layout->addWidget( mailView ); | 112 | layout->addWidget( mailView ); |
113 | layout->addWidget( statusWidget ); | ||
103 | layout->setStretchFactor( folderView, 1 ); | 114 | layout->setStretchFactor( folderView, 1 ); |
104 | layout->setStretchFactor( mailView, 2 ); | 115 | layout->setStretchFactor( mailView, 2 ); |
105 | 116 | ||
117 | |||
106 | slotAdjustLayout(); | 118 | slotAdjustLayout(); |
107 | 119 | ||
@@ -142,4 +154,10 @@ void MainWindow::slotAdjustColumns() | |||
142 | } | 154 | } |
143 | 155 | ||
156 | void MainWindow::slotEditSettings() { | ||
157 | SettingsDialog settingsDialog( this, 0, true ); | ||
158 | settingsDialog.showMaximized(); | ||
159 | settingsDialog.exec(); | ||
160 | } | ||
161 | |||
144 | void MainWindow::slotShowFolders( bool show ) | 162 | void MainWindow::slotShowFolders( bool show ) |
145 | { | 163 | { |
@@ -180,5 +198,5 @@ void MainWindow::displayMail(QListViewItem*item) | |||
180 | folderView->refreshCurrent(); | 198 | folderView->refreshCurrent(); |
181 | } else { | 199 | } else { |
182 | ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") ); | 200 | ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "") ); |
183 | } | 201 | } |
184 | } | 202 | } |