summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/mainwindow.cpp24
-rw-r--r--kmicromail/viewmail.cpp3
-rw-r--r--kmicromail/viewmailbase.cpp13
-rw-r--r--kmicromail/viewmailbase.h2
4 files changed, 25 insertions, 17 deletions
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index ddc7b3e..a500dec 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -32,9 +32,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
addToolBar( toolBar );
toolBar->setHorizontalStretchable( true );
- QLabel *spacer = new QLabel( toolBar );
- spacer->setBackgroundMode( QWidget::PaletteButton );
- toolBar->setStretchableWidget( spacer );
+
composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
0, 0, this );
@@ -133,8 +131,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
- mailView->setMultiSelection ( true );
- //mailView->setSelectionMode( QListView::Extended );
+ //mailView->setMultiSelection ( true );
+ mailView->setSelectionMode( QListView::Extended );
QValueList<int> list;
int fw = 100;
if ( QApplication::desktop()->width() > 320 )
@@ -143,7 +141,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
list.append( 100 );
split->setSizes( list );
QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
- mailView->setShowSortIndicator ( true );
+ mailView->setShowSortIndicator ( true );
+ QLabel *spacer = new QLabel( toolBar );
+ spacer->setBackgroundMode( QWidget::PaletteButton );
+ toolBar->setStretchableWidget( spacer );
+
+ QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
+ connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
+ closeMail->addTo(toolBar);
+ closeMail->addTo(mailMenu);
}
MainWindow::~MainWindow()
@@ -176,10 +182,10 @@ void MainWindow::slotAdjustColumns()
if ( hidden ) folderView->hide();
mailView->setColumnWidth( 0, 10 );
- mailView->setColumnWidth( 1, 80 );
- mailView->setColumnWidth( 2, 80 );
+ mailView->setColumnWidth( 1, 100 );
+ mailView->setColumnWidth( 2, 100 );
mailView->setColumnWidth( 3, 50 );
- mailView->setColumnWidth( 4, 50 );
+ mailView->setColumnWidth( 4, 120 );
}
void MainWindow::slotEditSettings()
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index b434318..703711d 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -313,7 +313,8 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
connect( reply, SIGNAL(activated()), SLOT(slotReply()));
connect( forward, SIGNAL(activated()), SLOT(slotForward()));
connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
- connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
+ connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
+ connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
attachments->setEnabled(m_gotBody);
connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 2590481..584a0ac 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -26,10 +26,6 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
toolbar->setHorizontalStretchable(true);
addToolBar(toolbar);
- QLabel *spacer = new QLabel(toolbar);
- spacer->setBackgroundMode(QWidget::PaletteButton);
- toolbar->setStretchableWidget(spacer);
-
reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
reply->addTo(toolbar);
reply->addTo(mailmenu);
@@ -48,10 +44,15 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
showHtml->addTo( toolbar );
showHtml->addTo( mailmenu );
- deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
+ deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
deleteMail->addTo(toolbar);
deleteMail->addTo(mailmenu);
-
+ closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
+ QLabel *spacer = new QLabel(toolbar);
+ spacer->setBackgroundMode(QWidget::PaletteButton);
+ toolbar->setStretchableWidget(spacer);
+ closeMail->addTo(toolbar);
+ closeMail->addTo(mailmenu);
QVBox *view = new QVBox(this);
setCentralWidget(view);
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index fdaad2a..c29d143 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -19,7 +19,7 @@ public:
ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
protected:
- QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
+ QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
QListView *attachments;
QToolBar *toolbar;
QTextBrowser *browser;