summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -675,7 +675,8 @@ void MainWindow::initActions()
675 menuBar1 = menuBar(); 675 menuBar1 = menuBar();
676 menuBar1->insertItem( i18n("File"), importMenu ); 676 menuBar1->insertItem( i18n("File"), importMenu );
677 menuBar1->insertItem( i18n("View"), viewMenu ); 677 menuBar1->insertItem( i18n("View"), viewMenu );
678 menuBar1->insertItem( i18n("Actions"), actionMenu ); 678 menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
679 menuBar1->insertItem( i18n("Action"), actionMenu );
679#ifdef DESKTOP_VERSION 680#ifdef DESKTOP_VERSION
680 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 681 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
681 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 682 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
@@ -695,7 +696,8 @@ void MainWindow::initActions()
695 //menuBar1->insertItem( i18n("ME"), menuBar); 696 //menuBar1->insertItem( i18n("ME"), menuBar);
696 menuBar->insertItem( i18n("File"), importMenu ); 697 menuBar->insertItem( i18n("File"), importMenu );
697 menuBar->insertItem( i18n("View"), viewMenu ); 698 menuBar->insertItem( i18n("View"), viewMenu );
698 menuBar->insertItem( i18n("Actions"), actionMenu ); 699 menuBar->insertItem( i18n("Edit"), mCurrentItemMenu );
700 menuBar->insertItem( i18n("Action"), actionMenu );
699 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 701 menuBar->insertItem( i18n("Synchronize"), syncMenu );
700 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 702 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
701 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 703 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
@@ -782,10 +784,10 @@ void MainWindow::initActions()
782 784
783 785
784 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 786 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
785 action->addTo( actionMenu ); 787 action->addTo( mCurrentItemMenu );
786 connect( action, SIGNAL( activated() ), 788 connect( action, SIGNAL( activated() ),
787 mView, SLOT( undo_delete() ) ); 789 mView, SLOT( undo_delete() ) );
788 790 mCurrentItemMenu->insertSeparator();
789 icon = loadPixmap( pathString + "newevent" ); 791 icon = loadPixmap( pathString + "newevent" );
790 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 792 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
791 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 793 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
@@ -795,7 +797,7 @@ void MainWindow::initActions()
795 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 797 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
796 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 798 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
797 799
798 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 800 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
799 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 801 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
800 mShowAction->addTo( mCurrentItemMenu ); 802 mShowAction->addTo( mCurrentItemMenu );
801 connect( mShowAction, SIGNAL( activated() ), 803 connect( mShowAction, SIGNAL( activated() ),
@@ -1722,10 +1724,6 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1722 1724
1723void MainWindow::enableIncidenceActions( bool enabled ) 1725void MainWindow::enableIncidenceActions( bool enabled )
1724{ 1726{
1725
1726#ifndef DESKTOP_VERSION
1727 mCurrentItemMenu->setEnabled( enabled );
1728#else
1729 mShowAction->setEnabled( enabled ); 1727 mShowAction->setEnabled( enabled );
1730 mEditAction->setEnabled( enabled ); 1728 mEditAction->setEnabled( enabled );
1731 mDeleteAction->setEnabled( enabled ); 1729 mDeleteAction->setEnabled( enabled );
@@ -1734,7 +1732,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
1734 mMoveAction->setEnabled( enabled ); 1732 mMoveAction->setEnabled( enabled );
1735 mBeamAction->setEnabled( enabled ); 1733 mBeamAction->setEnabled( enabled );
1736 mCancelAction->setEnabled( enabled ); 1734 mCancelAction->setEnabled( enabled );
1737#endif
1738} 1735}
1739 1736
1740void MainWindow::importOL() 1737void MainWindow::importOL()