fifix

3 files changed, 34 insertions, 17 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 00f5c28..ec08321 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1200,13 +1200,13 @@
 { "Next two weeks","Nächste zwei Wochen" },
 { "Next month","Nächster Monat" },
 { "Journal view","Journal" },
 { "Display all opened","Zeige alle geöffnet" },
 { "Display all closed","Zeige alle geschlossen" },
 { "Display all flat","Zeige alle flach" },
 { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" },
 { "Default todo done color:","Standard Todo erledigt Farbe" },
-{ "","" },
-{ "","" },
+{ "Select week %1-%2","Selektiere Woche %1-%2" },
+{ "Select Week","Selektiere Woche" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 918931a..1908b1c 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -428,27 +428,36 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     QVBox *dummyAllDayRight = new QVBox(mAllDayFrame);
 
     QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight);
     mDummyAllDayRightL = new QLabel ( dummyAllDayRight );
 
     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++ )
+    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 );
-    //Qt bug - we must add some empty fields...
-    for ( i = 53; i < 54; ++i ) {
-        wpo->insertItem( "", 52 );
     }
-    dummyAllDayRightB->setPopup( wpo );
-
+    for ( i = 50; i < 53; ++i ) {
+        wpo->insertItem( QString::number(i), i);
+    }
+    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
     mAllDayAgendaPopup = eventPopup();
     connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
 
     // Create agenda frame
@@ -576,17 +585,17 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
     QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
     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;
         dlf.setPointSize( fontPoint );
         QFontMetrics f( dlf );
         wid = f.width( dayTest );
     }
     mDummyAllDayRightL->setFont( dlf );
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 2406bb5..24de01f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -131,27 +131,35 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   maxwidth = width+2;
   int size = fm.height()+2;
   if ( QApplication::desktop()->width() >= 480 ) { 
       size += 6;
       maxwidth+= 6;
   }
 
   if ( insertWeek ) {
-      //shit : bug in Qt. after inserting 53 item, only 51 are shown...
       QPopupMenu * wpo = new QPopupMenu (this);
-      wpo->insertItem( i18n("W#"), 0 ); 
-      for ( i = 1; i < 53; ++i ) {
+      QPopupMenu * all = new QPopupMenu (this);
+      //wpo->insertItem( i18n("W#"), 0 ); 
+      int first = 1;
+      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( selectWeek ( int ) ) );
+              first = i;
+              wpo = new QPopupMenu (this);
+          }
           wpo->insertItem( QString::number(i), i );
       } 
-      for ( i = 53; i < 54; ++i ) {
-          wpo->insertItem( "", 52 );
+      for ( i = 50; i < 53; ++i ) {
+          wpo->insertItem( QString::number(i), i);
       }
-      selWeek->setPopup( wpo );
-      selWeek->setFixedWidth( (size/4)*3 );
+      all->insertItem( i18n("Select week %1-%2"  ).arg(first).arg( i-1) ,wpo );
+      selWeek->setPopup( all );
+      selWeek->setFixedWidth( (size/5)*4 );
       selWeek->setFixedHeight( size );
       connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) );
   }
   mSelectMonth->setFixedWidth( maxwidth );
   mSelectMonth->setFixedHeight( size );
    mPrevYear->setFixedHeight(  size );
   mPrevMonth->setFixedHeight( size );
    mNextMonth->setFixedHeight( size );