author | zautrix <zautrix> | 2005-02-01 17:51:26 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-01 17:51:26 (UTC) |
commit | 81991bbbc7f815c82b37db654528ee3b224435dc (patch) (unidiff) | |
tree | 7e556083803d359c3a598d3ecf724d1127703480 | |
parent | b699d9cf03b5b5bb92609bcd04eef2651fe0028b (diff) | |
download | kdepimpi-81991bbbc7f815c82b37db654528ee3b224435dc.zip kdepimpi-81991bbbc7f815c82b37db654528ee3b224435dc.tar.gz kdepimpi-81991bbbc7f815c82b37db654528ee3b224435dc.tar.bz2 |
fff
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 11 | ||||
-rw-r--r-- | version | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 9093b40..f75cd48 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,7 +1,7 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.1 | 3 | Version: 2.0.2 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 8c27c43..d3db89a 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -622,9 +622,9 @@ void KOAgendaView::slotDaylabelClicked() | |||
622 | else | 622 | else |
623 | emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); | 623 | emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); |
624 | } | 624 | } |
625 | else | 625 | else |
626 | showDateView( 10, firstDate.addDays(1 ) ); | 626 | showDateView( 10, firstDate.addDays(1) ); |
627 | } | 627 | } |
628 | 628 | ||
629 | QPushButton* KOAgendaView::getNewDaylabel() | 629 | QPushButton* KOAgendaView::getNewDaylabel() |
630 | { | 630 | { |
@@ -661,9 +661,10 @@ void KOAgendaView::createDayLabels() | |||
661 | 661 | ||
662 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 662 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
663 | QFontMetrics fm ( dlf ); | 663 | QFontMetrics fm ( dlf ); |
664 | int selCount = mSelectedDates.count(); | 664 | int selCount = mSelectedDates.count(); |
665 | QString dayTest = "Mon 20"; | 665 | QString dayTest = "Won 20"; |
666 | //QString dayTest = "Mon 20"; | ||
666 | int wid = fm.width( dayTest ); | 667 | int wid = fm.width( dayTest ); |
667 | //maxWid -= ( selCount * 3 ); //working for QLabels | 668 | //maxWid -= ( selCount * 3 ); //working for QLabels |
668 | maxWid -= ( selCount * 5 ); //working for QPushButton | 669 | maxWid -= ( selCount * 5 ); //working for QPushButton |
669 | if ( maxWid < 0 ) | 670 | if ( maxWid < 0 ) |
@@ -673,9 +674,9 @@ void KOAgendaView::createDayLabels() | |||
673 | //if ( needWid > maxWid ) | 674 | //if ( needWid > maxWid ) |
674 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 675 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
675 | while ( needWid > maxWid ) { | 676 | while ( needWid > maxWid ) { |
676 | dayTest = dayTest.left( dayTest.length() - 1 ); | 677 | dayTest = dayTest.left( dayTest.length() - 1 ); |
677 | wid = fm.width( dayTest ); | 678 | wid = fm.width( dayTest )+1; |
678 | needWid = wid * selCount; | 679 | needWid = wid * selCount; |
679 | } | 680 | } |
680 | int maxLen = dayTest.length(); | 681 | int maxLen = dayTest.length(); |
681 | int fontPoint = dlf.pointSize(); | 682 | int fontPoint = dlf.pointSize(); |
@@ -684,9 +685,9 @@ void KOAgendaView::createDayLabels() | |||
684 | while ( fontPoint > 4 ) { | 685 | while ( fontPoint > 4 ) { |
685 | --fontPoint; | 686 | --fontPoint; |
686 | dlf.setPointSize( fontPoint ); | 687 | dlf.setPointSize( fontPoint ); |
687 | QFontMetrics f( dlf ); | 688 | QFontMetrics f( dlf ); |
688 | wid = f.width( "20" )+2; | 689 | wid = f.width( "30" )+3; |
689 | needWid = wid * selCount; | 690 | needWid = wid * selCount; |
690 | if ( needWid < maxWid ) | 691 | if ( needWid < maxWid ) |
691 | break; | 692 | break; |
692 | } | 693 | } |
@@ -996,10 +997,8 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) | |||
996 | endDt.setDate(startDate); | 997 | endDt.setDate(startDate); |
997 | } | 998 | } |
998 | } | 999 | } |
999 | } | 1000 | } |
1000 | |||
1001 | qDebug("to888"); | ||
1002 | if ( item->incidence()->type() == "Event" ) { | 1001 | if ( item->incidence()->type() == "Event" ) { |
1003 | item->incidence()->setDtStart(startDt); | 1002 | item->incidence()->setDtStart(startDt); |
1004 | (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); | 1003 | (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); |
1005 | } else if ( item->incidence()->type() == "Todo" ) { | 1004 | } else if ( item->incidence()->type() == "Todo" ) { |
@@ -1 +1 @@ | |||
version = "2.0.1"; | version = "2.0.2"; | ||