summaryrefslogtreecommitdiffabout
path: root/kmicromail
Unidiff
Diffstat (limited to 'kmicromail') (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
@@ -34,5 +34,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
34 34
35 QLabel *spacer = new QLabel( toolBar ); 35
36 spacer->setBackgroundMode( QWidget::PaletteButton );
37 toolBar->setStretchableWidget( spacer );
38 36
@@ -135,4 +133,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
135 connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); 133 connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
136 mailView->setMultiSelection ( true ); 134 //mailView->setMultiSelection ( true );
137 //mailView->setSelectionMode( QListView::Extended ); 135 mailView->setSelectionMode( QListView::Extended );
138 QValueList<int> list; 136 QValueList<int> list;
@@ -145,3 +143,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
145 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); 143 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
146 mailView->setShowSortIndicator ( true ); 144 mailView->setShowSortIndicator ( true );
145 QLabel *spacer = new QLabel( toolBar );
146 spacer->setBackgroundMode( QWidget::PaletteButton );
147 toolBar->setStretchableWidget( spacer );
148
149 QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
150 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
151 closeMail->addTo(toolBar);
152 closeMail->addTo(mailMenu);
147} 153}
@@ -178,6 +184,6 @@ void MainWindow::slotAdjustColumns()
178 mailView->setColumnWidth( 0, 10 ); 184 mailView->setColumnWidth( 0, 10 );
179 mailView->setColumnWidth( 1, 80 ); 185 mailView->setColumnWidth( 1, 100 );
180 mailView->setColumnWidth( 2, 80 ); 186 mailView->setColumnWidth( 2, 100 );
181 mailView->setColumnWidth( 3, 50 ); 187 mailView->setColumnWidth( 3, 50 );
182 mailView->setColumnWidth( 4, 50 ); 188 mailView->setColumnWidth( 4, 120 );
183} 189}
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index b434318..703711d 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -315,3 +315,4 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
315 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); 315 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
316 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 316 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
317 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
317 318
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 2590481..584a0ac 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -28,6 +28,2 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
28 28
29 QLabel *spacer = new QLabel(toolbar);
30 spacer->setBackgroundMode(QWidget::PaletteButton);
31 toolbar->setStretchableWidget(spacer);
32
33 reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this); 29 reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
@@ -50,6 +46,11 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
50 46
51 deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this); 47 deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
52 deleteMail->addTo(toolbar); 48 deleteMail->addTo(toolbar);
53 deleteMail->addTo(mailmenu); 49 deleteMail->addTo(mailmenu);
54 50 closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
51 QLabel *spacer = new QLabel(toolbar);
52 spacer->setBackgroundMode(QWidget::PaletteButton);
53 toolbar->setStretchableWidget(spacer);
54 closeMail->addTo(toolbar);
55 closeMail->addTo(mailmenu);
55 QVBox *view = new QVBox(this); 56 QVBox *view = new QVBox(this);
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index fdaad2a..c29d143 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -21,3 +21,3 @@ public:
21protected: 21protected:
22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml; 22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
23 QListView *attachments; 23 QListView *attachments;