-rw-r--r-- | kmicromail/mainwindow.cpp | 24 |
1 files changed, 15 insertions, 9 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 | ||
149 | MainWindow::~MainWindow() | 155 | MainWindow::~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 | ||
185 | void MainWindow::slotEditSettings() | 191 | void MainWindow::slotEditSettings() |
186 | { | 192 | { |
187 | } | 193 | } |
188 | 194 | ||