-rw-r--r-- | korganizer/kotodoview.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 94f35e6..3ae977d 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -523,31 +523,38 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
523 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | 523 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); |
524 | QPushButton * flat = new QPushButton( "F",mQuickBar ); | 524 | QPushButton * flat = new QPushButton( "F",mQuickBar ); |
525 | 525 | ||
526 | int fixwid = flat->sizeHint().height(); | 526 | int fixwid = mQuickAdd->sizeHint().height(); |
527 | if ( QApplication::desktop()->width() >= 800 ) | 527 | if ( QApplication::desktop()->width() > 800 ) |
528 | fixwid *= 2; | 528 | fixwid *= 2; |
529 | flat->setFixedWidth( fixwid ); | ||
530 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); | 529 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); |
531 | allopen->setFixedWidth( fixwid ); | ||
532 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); | 530 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); |
533 | allclose->setFixedWidth( fixwid ); | ||
534 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); | 531 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); |
535 | s_done->setPixmap( SmallIcon("greenhook16")); | 532 | s_done->setPixmap( SmallIcon("greenhook16")); |
536 | s_done->setFixedWidth( fixwid ); | ||
537 | s_done->setFixedHeight( flat->sizeHint().height() ); | 533 | s_done->setFixedHeight( flat->sizeHint().height() ); |
538 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); | 534 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); |
539 | s_run->setPixmap( SmallIcon("ko16old")); | 535 | s_run->setPixmap( SmallIcon("ko16old")); |
540 | s_run->setFixedWidth( fixwid ); | ||
541 | s_run->setFixedHeight( flat->sizeHint().height() ); | ||
542 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); | 536 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); |
543 | 537 | ||
544 | mNewSubBut->setFixedWidth( fixwid*3/2 ); | ||
545 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); | 538 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); |
539 | |||
540 | mNewSubBut->setFixedWidth(mNewSubBut->sizeHint().width() ); | ||
546 | mNewSubBut->setEnabled( false ); | 541 | mNewSubBut->setEnabled( false ); |
542 | flat->setFixedWidth( fixwid ); | ||
543 | s_done->setFixedWidth( fixwid ); | ||
544 | allopen->setFixedWidth( fixwid ); | ||
545 | allclose->setFixedWidth( fixwid ); | ||
546 | s_run->setFixedWidth( fixwid ); | ||
547 | if ( QApplication::desktop()->width() < 800 ) { | ||
548 | flat->setFixedHeight( fixwid ); | ||
549 | s_done->setFixedHeight( fixwid ); | ||
550 | allopen->setFixedHeight( fixwid ); | ||
551 | allclose->setFixedHeight( fixwid ); | ||
552 | s_run->setFixedHeight( fixwid ); | ||
553 | mNewSubBut->setFixedHeight( fixwid ); | ||
554 | } | ||
547 | quickLayout->addWidget( mNewSubBut ); | 555 | quickLayout->addWidget( mNewSubBut ); |
548 | quickLayout->addWidget( s_done ); | 556 | quickLayout->addWidget( s_done ); |
549 | quickLayout->addWidget( s_run ); | 557 | quickLayout->addWidget( s_run ); |
550 | |||
551 | quickLayout->addWidget( allopen ); | 558 | quickLayout->addWidget( allopen ); |
552 | quickLayout->addWidget( allclose ); | 559 | quickLayout->addWidget( allclose ); |
553 | quickLayout->addWidget( flat ); | 560 | quickLayout->addWidget( flat ); |
@@ -1114,9 +1121,9 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) | |||
1114 | case 3: | 1121 | case 3: |
1115 | moveTodo(); | 1122 | moveTodo(); |
1116 | break; | 1123 | break; |
1117 | case 8: | 1124 | case 7: |
1118 | mCategoryPopupMenu->popup(QCursor::pos ()); break; | 1125 | mCategoryPopupMenu->popup(QCursor::pos ()); break; |
1119 | case 9: | 1126 | case 8: |
1120 | mCalPopupMenu->popup(QCursor::pos ()); break; | 1127 | mCalPopupMenu->popup(QCursor::pos ()); break; |
1121 | default: | 1128 | default: |
1122 | mItemPopupMenu->popup(QCursor::pos()); | 1129 | mItemPopupMenu->popup(QCursor::pos()); |