summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 46ae6a0..a652c05 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -531,96 +531,103 @@ void MainWindow::initActions()
531 menuBar1 = new QPEMenuBar( iconToolBar ); 531 menuBar1 = new QPEMenuBar( iconToolBar );
532 QPopupMenu *menuBar = new QPopupMenu( this ); 532 QPopupMenu *menuBar = new QPopupMenu( this );
533 menuBar1->insertItem( i18n("ME"), menuBar); 533 menuBar1->insertItem( i18n("ME"), menuBar);
534 menuBar->insertItem( i18n("File"), importMenu ); 534 menuBar->insertItem( i18n("File"), importMenu );
535 menuBar->insertItem( i18n("View"), viewMenu ); 535 menuBar->insertItem( i18n("View"), viewMenu );
536 menuBar->insertItem( i18n("Actions"), actionMenu ); 536 menuBar->insertItem( i18n("Actions"), actionMenu );
537 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 537 menuBar->insertItem( i18n("Synchronize"), syncMenu );
538 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 538 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
539 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 539 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
540 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 540 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
541 menuBar->insertItem( i18n("Help"), helpMenu ); 541 menuBar->insertItem( i18n("Help"), helpMenu );
542 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 542 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
543 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 543 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
544 } 544 }
545 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 545 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
546 connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) ); 546 connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) );
547 547
548 // ****************** 548 // ******************
549 QAction *action; 549 QAction *action;
550 QIconSet icon; 550 QIconSet icon;
551 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 551 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
552 configureToolBarMenu->setCheckable( true ); 552 configureToolBarMenu->setCheckable( true );
553 553
554 QString pathString = ""; 554 QString pathString = "";
555 if ( !p->mToolBarMiniIcons ) { 555 if ( !p->mToolBarMiniIcons ) {
556 if ( QApplication::desktop()->width() < 480 ) 556 if ( QApplication::desktop()->width() < 480 )
557 pathString += "icons16/"; 557 pathString += "icons16/";
558 } else 558 } else
559 pathString += "iconsmini/"; 559 pathString += "iconsmini/";
560 configureAgendaMenu->setCheckable( true ); 560 configureAgendaMenu->setCheckable( true );
561 configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 ); 561 configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
562 configureAgendaMenu->insertSeparator(); 562 configureAgendaMenu->insertSeparator();
563 configureAgendaMenu->insertItem(i18n("Tiny"), 4 ); 563 configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
564 configureAgendaMenu->insertItem(i18n("Small"), 6 ); 564 configureAgendaMenu->insertItem(i18n("Small"), 6 );
565 configureAgendaMenu->insertItem(i18n("Medium"), 8 ); 565 configureAgendaMenu->insertItem(i18n("Medium"), 8 );
566 configureAgendaMenu->insertItem(i18n("Normal"), 10 ); 566 configureAgendaMenu->insertItem(i18n("Normal"), 10 );
567 configureAgendaMenu->insertItem(i18n("Large"), 12 ); 567 configureAgendaMenu->insertItem(i18n("Large"), 12 );
568 configureAgendaMenu->insertItem(i18n("Big"), 14 ); 568 configureAgendaMenu->insertItem(i18n("Big"), 14 );
569 configureAgendaMenu->insertItem(i18n("Bigger"), 16 ); 569 configureAgendaMenu->insertItem(i18n("Bigger"), 16 );
570 configureAgendaMenu->insertItem(i18n("Biggest"), 18 ); 570 configureAgendaMenu->insertItem(i18n("Biggest"), 18 );
571 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 571 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
572 572
573 icon = loadPixmap( pathString + "configure" ); 573 icon = loadPixmap( pathString + "configure" );
574 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); 574 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
575 action->addTo( actionMenu ); 575 action->addTo( actionMenu );
576 connect( action, SIGNAL( activated() ), 576 connect( action, SIGNAL( activated() ),
577 mView, SLOT( edit_options() ) ); 577 mView, SLOT( edit_options() ) );
578 actionMenu->insertSeparator(); 578 actionMenu->insertSeparator();
579
580 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
581 action->addTo( actionMenu );
582 connect( action, SIGNAL( activated() ),
583 mView, SLOT( undo_delete() ) );
584 actionMenu->insertSeparator();
585
579 icon = loadPixmap( pathString + "newevent" ); 586 icon = loadPixmap( pathString + "newevent" );
580 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 587 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
581 configureToolBarMenu->insertSeparator(); 588 configureToolBarMenu->insertSeparator();
582 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 589 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
583 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 590 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
584 ne_action->addTo( actionMenu ); 591 ne_action->addTo( actionMenu );
585 connect( ne_action, SIGNAL( activated() ), 592 connect( ne_action, SIGNAL( activated() ),
586 mView, SLOT( newEvent() ) ); 593 mView, SLOT( newEvent() ) );
587 icon = loadPixmap( pathString + "newtodo" ); 594 icon = loadPixmap( pathString + "newtodo" );
588 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 595 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
589 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 596 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
590 nt_action->addTo( actionMenu ); 597 nt_action->addTo( actionMenu );
591 connect( nt_action, SIGNAL( activated() ), 598 connect( nt_action, SIGNAL( activated() ),
592 mView, SLOT( newTodo() ) ); 599 mView, SLOT( newTodo() ) );
593 icon = loadPixmap( pathString + "navi" ); 600 icon = loadPixmap( pathString + "navi" );
594 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 601 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
595 action->addTo( viewMenu ); 602 action->addTo( viewMenu );
596 connect( action, SIGNAL( activated() ), 603 connect( action, SIGNAL( activated() ),
597 mView, SLOT( toggleDateNavigatorWidget() ) ); 604 mView, SLOT( toggleDateNavigatorWidget() ) );
598 icon = loadPixmap( pathString + "filter" ); 605 icon = loadPixmap( pathString + "filter" );
599 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 606 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
600 action->addTo( viewMenu ); 607 action->addTo( viewMenu );
601 connect( action, SIGNAL( activated() ), 608 connect( action, SIGNAL( activated() ),
602 mView, SLOT( toggleFilter() ) ); 609 mView, SLOT( toggleFilter() ) );
603 610
604 611
605 viewMenu->insertSeparator(); 612 viewMenu->insertSeparator();
606 icon = loadPixmap( pathString + "picker" ); 613 icon = loadPixmap( pathString + "picker" );
607 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 614 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
608 action->addTo( viewMenu ); 615 action->addTo( viewMenu );
609 connect( action, SIGNAL( activated() ), 616 connect( action, SIGNAL( activated() ),
610 mView, SLOT( showDatePicker() ) ); 617 mView, SLOT( showDatePicker() ) );
611 action->addTo( iconToolBar ); 618 action->addTo( iconToolBar );
612 viewMenu->insertSeparator(); 619 viewMenu->insertSeparator();
613 icon = loadPixmap( pathString + "list" ); 620 icon = loadPixmap( pathString + "list" );
614 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 621 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
615 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 622 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
616 showlist_action->addTo( viewMenu ); 623 showlist_action->addTo( viewMenu );
617 connect( showlist_action, SIGNAL( activated() ), 624 connect( showlist_action, SIGNAL( activated() ),
618 mView->viewManager(), SLOT( showListView() ) ); 625 mView->viewManager(), SLOT( showListView() ) );
619 626
620 627
621 icon = loadPixmap( pathString + "day" ); 628 icon = loadPixmap( pathString + "day" );
622 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 629 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
623 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); 630 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
624 day1_action->addTo( viewMenu ); 631 day1_action->addTo( viewMenu );
625 // action->addTo( toolBar ); 632 // action->addTo( toolBar );
626 connect( day1_action, SIGNAL( activated() ), 633 connect( day1_action, SIGNAL( activated() ),