fifix

1 files changed, 18 insertions, 9 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 918931a..1908b1c 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -433,17 +433,26 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     dummyAllDayRightB->setFlat( true );
     dummyAllDayRightB->setFocusPolicy(NoFocus); 
     dummyAllDayRightB->setFixedHeight( (dummyAllDayRightB->sizeHint().height()/4)*3 );
+
     QPopupMenu * wpo = new QPopupMenu (this);
-    wpo->insertItem( i18n("W#"), 0 );
+    QPopupMenu * all = new QPopupMenu (this);
+    //wpo->insertItem( i18n("W#"), 0 ); 
+    int first = 1;
     int i;
-    for ( i = 1; i < 53; i++ )
-        wpo->insertItem( QString::number( i ),i );
-    //Qt bug - we must add some empty fields...
-    for ( i = 53; i < 54; ++i ) {
-        wpo->insertItem( "", 52 );
+    for ( i = 1; i < 50; ++i ) {
+        if ( !(i%10) ) {
+            all->insertItem( i18n("Select week %1-%2"  ).arg(first).arg( i-1) ,wpo );
+            connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) );
+            first = i;
+            wpo = new QPopupMenu (this);
+        }
+        wpo->insertItem( QString::number(i), i );
+    } 
+    for ( i = 50; i < 53; ++i ) {
+        wpo->insertItem( QString::number(i), i);
     }
-    dummyAllDayRightB->setPopup( wpo );
-
+    all->insertItem( i18n("Select week %1-%2"  ).arg(first).arg( i-1) ,wpo );
+    dummyAllDayRightB->setPopup( all );
     connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) );
 
     // Create event context menu for all day agenda
@@ -581,7 +590,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     QFontMetrics fm ( dlf );
     QString dayTest = "30";
     int wid = fm.width( dayTest );
-    int maxWid  = dummyAllDayRight->width(); 
+    int maxWid  = dummyAllDayRight->width()-2; 
     int fontPoint = dlf.pointSize();
     while ( wid > maxWid ) {
         --fontPoint;