summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-02-02 01:54:29 (UTC)
committer zautrix <zautrix>2005-02-02 01:54:29 (UTC)
commit5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7 (patch) (unidiff)
tree5d8092ab72fbd191f6045ff0ff4f81f0ec0d088b /korganizer
parent9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289 (diff)
downloadkdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.zip
kdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.tar.gz
kdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.tar.bz2
abc
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp1
-rw-r--r--korganizer/komonthview.cpp10
-rw-r--r--korganizer/koviewmanager.cpp5
3 files changed, 8 insertions, 8 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c8cef44..d4ff77a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -977,13 +977,12 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
977 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 977 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
978 endDt.setDate(startDate); 978 endDt.setDate(startDate);
979 } 979 }
980 } 980 }
981 } else { 981 } else {
982 // todo 982 // todo
983 qDebug("tooooodoooooo ");
984 if (item->lastMultiItem()) { 983 if (item->lastMultiItem()) {
985 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 984 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
986 endDt.setDate(startDate. 985 endDt.setDate(startDate.
987 addDays(item->lastMultiItem()->cellX() - item->cellX())); 986 addDays(item->lastMultiItem()->cellX() - item->cellX()));
988 } else { 987 } else {
989 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 988 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6294b98..0ef5ae4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1156,17 +1156,18 @@ void KOMonthView::computeLayoutWeek()
1156 for ( i = 0; i < 7; i++) { 1156 for ( i = 0; i < 7; i++) {
1157 if ( i && !( i % daysToShow) && i < 6) { 1157 if ( i && !( i % daysToShow) && i < 6) {
1158 y += hei/(5-daysToShow); 1158 y += hei/(5-daysToShow);
1159 x = 0; 1159 x = 0;
1160 w = colWid; 1160 w = colWid;
1161 } 1161 }
1162 if ( i == daysToShow-colModulo ) 1162 if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
1163 ++w; 1163 ++w;
1164 }
1164 if ( i >= 5 ) { 1165 if ( i >= 5 ) {
1165 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h); 1166 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
1166 x -= w/2 ; 1167 x -= (w/2 );
1167 } 1168 }
1168 else 1169 else
1169 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); 1170 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
1170 x += w; 1171 x += w;
1171 } 1172 }
1172 x= 0; 1173 x= 0;
@@ -1188,12 +1189,15 @@ void KOMonthView::computeLayoutWeek()
1188 1189
1189 if ( i >= 5 ) { 1190 if ( i >= 5 ) {
1190 if ( i ==5 ) { 1191 if ( i ==5 ) {
1191 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 1192 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 );
1192 x -= w ;y += h/2; 1193 x -= w ;y += h/2;
1193 } else { 1194 } else {
1195 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
1196 ++w;
1197 }
1194 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 1198 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
1195 y -= h/2; 1199 y -= h/2;
1196 } 1200 }
1197 } else 1201 } else
1198 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 1202 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
1199 1203
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6afd203..8aa0697 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -119,17 +119,14 @@ void KOViewManager::showDateView( int view, QDate date)
119 mCurrentAgendaView = 7 ; 119 mCurrentAgendaView = 7 ;
120 mMainView->dateNavigator()->selectDates( date, 7 ); 120 mMainView->dateNavigator()->selectDates( date, 7 );
121 } else if (view == 5 ) { 121 } else if (view == 5 ) {
122 mCurrentAgendaView = 14 ; 122 mCurrentAgendaView = 14 ;
123 mMainView->dateNavigator()->selectDates( date, 14); 123 mMainView->dateNavigator()->selectDates( date, 14);
124 } else if (view == 6 ) { 124 } else if (view == 6 ) {
125 mMainView->dateNavigator()->blockSignals( true ); 125 mMainView->dateNavigator()->selectDates( date, 7 );
126 showMonthView(); 126 showMonthView();
127 mMainView->dateNavigator()->selectMonthByDate( date );
128 mMainView->dateNavigator()->blockSignals( false );
129 mMainView->dateNavigator()->selectDate( date );
130 } else if (view == 7 ) { 127 } else if (view == 7 ) {
131 mMainView->dateNavigator()->selectDate( date ); 128 mMainView->dateNavigator()->selectDate( date );
132 showJournalView(); 129 showJournalView();
133 } else if (view == 8 ) { 130 } else if (view == 8 ) {
134 globalFlagBlockAgenda = 1; 131 globalFlagBlockAgenda = 1;
135 if ( mCurrentAgendaView != 3 ) 132 if ( mCurrentAgendaView != 3 )