-rw-r--r-- | kmicromail/mainwindow.cpp | 74 |
1 files changed, 40 insertions, 34 deletions
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index d547dda..627d92e 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -2,8 +2,14 @@ | |||
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qvbox.h> | 4 | #include <q3vbox.h> |
5 | #include <qheader.h> | 5 | #include <q3header.h> |
6 | #include <qtimer.h> | 6 | #include <qtimer.h> |
7 | #include <qlayout.h> | 7 | #include <qlayout.h> |
8 | //Added by qt3to4: | ||
9 | #include <Q3CString> | ||
10 | #include <Q3GridLayout> | ||
11 | #include <Q3ValueList> | ||
12 | #include <QPixmap> | ||
13 | #include <Q3PopupMenu> | ||
8 | //#include <kdialog.h> | 14 | //#include <kdialog.h> |
9 | #include <kiconloader.h> | 15 | #include <kiconloader.h> |
@@ -28,6 +34,6 @@ extern QStatusBar* globalSstatusBarMainWindow; | |||
28 | #include "koprefs.h" | 34 | #include "koprefs.h" |
29 | 35 | ||
30 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 36 | MainWindow::MainWindow( QWidget *parent, const char *name, Qt::WFlags flags ) |
31 | : QMainWindow( parent, name ) //, flags ) | 37 | : Q3MainWindow( parent, name ) //, flags ) |
32 | { | 38 | { |
33 | #ifdef DESKTOP_VERSION | 39 | #ifdef DESKTOP_VERSION |
@@ -37,9 +43,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
37 | setToolBarsMovable( false ); | 43 | setToolBarsMovable( false ); |
38 | //KABC::StdAddressBook::self(); | 44 | //KABC::StdAddressBook::self(); |
39 | toolBar = new QToolBar( this ); | 45 | toolBar = new Q3ToolBar( this ); |
40 | menuBar = new QPEMenuBar( toolBar ); | 46 | menuBar = new QPEMenuBar( toolBar ); |
41 | mailMenu = new QPopupMenu( menuBar ); | 47 | mailMenu = new Q3PopupMenu( menuBar ); |
42 | menuBar->insertItem( i18n( "Mail" ), mailMenu ); | 48 | menuBar->insertItem( i18n( "Mail" ), mailMenu ); |
43 | settingsMenu = new QPopupMenu( menuBar ); | 49 | settingsMenu = new Q3PopupMenu( menuBar ); |
44 | menuBar->insertItem( i18n( "Settings" ), settingsMenu ); | 50 | menuBar->insertItem( i18n( "Settings" ), settingsMenu ); |
45 | 51 | ||
@@ -115,5 +121,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
115 | 0, 0, this ); | 121 | 0, 0, this ); |
116 | editAccounts->addTo( settingsMenu ); | 122 | editAccounts->addTo( settingsMenu ); |
117 | codecMenu = new QPopupMenu( menuBar ); | 123 | codecMenu = new Q3PopupMenu( menuBar ); |
118 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); | 124 | codecMenu->insertItem( "Western (iso-8859-1)",0,0); |
119 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); | 125 | codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); |
@@ -126,5 +132,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
126 | //setCentralWidget( view ); | 132 | //setCentralWidget( view ); |
127 | 133 | ||
128 | QVBox* wrapperBox = new QVBox( this ); | 134 | Q3VBox* wrapperBox = new Q3VBox( this ); |
129 | setCentralWidget( wrapperBox ); | 135 | setCentralWidget( wrapperBox ); |
130 | 136 | ||
@@ -140,5 +146,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
140 | if ( KOPrefs::instance()->mShowInfoSub || KOPrefs::instance()->mShowInfoFrom || KOPrefs::instance()->mShowInfoTo ) { | 146 | if ( KOPrefs::instance()->mShowInfoSub || KOPrefs::instance()->mShowInfoFrom || KOPrefs::instance()->mShowInfoTo ) { |
141 | QWidget* infoBox = new QWidget( splithor ); | 147 | QWidget* infoBox = new QWidget( splithor ); |
142 | QGridLayout *griLay = new QGridLayout( infoBox, 2,2); | 148 | Q3GridLayout *griLay = new Q3GridLayout( infoBox, 2,2); |
143 | if ( KOPrefs::instance()->mShowInfoSub ) { | 149 | if ( KOPrefs::instance()->mShowInfoSub ) { |
144 | griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); | 150 | griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 ); |
@@ -169,10 +175,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
169 | mailView = new KListView( split ); | 175 | mailView = new KListView( split ); |
170 | mailView->addColumn( i18n( " " ) ); | 176 | mailView->addColumn( i18n( " " ) ); |
171 | mailView->addColumn( i18n( "Subject" ),QListView::Manual ); | 177 | mailView->addColumn( i18n( "Subject" ),Q3ListView::Manual ); |
172 | mailView->addColumn( i18n( "Sender" ),QListView::Manual ); | 178 | mailView->addColumn( i18n( "Sender" ),Q3ListView::Manual ); |
173 | mailView->addColumn( i18n( "Size" ),QListView::Manual); | 179 | mailView->addColumn( i18n( "Size" ),Q3ListView::Manual); |
174 | mailView->addColumn( i18n( "Date" ),QListView::Manual); | 180 | mailView->addColumn( i18n( "Date" ),Q3ListView::Manual); |
175 | if ( KOPrefs::instance()->mShowToField ) | 181 | if ( KOPrefs::instance()->mShowToField ) |
176 | mailView->addColumn( i18n( "To" ),QListView::Manual); | 182 | mailView->addColumn( i18n( "To" ),Q3ListView::Manual); |
177 | mailView->setAllColumnsShowFocus(true); | 183 | mailView->setAllColumnsShowFocus(true); |
178 | //mailView->setSorting(-1); | 184 | //mailView->setSorting(-1); |
@@ -180,5 +186,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
180 | statusWidget = new StatusWidget( wrapperBox ); | 186 | statusWidget = new StatusWidget( wrapperBox ); |
181 | statusWidget->hide(); | 187 | statusWidget->hide(); |
182 | mailView->setSelectionMode( QListView::Multi ); | 188 | mailView->setSelectionMode( Q3ListView::Multi ); |
183 | mailView->setMultiSelection( true); | 189 | mailView->setMultiSelection( true); |
184 | mailView->setAlternateBackground(KPimGlobalPrefs::instance()->mAlternateColor ); | 190 | mailView->setAlternateBackground(KPimGlobalPrefs::instance()->mAlternateColor ); |
@@ -198,15 +204,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
198 | QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold); | 204 | QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold); |
199 | #endif | 205 | #endif |
200 | connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, | 206 | connect( mailView, SIGNAL( doubleClicked (Q3ListViewItem* )),this, |
201 | SLOT( mailLeftClicked(QListViewItem*) ) ); | 207 | SLOT( mailLeftClicked(Q3ListViewItem*) ) ); |
202 | connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, | 208 | connect( mailView, SIGNAL( returnPressed (Q3ListViewItem* )),this, |
203 | SLOT( mailLeftClicked(QListViewItem*) ) ); | 209 | SLOT( mailLeftClicked(Q3ListViewItem*) ) ); |
204 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 210 | connect( mailView, SIGNAL( mouseButtonPressed(int,Q3ListViewItem*,const QPoint&,int) ),this, |
205 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); | 211 | SLOT( mailHold(int,Q3ListViewItem*,const QPoint&,int) ) ); |
206 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), | 212 | connect(folderView, SIGNAL(refreshMailview(const Q3ValueList<RecMailP>&)), |
207 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); | 213 | this,SLOT(refreshMailView(const Q3ValueList<RecMailP>&))); |
208 | 214 | ||
209 | connect( mailView, SIGNAL( currentChanged (QListViewItem* )),this, | 215 | connect( mailView, SIGNAL( currentChanged (Q3ListViewItem* )),this, |
210 | SLOT( setInfoFields(QListViewItem*) ) ); | 216 | SLOT( setInfoFields(Q3ListViewItem*) ) ); |
211 | 217 | ||
212 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); | 218 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); |
@@ -216,5 +222,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
216 | //mailView->setMultiSelection ( true ); | 222 | //mailView->setMultiSelection ( true ); |
217 | //mailView->setSelectionMode( QListView::Extended ); | 223 | //mailView->setSelectionMode( QListView::Extended ); |
218 | QValueList<int> list; | 224 | Q3ValueList<int> list; |
219 | int fw = 100; | 225 | int fw = 100; |
220 | if ( QApplication::desktop()->width() > 320 ) | 226 | if ( QApplication::desktop()->width() > 320 ) |
@@ -236,5 +242,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
236 | 242 | ||
237 | 243 | ||
238 | QPopupMenu* helpMenu = new QPopupMenu( menuBar ); | 244 | Q3PopupMenu* helpMenu = new Q3PopupMenu( menuBar ); |
239 | menuBar->insertItem( i18n( "Help" ), helpMenu ); | 245 | menuBar->insertItem( i18n( "Help" ), helpMenu ); |
240 | QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); | 246 | QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); |
@@ -260,5 +266,5 @@ MainWindow::~MainWindow() | |||
260 | } | 266 | } |
261 | 267 | ||
262 | void MainWindow::setInfoFields(QListViewItem* item ) | 268 | void MainWindow::setInfoFields(Q3ListViewItem* item ) |
263 | { | 269 | { |
264 | if ( item == 0) { | 270 | if ( item == 0) { |
@@ -346,5 +352,5 @@ void MainWindow::showEtpanLicence() | |||
346 | 352 | ||
347 | } | 353 | } |
348 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 354 | void MainWindow::appMessage(const Q3CString &, const QByteArray &) |
349 | { | 355 | { |
350 | qDebug("appMessage implemented by subclass"); | 356 | qDebug("appMessage implemented by subclass"); |
@@ -406,10 +412,10 @@ void MainWindow::slotShowFolders( bool ) | |||
406 | } | 412 | } |
407 | 413 | ||
408 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) | 414 | void MainWindow::refreshMailView(const Q3ValueList<RecMailP>&) |
409 | { | 415 | { |
410 | qDebug("not implemented: "); | 416 | qDebug("not implemented: "); |
411 | } | 417 | } |
412 | 418 | ||
413 | void MainWindow::mailLeftClicked(QListViewItem * ) | 419 | void MainWindow::mailLeftClicked(Q3ListViewItem * ) |
414 | { | 420 | { |
415 | qDebug("not implemented: "); | 421 | qDebug("not implemented: "); |
@@ -426,5 +432,5 @@ void MainWindow::slotDeleteMail() | |||
426 | } | 432 | } |
427 | 433 | ||
428 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) | 434 | void MainWindow::mailHold(int, Q3ListViewItem *,const QPoint&,int ) |
429 | { | 435 | { |
430 | qDebug("not implemented: "); | 436 | qDebug("not implemented: "); |