author | zautrix <zautrix> | 2005-08-23 18:28:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-23 18:28:51 (UTC) |
commit | 13a736b71dec27ef7ffef06b91f34d220d89cce6 (patch) (unidiff) | |
tree | 08003ff0365e905ad653e3a714ac99f1c1aba654 | |
parent | 789aec1acdf798aea32ab16219a8f19c6155250e (diff) | |
download | kdepimpi-13a736b71dec27ef7ffef06b91f34d220d89cce6.zip kdepimpi-13a736b71dec27ef7ffef06b91f34d220d89cce6.tar.gz kdepimpi-13a736b71dec27ef7ffef06b91f34d220d89cce6.tar.bz2 |
align fix
-rw-r--r-- | kmicromail/mailistviewitem.cpp | 2 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp index 15fa148..41cee52 100644 --- a/kmicromail/mailistviewitem.cpp +++ b/kmicromail/mailistviewitem.cpp | |||
@@ -1,99 +1,99 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | #include "mailistviewitem.h" | 2 | #include "mailistviewitem.h" |
3 | #include <libmailwrapper/abstractmail.h> | 3 | #include <libmailwrapper/abstractmail.h> |
4 | #include <qtextstream.h> | 4 | #include <qtextstream.h> |
5 | #include <kiconloader.h> | 5 | #include <kiconloader.h> |
6 | #include "koprefs.h" | 6 | #include "koprefs.h" |
7 | //#include <qpe/resource.h> | 7 | //#include <qpe/resource.h> |
8 | 8 | ||
9 | MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) | 9 | MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) |
10 | :KListViewItem(parent,item),mail_data() | 10 | :KListViewItem(parent,item),mail_data() |
11 | { | 11 | { |
12 | } | 12 | } |
13 | 13 | ||
14 | void MailListViewItem::showEntry() | 14 | void MailListViewItem::showEntry() |
15 | { | 15 | { |
16 | if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) { | 16 | if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) { |
17 | setPixmap( 0, SmallIcon ( "kmmsgreplied") ); | 17 | setPixmap( 0, SmallIcon ( "kmmsgreplied") ); |
18 | mKeyMap.insert(0, "r" ); | 18 | mKeyMap.insert(0, "r" ); |
19 | } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) { | 19 | } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true ) { |
20 | /* I think it looks nicer if there are not such a log of icons but only on mails | 20 | /* I think it looks nicer if there are not such a log of icons but only on mails |
21 | replied or new - Alwin*/ | 21 | replied or new - Alwin*/ |
22 | //setPixmap( 0,SmallIcon ("kmmsgunseen") ); | 22 | //setPixmap( 0,SmallIcon ("kmmsgunseen") ); |
23 | mKeyMap.insert(0, "s" ); | 23 | mKeyMap.insert(0, "s" ); |
24 | } else { | 24 | } else { |
25 | setPixmap( 0,SmallIcon ( "kmmsgnew") ); | 25 | setPixmap( 0,SmallIcon ( "kmmsgnew") ); |
26 | mKeyMap.insert(0, "u" ); | 26 | mKeyMap.insert(0, "u" ); |
27 | } | 27 | } |
28 | QString fsize = mail_data->MsgsizeString(); | 28 | QString fsize = mail_data->MsgsizeString(); |
29 | // 1.23 | 29 | // 1.23 |
30 | // 11.23 | 30 | // 11.23 |
31 | // 111.23 | 31 | // 111.23 |
32 | // 999.23 maxlen | 32 | // 999.23 maxlen |
33 | QString fsort; | 33 | QString fsort; |
34 | switch(fsize.length() ) { | 34 | switch(fsize.length() ) { |
35 | case 6: | 35 | case 6: |
36 | fsort = "00" + fsize ; | 36 | fsort = "00" + fsize ; |
37 | break; | 37 | break; |
38 | case 7: | 38 | case 7: |
39 | fsort = "0" + fsize ; | 39 | fsort = "0" + fsize ; |
40 | break; | 40 | break; |
41 | default: | 41 | default: |
42 | fsort = fsize ; | 42 | fsort = fsize ; |
43 | break; | 43 | break; |
44 | 44 | ||
45 | } | 45 | } |
46 | 46 | ||
47 | setText(3, fsize ); | 47 | setText(3, fsize ); |
48 | //qDebug("fsize *%s* ",fsize.latin1() ); | 48 | //qDebug("fsize *%s* ",fsize.latin1() ); |
49 | //qDebug("fsort *%s* ",fsort.latin1() ); | 49 | //qDebug("fsort *%s* ",fsort.latin1() ); |
50 | if ( fsize.right(2) == "kB" ) { | 50 | if ( fsize.right(2) == "kB" ) { |
51 | mKeyMap.insert(3, "k" + fsort); | 51 | mKeyMap.insert(3, "k" + fsort); |
52 | } else { | 52 | } else { |
53 | mKeyMap.insert(3, "M" +fsort ); | 53 | mKeyMap.insert(3, "M" +fsort ); |
54 | } | 54 | } |
55 | setText(1,mail_data->getSubject()); | 55 | setText(1,mail_data->getSubject()); |
56 | setText(2,mail_data->getFrom()); | 56 | setText(2,mail_data->getFrom()); |
57 | mKeyMap.insert(4,mail_data->getIsoDate()); | 57 | mKeyMap.insert(4,mail_data->getIsoDate()); |
58 | setText(4,mail_data->getDate()); | 58 | setText(4," "+mail_data->getDate()); |
59 | if ( KOPrefs::instance()->mShowToField ) | 59 | if ( KOPrefs::instance()->mShowToField ) |
60 | setText(5,mail_data->To()[0]); | 60 | setText(5,mail_data->To()[0]); |
61 | } | 61 | } |
62 | 62 | ||
63 | void MailListViewItem::storeData(const RecMailP&data) | 63 | void MailListViewItem::storeData(const RecMailP&data) |
64 | { | 64 | { |
65 | mail_data = data; | 65 | mail_data = data; |
66 | } | 66 | } |
67 | void MailListViewItem::setSortKey(int column,const QString &key) | 67 | void MailListViewItem::setSortKey(int column,const QString &key) |
68 | { | 68 | { |
69 | mKeyMap.insert(column,key); | 69 | mKeyMap.insert(column,key); |
70 | } | 70 | } |
71 | QString MailListViewItem::key(int column, bool) const | 71 | QString MailListViewItem::key(int column, bool) const |
72 | { | 72 | { |
73 | // to make is fast, we use here special cases | 73 | // to make is fast, we use here special cases |
74 | if ( column == 3 || column == 4 || column == 0) { | 74 | if ( column == 3 || column == 4 || column == 0) { |
75 | return *mKeyMap.find(column); | 75 | return *mKeyMap.find(column); |
76 | } | 76 | } |
77 | if ( column == 1 ) { | 77 | if ( column == 1 ) { |
78 | if ( text(1).left(4).lower() == "re: " ) | 78 | if ( text(1).left(4).lower() == "re: " ) |
79 | return text(1).mid(4); | 79 | return text(1).mid(4); |
80 | 80 | ||
81 | } | 81 | } |
82 | return text(column); | 82 | return text(column); |
83 | /* | 83 | /* |
84 | QMap<int,QString>::ConstIterator it = mKeyMap.find(column); | 84 | QMap<int,QString>::ConstIterator it = mKeyMap.find(column); |
85 | if (it == mKeyMap.end()) return text(column); | 85 | if (it == mKeyMap.end()) return text(column); |
86 | else return *it; | 86 | else return *it; |
87 | */ | 87 | */ |
88 | } | 88 | } |
89 | 89 | ||
90 | const RecMailP& MailListViewItem::data()const | 90 | const RecMailP& MailListViewItem::data()const |
91 | { | 91 | { |
92 | return mail_data; | 92 | return mail_data; |
93 | } | 93 | } |
94 | 94 | ||
95 | MAILLIB::ATYPE MailListViewItem::wrapperType() | 95 | MAILLIB::ATYPE MailListViewItem::wrapperType() |
96 | { | 96 | { |
97 | if (!mail_data->Wrapper()) return MAILLIB::A_UNDEFINED; | 97 | if (!mail_data->Wrapper()) return MAILLIB::A_UNDEFINED; |
98 | return mail_data->Wrapper()->getType(); | 98 | return mail_data->Wrapper()->getType(); |
99 | } | 99 | } |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 3dde3cd..d547dda 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -316,129 +316,128 @@ void MainWindow::showAbout() | |||
316 | QString version; | 316 | QString version; |
317 | #include <../version> | 317 | #include <../version> |
318 | 318 | ||
319 | QString cap = "About KOpieMail/Pi"; | 319 | QString cap = "About KOpieMail/Pi"; |
320 | QString text =i18n("KOpieMail/Platform-independent\n") + | 320 | QString text =i18n("KOpieMail/Platform-independent\n") + |
321 | "(OM/Pi) " + version + " - " | 321 | "(OM/Pi) " + version + " - " |
322 | 322 | ||
323 | #ifdef DESKTOP_VERSION | 323 | #ifdef DESKTOP_VERSION |
324 | "Desktop Edition\n" | 324 | "Desktop Edition\n" |
325 | #else | 325 | #else |
326 | "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" | 326 | "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" |
327 | #endif | 327 | #endif |
328 | "www.pi-sync.info\n\n" | 328 | "www.pi-sync.info\n\n" |
329 | 329 | ||
330 | 330 | ||
331 | 331 | ||
332 | "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>\n" | 332 | "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>\n" |
333 | "KOpieMail/Pi is based on Opie Mail\n" | 333 | "KOpieMail/Pi is based on Opie Mail\n" |
334 | "Copyright (c) Rajko Albrecht and the Opie team\n" | 334 | "Copyright (c) Rajko Albrecht and the Opie team\n" |
335 | "KOpieMail/Pi is licensed under the GPL\n" | 335 | "KOpieMail/Pi is licensed under the GPL\n" |
336 | "\n" | 336 | "\n" |
337 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" | 337 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" |
338 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" | 338 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" |
339 | "libEtPan has its own licence - see LibEtPan licence\n"; | 339 | "libEtPan has its own licence - see LibEtPan licence\n"; |
340 | 340 | ||
341 | KApplication::showText( cap, text ); | 341 | KApplication::showText( cap, text ); |
342 | } | 342 | } |
343 | void MainWindow::showEtpanLicence() | 343 | void MainWindow::showEtpanLicence() |
344 | { | 344 | { |
345 | KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); | 345 | KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); |
346 | 346 | ||
347 | } | 347 | } |
348 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 348 | void MainWindow::appMessage(const QCString &, const QByteArray &) |
349 | { | 349 | { |
350 | qDebug("appMessage implemented by subclass"); | 350 | qDebug("appMessage implemented by subclass"); |
351 | } | 351 | } |
352 | 352 | ||
353 | void MainWindow::slotAdjustLayout() { | 353 | void MainWindow::slotAdjustLayout() { |
354 | 354 | ||
355 | /* | 355 | /* |
356 | QWidget *d = QApplication::desktop(); | 356 | QWidget *d = QApplication::desktop(); |
357 | 357 | ||
358 | if ( d->width() < d->height() ) { | 358 | if ( d->width() < d->height() ) { |
359 | layout->setDirection( QBoxLayout::TopToBottom ); | 359 | layout->setDirection( QBoxLayout::TopToBottom ); |
360 | } else { | 360 | } else { |
361 | layout->setDirection( QBoxLayout::LeftToRight ); | 361 | layout->setDirection( QBoxLayout::LeftToRight ); |
362 | } | 362 | } |
363 | */ | 363 | */ |
364 | } | 364 | } |
365 | 365 | ||
366 | void MainWindow::slotAdjustColumns() | 366 | void MainWindow::slotAdjustColumns() |
367 | { | 367 | { |
368 | 368 | ||
369 | if ( !folderView->isHidden() ) | 369 | if ( !folderView->isHidden() ) |
370 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 370 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
371 | 371 | ||
372 | mailView->setColumnWidth( 0, 10 ); | 372 | mailView->setColumnWidth( 0, 10 ); |
373 | mailView->setColumnWidth( 1, 100 ); | 373 | mailView->setColumnWidth( 1, 100 ); |
374 | mailView->setColumnWidth( 2, 100 ); | 374 | mailView->setColumnWidth( 2, 100 ); |
375 | mailView->setColumnWidth( 3, 70 ); | 375 | mailView->setColumnWidth( 3, 70 ); |
376 | mailView->setColumnWidth( 4, 180 ); | 376 | mailView->setColumnWidth( 4, 180 ); |
377 | if ( KOPrefs::instance()->mShowToField ) | 377 | if ( KOPrefs::instance()->mShowToField ) |
378 | mailView->setColumnWidth( 5, 100 ); | 378 | mailView->setColumnWidth( 5, 100 ); |
379 | mailView->setColumnAlignment( 3, AlignRight); | 379 | mailView->setColumnAlignment( 3, AlignRight); |
380 | mailView->setColumnAlignment( 4, AlignRight); | ||
381 | } | 380 | } |
382 | void MainWindow::slotAdjustColumnsWide() | 381 | void MainWindow::slotAdjustColumnsWide() |
383 | { | 382 | { |
384 | if ( !folderView->isHidden() ) | 383 | if ( !folderView->isHidden() ) |
385 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 384 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
386 | 385 | ||
387 | mailView->setColumnWidth( 0, 10 ); | 386 | mailView->setColumnWidth( 0, 10 ); |
388 | mailView->setColumnWidth( 1, 200 ); | 387 | mailView->setColumnWidth( 1, 200 ); |
389 | mailView->setColumnWidth( 2, 200 ); | 388 | mailView->setColumnWidth( 2, 200 ); |
390 | mailView->setColumnWidth( 3, 70 ); | 389 | mailView->setColumnWidth( 3, 70 ); |
391 | mailView->setColumnWidth( 4, 180 ); | 390 | mailView->setColumnWidth( 4, 180 ); |
392 | if ( KOPrefs::instance()->mShowToField ) | 391 | if ( KOPrefs::instance()->mShowToField ) |
393 | mailView->setColumnWidth( 5, 100 ); | 392 | mailView->setColumnWidth( 5, 100 ); |
394 | mailView->setColumnAlignment( 3, AlignRight); | 393 | mailView->setColumnAlignment( 3, AlignRight); |
395 | } | 394 | } |
396 | 395 | ||
397 | void MainWindow::slotEditSettings() | 396 | void MainWindow::slotEditSettings() |
398 | { | 397 | { |
399 | } | 398 | } |
400 | void MainWindow::slotEditGlobalSettings() | 399 | void MainWindow::slotEditGlobalSettings() |
401 | { | 400 | { |
402 | } | 401 | } |
403 | 402 | ||
404 | void MainWindow::slotShowFolders( bool ) | 403 | void MainWindow::slotShowFolders( bool ) |
405 | { | 404 | { |
406 | qDebug("not implemented: "); | 405 | qDebug("not implemented: "); |
407 | } | 406 | } |
408 | 407 | ||
409 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) | 408 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) |
410 | { | 409 | { |
411 | qDebug("not implemented: "); | 410 | qDebug("not implemented: "); |
412 | } | 411 | } |
413 | 412 | ||
414 | void MainWindow::mailLeftClicked(QListViewItem * ) | 413 | void MainWindow::mailLeftClicked(QListViewItem * ) |
415 | { | 414 | { |
416 | qDebug("not implemented: "); | 415 | qDebug("not implemented: "); |
417 | } | 416 | } |
418 | 417 | ||
419 | void MainWindow::displayMail() | 418 | void MainWindow::displayMail() |
420 | { | 419 | { |
421 | qDebug("not implemented: "); | 420 | qDebug("not implemented: "); |
422 | } | 421 | } |
423 | 422 | ||
424 | void MainWindow::slotDeleteMail() | 423 | void MainWindow::slotDeleteMail() |
425 | { | 424 | { |
426 | qDebug("not implemented: "); | 425 | qDebug("not implemented: "); |
427 | } | 426 | } |
428 | 427 | ||
429 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) | 428 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) |
430 | { | 429 | { |
431 | qDebug("not implemented: "); | 430 | qDebug("not implemented: "); |
432 | } | 431 | } |
433 | 432 | ||
434 | void MainWindow::slotSendQueued() | 433 | void MainWindow::slotSendQueued() |
435 | { | 434 | { |
436 | qDebug("not implemented: "); | 435 | qDebug("not implemented: "); |
437 | } | 436 | } |
438 | 437 | ||
439 | void MainWindow::slotEditAccounts() | 438 | void MainWindow::slotEditAccounts() |
440 | { | 439 | { |
441 | qDebug("not implemented: "); | 440 | qDebug("not implemented: "); |
442 | } | 441 | } |
443 | 442 | ||
444 | void MainWindow::slotComposeMail() | 443 | void MainWindow::slotComposeMail() |