Diffstat (limited to 'noncore/net/mail/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 8 |
1 files changed, 2 insertions, 6 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 | |||
@@ -2,25 +2,24 @@ | |||
2 | #include <qvbox.h> | 2 | #include <qvbox.h> |
3 | #include <qheader.h> | 3 | #include <qheader.h> |
4 | #include <qtimer.h> | 4 | #include <qtimer.h> |
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | #include <qmessagebox.h> | 6 | #include <qmessagebox.h> |
7 | #include <qtextstream.h> | 7 | #include <qtextstream.h> |
8 | 8 | ||
9 | #include <qpe/qpeapplication.h> | 9 | #include <qpe/qpeapplication.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include "defines.h" | 12 | #include "defines.h" |
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | #include "settingsdialog.h" | ||
15 | #include "viewmail.h" | 14 | #include "viewmail.h" |
16 | #include "mailtypes.h" | 15 | #include "mailtypes.h" |
17 | #include "mailistviewitem.h" | 16 | #include "mailistviewitem.h" |
18 | 17 | ||
19 | 18 | ||
20 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
21 | : QMainWindow( parent, name, flags ) | 20 | : QMainWindow( parent, name, flags ) |
22 | { | 21 | { |
23 | setCaption( tr( "Mail" ) ); | 22 | setCaption( tr( "Mail" ) ); |
24 | setToolBarsMovable( false ); | 23 | setToolBarsMovable( false ); |
25 | 24 | ||
26 | toolBar = new QToolBar( this ); | 25 | toolBar = new QToolBar( this ); |
@@ -71,25 +70,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
71 | 70 | ||
72 | deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); | 71 | deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); |
73 | deleteMails->addTo( toolBar ); | 72 | deleteMails->addTo( toolBar ); |
74 | deleteMails->addTo( mailMenu ); | 73 | deleteMails->addTo( mailMenu ); |
75 | connect( deleteMails, SIGNAL( activated() ), | 74 | connect( deleteMails, SIGNAL( activated() ), |
76 | SLOT( slotDeleteMail() ) ); | 75 | SLOT( slotDeleteMail() ) ); |
77 | 76 | ||
78 | editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS, | 77 | editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS, |
79 | 0, 0, this ); | 78 | 0, 0, this ); |
80 | editSettings->addTo( settingsMenu ); | 79 | editSettings->addTo( settingsMenu ); |
81 | connect( editSettings, SIGNAL( activated() ), | 80 | connect( editSettings, SIGNAL( activated() ), |
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, |
85 | 0, 0, this ); | 83 | 0, 0, this ); |
86 | editAccounts->addTo( settingsMenu ); | 84 | editAccounts->addTo( settingsMenu ); |
87 | 85 | ||
88 | //setCentralWidget( view ); | 86 | //setCentralWidget( view ); |
89 | 87 | ||
90 | QVBox* wrapperBox = new QVBox( this ); | 88 | QVBox* wrapperBox = new QVBox( this ); |
91 | setCentralWidget( wrapperBox ); | 89 | setCentralWidget( wrapperBox ); |
92 | 90 | ||
93 | QWidget *view = new QWidget( wrapperBox ); | 91 | QWidget *view = new QWidget( wrapperBox ); |
94 | 92 | ||
95 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); | 93 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); |
@@ -148,28 +146,26 @@ void MainWindow::slotAdjustColumns() | |||
148 | bool hidden = folderView->isHidden(); | 146 | bool hidden = folderView->isHidden(); |
149 | if ( hidden ) folderView->show(); | 147 | if ( hidden ) folderView->show(); |
150 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 148 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
151 | if ( hidden ) folderView->hide(); | 149 | if ( hidden ) folderView->hide(); |
152 | 150 | ||
153 | mailView->setColumnWidth( 0, 10 ); | 151 | mailView->setColumnWidth( 0, 10 ); |
154 | mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 ); | 152 | mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 ); |
155 | mailView->setColumnWidth( 2, 80 ); | 153 | mailView->setColumnWidth( 2, 80 ); |
156 | mailView->setColumnWidth( 3, 50 ); | 154 | mailView->setColumnWidth( 3, 50 ); |
157 | mailView->setColumnWidth( 4, 50 ); | 155 | mailView->setColumnWidth( 4, 50 ); |
158 | } | 156 | } |
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 | } |
165 | 161 | ||
166 | void MainWindow::slotShowFolders( bool show ) | 162 | void MainWindow::slotShowFolders( bool show ) |
167 | { | 163 | { |
168 | qDebug( "Show Folders" ); | 164 | qDebug( "Show Folders" ); |
169 | if ( show && folderView->isHidden() ) { | 165 | if ( show && folderView->isHidden() ) { |
170 | qDebug( "-> showing" ); | 166 | qDebug( "-> showing" ); |
171 | folderView->show(); | 167 | folderView->show(); |
172 | } else if ( !show && !folderView->isHidden() ) { | 168 | } else if ( !show && !folderView->isHidden() ) { |
173 | qDebug( "-> hiding" ); | 169 | qDebug( "-> hiding" ); |
174 | folderView->hide(); | 170 | folderView->hide(); |
175 | } | 171 | } |