author | zautrix <zautrix> | 2005-02-02 21:31:25 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-02 21:31:25 (UTC) |
commit | 279354f19275e5e654636acb87c465edf652eeae (patch) (unidiff) | |
tree | 1721c6201fa28392cb02a80510c47a12ae4e0d4c | |
parent | f79d089ec5c44a27f9005da76e452b4574eae27f (diff) | |
download | kdepimpi-279354f19275e5e654636acb87c465edf652eeae.zip kdepimpi-279354f19275e5e654636acb87c465edf652eeae.tar.gz kdepimpi-279354f19275e5e654636acb87c465edf652eeae.tar.bz2 |
fifix
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 25 | ||||
-rw-r--r-- | korganizer/navigatorbar.cpp | 22 |
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 | |||
@@ -1196,17 +1196,17 @@ | |||
1196 | { "compl.todos","erled.Todos" }, | 1196 | { "compl.todos","erled.Todos" }, |
1197 | { "Day view","Tagesansicht" }, | 1197 | { "Day view","Tagesansicht" }, |
1198 | { "Next days","Nächste Tage" }, | 1198 | { "Next days","Nächste Tage" }, |
1199 | { "Next week","Nächste Woche" }, | 1199 | { "Next week","Nächste Woche" }, |
1200 | { "Next two weeks","Nächste zwei Wochen" }, | 1200 | { "Next two weeks","Nächste zwei Wochen" }, |
1201 | { "Next month","Nächster Monat" }, | 1201 | { "Next month","Nächster Monat" }, |
1202 | { "Journal view","Journal" }, | 1202 | { "Journal view","Journal" }, |
1203 | { "Display all opened","Zeige alle geöffnet" }, | 1203 | { "Display all opened","Zeige alle geöffnet" }, |
1204 | { "Display all closed","Zeige alle geschlossen" }, | 1204 | { "Display all closed","Zeige alle geschlossen" }, |
1205 | { "Display all flat","Zeige alle flach" }, | 1205 | { "Display all flat","Zeige alle flach" }, |
1206 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, | 1206 | { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, |
1207 | { "Default todo done color:","Standard Todo erledigt Farbe" }, | 1207 | { "Default todo done color:","Standard Todo erledigt Farbe" }, |
1208 | { "","" }, | 1208 | { "Select week %1-%2","Selektiere Woche %1-%2" }, |
1209 | { "","" }, | 1209 | { "Select Week","Selektiere Woche" }, |
1210 | { "","" }, | 1210 | { "","" }, |
1211 | { "","" }, | 1211 | { "","" }, |
1212 | { "","" }, | 1212 | { "","" }, |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 918931a..1908b1c 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -424,35 +424,44 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
424 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); | 424 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); |
425 | mExpandButton->setFocusPolicy(NoFocus); | 425 | mExpandButton->setFocusPolicy(NoFocus); |
426 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); | 426 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); |
427 | mAllDayAgenda->setFocusPolicy(NoFocus); | 427 | mAllDayAgenda->setFocusPolicy(NoFocus); |
428 | QVBox *dummyAllDayRight = new QVBox(mAllDayFrame); | 428 | QVBox *dummyAllDayRight = new QVBox(mAllDayFrame); |
429 | 429 | ||
430 | QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight); | 430 | QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight); |
431 | mDummyAllDayRightL = new QLabel ( dummyAllDayRight ); | 431 | mDummyAllDayRightL = new QLabel ( dummyAllDayRight ); |
432 | 432 | ||
433 | dummyAllDayRightB->setFlat( true ); | 433 | dummyAllDayRightB->setFlat( true ); |
434 | dummyAllDayRightB->setFocusPolicy(NoFocus); | 434 | dummyAllDayRightB->setFocusPolicy(NoFocus); |
435 | dummyAllDayRightB->setFixedHeight( (dummyAllDayRightB->sizeHint().height()/4)*3 ); | 435 | dummyAllDayRightB->setFixedHeight( (dummyAllDayRightB->sizeHint().height()/4)*3 ); |
436 | |||
436 | QPopupMenu * wpo = new QPopupMenu (this); | 437 | QPopupMenu * wpo = new QPopupMenu (this); |
437 | wpo->insertItem( i18n("W#"), 0 ); | 438 | QPopupMenu * all = new QPopupMenu (this); |
439 | //wpo->insertItem( i18n("W#"), 0 ); | ||
440 | int first = 1; | ||
438 | int i; | 441 | int i; |
439 | for ( i = 1; i < 53; i++ ) | 442 | for ( i = 1; i < 50; ++i ) { |
443 | if ( !(i%10) ) { | ||
444 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | ||
445 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); | ||
446 | first = i; | ||
447 | wpo = new QPopupMenu (this); | ||
448 | } | ||
440 | wpo->insertItem( QString::number( i ),i ); | 449 | wpo->insertItem( QString::number( i ),i ); |
441 | //Qt bug - we must add some empty fields... | ||
442 | for ( i = 53; i < 54; ++i ) { | ||
443 | wpo->insertItem( "", 52 ); | ||
444 | } | 450 | } |
445 | dummyAllDayRightB->setPopup( wpo ); | 451 | for ( i = 50; i < 53; ++i ) { |
446 | 452 | wpo->insertItem( QString::number(i), i); | |
453 | } | ||
454 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | ||
455 | dummyAllDayRightB->setPopup( all ); | ||
447 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); | 456 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeekNum ( int ) ) ); |
448 | 457 | ||
449 | // Create event context menu for all day agenda | 458 | // Create event context menu for all day agenda |
450 | mAllDayAgendaPopup = eventPopup(); | 459 | mAllDayAgendaPopup = eventPopup(); |
451 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), | 460 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), |
452 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); | 461 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); |
453 | 462 | ||
454 | // Create agenda frame | 463 | // Create agenda frame |
455 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3); | 464 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3); |
456 | // QHBox *agendaFrame = new QHBox(splitterAgenda); | 465 | // QHBox *agendaFrame = new QHBox(splitterAgenda); |
457 | 466 | ||
458 | // create event indicator bars | 467 | // create event indicator bars |
@@ -572,25 +581,25 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
572 | SLOT( updateConfig( ) ) ); | 581 | SLOT( updateConfig( ) ) ); |
573 | connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), | 582 | connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), |
574 | SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); | 583 | SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); |
575 | connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), | 584 | connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), |
576 | SLOT( addToCalSlot(Incidence * , Incidence *) ) ); | 585 | SLOT( addToCalSlot(Incidence * , Incidence *) ) ); |
577 | // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); | 586 | // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); |
578 | //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); | 587 | //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); |
579 | 588 | ||
580 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 589 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
581 | QFontMetrics fm ( dlf ); | 590 | QFontMetrics fm ( dlf ); |
582 | QString dayTest = "30"; | 591 | QString dayTest = "30"; |
583 | int wid = fm.width( dayTest ); | 592 | int wid = fm.width( dayTest ); |
584 | int maxWid = dummyAllDayRight->width(); | 593 | int maxWid = dummyAllDayRight->width()-2; |
585 | int fontPoint = dlf.pointSize(); | 594 | int fontPoint = dlf.pointSize(); |
586 | while ( wid > maxWid ) { | 595 | while ( wid > maxWid ) { |
587 | --fontPoint; | 596 | --fontPoint; |
588 | dlf.setPointSize( fontPoint ); | 597 | dlf.setPointSize( fontPoint ); |
589 | QFontMetrics f( dlf ); | 598 | QFontMetrics f( dlf ); |
590 | wid = f.width( dayTest ); | 599 | wid = f.width( dayTest ); |
591 | } | 600 | } |
592 | mDummyAllDayRightL->setFont( dlf ); | 601 | mDummyAllDayRightL->setFont( dlf ); |
593 | mDummyAllDayRightL->setAlignment( AlignHCenter ); | 602 | mDummyAllDayRightL->setAlignment( AlignHCenter ); |
594 | } | 603 | } |
595 | 604 | ||
596 | void KOAgendaView::toggleAllDay() | 605 | void KOAgendaView::toggleAllDay() |
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 2406bb5..24de01f 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -127,35 +127,43 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
127 | // // KOGlobals::self()->calendarSystem()->year(date) ) + " 2000" ); | 127 | // // KOGlobals::self()->calendarSystem()->year(date) ) + " 2000" ); |
128 | // int width = fm.width("September 2000" ); | 128 | // int width = fm.width("September 2000" ); |
129 | // if ( width > maxwidth ) maxwidth = width; | 129 | // if ( width > maxwidth ) maxwidth = width; |
130 | // } | 130 | // } |
131 | maxwidth = width+2; | 131 | maxwidth = width+2; |
132 | int size = fm.height()+2; | 132 | int size = fm.height()+2; |
133 | if ( QApplication::desktop()->width() >= 480 ) { | 133 | if ( QApplication::desktop()->width() >= 480 ) { |
134 | size += 6; | 134 | size += 6; |
135 | maxwidth+= 6; | 135 | maxwidth+= 6; |
136 | } | 136 | } |
137 | 137 | ||
138 | if ( insertWeek ) { | 138 | if ( insertWeek ) { |
139 | //shit : bug in Qt. after inserting 53 item, only 51 are shown... | ||
140 | QPopupMenu * wpo = new QPopupMenu (this); | 139 | QPopupMenu * wpo = new QPopupMenu (this); |
141 | wpo->insertItem( i18n("W#"), 0 ); | 140 | QPopupMenu * all = new QPopupMenu (this); |
142 | for ( i = 1; i < 53; ++i ) { | 141 | //wpo->insertItem( i18n("W#"), 0 ); |
142 | int first = 1; | ||
143 | for ( i = 1; i < 50; ++i ) { | ||
144 | if ( !(i%10) ) { | ||
145 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | ||
146 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | ||
147 | first = i; | ||
148 | wpo = new QPopupMenu (this); | ||
149 | } | ||
143 | wpo->insertItem( QString::number(i), i ); | 150 | wpo->insertItem( QString::number(i), i ); |
144 | } | 151 | } |
145 | for ( i = 53; i < 54; ++i ) { | 152 | for ( i = 50; i < 53; ++i ) { |
146 | wpo->insertItem( "", 52 ); | 153 | wpo->insertItem( QString::number(i), i); |
147 | } | 154 | } |
148 | selWeek->setPopup( wpo ); | 155 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); |
149 | selWeek->setFixedWidth( (size/4)*3 ); | 156 | selWeek->setPopup( all ); |
157 | selWeek->setFixedWidth( (size/5)*4 ); | ||
150 | selWeek->setFixedHeight( size ); | 158 | selWeek->setFixedHeight( size ); |
151 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | 159 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); |
152 | } | 160 | } |
153 | mSelectMonth->setFixedWidth( maxwidth ); | 161 | mSelectMonth->setFixedWidth( maxwidth ); |
154 | mSelectMonth->setFixedHeight( size ); | 162 | mSelectMonth->setFixedHeight( size ); |
155 | mPrevYear->setFixedHeight( size ); | 163 | mPrevYear->setFixedHeight( size ); |
156 | mPrevMonth->setFixedHeight( size ); | 164 | mPrevMonth->setFixedHeight( size ); |
157 | mNextMonth->setFixedHeight( size ); | 165 | mNextMonth->setFixedHeight( size ); |
158 | mNextYear->setFixedHeight ( size ); | 166 | mNextYear->setFixedHeight ( size ); |
159 | // set up control frame layout | 167 | // set up control frame layout |
160 | QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 ); | 168 | QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 ); |
161 | ctrlLayout->addWidget( mPrevYear, 3 ); | 169 | ctrlLayout->addWidget( mPrevYear, 3 ); |