summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-04 17:18:13 (UTC)
committer zautrix <zautrix>2004-07-04 17:18:13 (UTC)
commit25671b4735f2604e13f4d6801b96f016ac8b9834 (patch) (unidiff)
tree8fb194ccfbec635f1ada9db16b76e81f72387216
parent48bea7694899530fdfdbc0a2fefab6d3e64be1e1 (diff)
downloadkdepimpi-25671b4735f2604e13f4d6801b96f016ac8b9834.zip
kdepimpi-25671b4735f2604e13f4d6801b96f016ac8b9834.tar.gz
kdepimpi-25671b4735f2604e13f4d6801b96f016ac8b9834.tar.bz2
Usebility enhancement:Removed trash from toolbar, added exit button
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
@@ -29,15 +29,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
29 settingsMenu = new QPopupMenu( menuBar ); 29 settingsMenu = new QPopupMenu( menuBar );
30 menuBar->insertItem( tr( "Settings" ), settingsMenu ); 30 menuBar->insertItem( tr( "Settings" ), settingsMenu );
31 31
32 addToolBar( toolBar ); 32 addToolBar( toolBar );
33 toolBar->setHorizontalStretchable( true ); 33 toolBar->setHorizontalStretchable( true );
34 34
35 QLabel *spacer = new QLabel( toolBar ); 35
36 spacer->setBackgroundMode( QWidget::PaletteButton );
37 toolBar->setStretchableWidget( spacer );
38 36
39 composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), 37 composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
40 0, 0, this ); 38 0, 0, this );
41 composeMail->addTo( toolBar ); 39 composeMail->addTo( toolBar );
42 composeMail->addTo( mailMenu ); 40 composeMail->addTo( mailMenu );
43 41
@@ -130,23 +128,31 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
130 connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), 128 connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
131 this,SLOT(refreshMailView(const QValueList<RecMailP>&))); 129 this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
132 connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); 130 connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
133 connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); 131 connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
134// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); 132// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
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;
139 int fw = 100; 137 int fw = 100;
140 if ( QApplication::desktop()->width() > 320 ) 138 if ( QApplication::desktop()->width() > 320 )
141 fw = 50; 139 fw = 50;
142 list.append( fw ); 140 list.append( fw );
143 list.append( 100 ); 141 list.append( 100 );
144 split->setSizes( list ); 142 split->setSizes( list );
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}
148 154
149MainWindow::~MainWindow() 155MainWindow::~MainWindow()
150{ 156{
151} 157}
152 158
@@ -173,16 +179,16 @@ void MainWindow::slotAdjustColumns()
173 bool hidden = folderView->isHidden(); 179 bool hidden = folderView->isHidden();
174 if ( hidden ) folderView->show(); 180 if ( hidden ) folderView->show();
175 folderView->setColumnWidth( 0, folderView->visibleWidth() ); 181 folderView->setColumnWidth( 0, folderView->visibleWidth() );
176 if ( hidden ) folderView->hide(); 182 if ( hidden ) folderView->hide();
177 183
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}
184 190
185void MainWindow::slotEditSettings() 191void MainWindow::slotEditSettings()
186{ 192{
187} 193}
188 194
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index b434318..703711d 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -310,13 +310,14 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
310 m_gotBody = false; 310 m_gotBody = false;
311 deleted = false; 311 deleted = false;
312 312
313 connect( reply, SIGNAL(activated()), SLOT(slotReply())); 313 connect( reply, SIGNAL(activated()), SLOT(slotReply()));
314 connect( forward, SIGNAL(activated()), SLOT(slotForward())); 314 connect( forward, SIGNAL(activated()), SLOT(slotForward()));
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
318 attachments->setEnabled(m_gotBody); 319 attachments->setEnabled(m_gotBody);
319 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); 320 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
320 321
321 readConfig(); 322 readConfig();
322 attachments->setSorting(-1); 323 attachments->setSorting(-1);
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 2590481..584a0ac 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -23,16 +23,12 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
23 mailmenu = new QPopupMenu( menubar ); 23 mailmenu = new QPopupMenu( menubar );
24 menubar->insertItem( tr( "Mail" ), mailmenu ); 24 menubar->insertItem( tr( "Mail" ), mailmenu );
25 25
26 toolbar->setHorizontalStretchable(true); 26 toolbar->setHorizontalStretchable(true);
27 addToolBar(toolbar); 27 addToolBar(toolbar);
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);
34 reply->addTo(toolbar); 30 reply->addTo(toolbar);
35 reply->addTo(mailmenu); 31 reply->addTo(mailmenu);
36 32
37 forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this); 33 forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this);
38 forward->addTo(toolbar); 34 forward->addTo(toolbar);
@@ -45,16 +41,21 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
45 41
46 42
47 showHtml = new QAction( tr( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); 43 showHtml = new QAction( tr( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true );
48 showHtml->addTo( toolbar ); 44 showHtml->addTo( toolbar );
49 showHtml->addTo( mailmenu ); 45 showHtml->addTo( mailmenu );
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);
56 setCentralWidget(view); 57 setCentralWidget(view);
57 58
58 attachments = new QListView(view); 59 attachments = new QListView(view);
59 attachments->setMinimumHeight(90); 60 attachments->setMinimumHeight(90);
60 attachments->setMaximumHeight(90); 61 attachments->setMaximumHeight(90);
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index fdaad2a..c29d143 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -16,13 +16,13 @@ class ViewMailBase : public QMainWindow
16 Q_OBJECT 16 Q_OBJECT
17 17
18public: 18public:
19 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); 19 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
20 20
21protected: 21protected:
22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml; 22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
23 QListView *attachments; 23 QListView *attachments;
24 QToolBar *toolbar; 24 QToolBar *toolbar;
25 QTextBrowser *browser; 25 QTextBrowser *browser;
26 OpenDiag *openDiag; 26 OpenDiag *openDiag;
27 QMenuBar *menubar; 27 QMenuBar *menubar;
28 QPopupMenu *mailmenu; 28 QPopupMenu *mailmenu;