fixes

1 files changed, 13 insertions, 29 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -798,7 +798,7 @@ void MainWindow::initActions()
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
 
     //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
-    mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
+    mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
     mShowAction->addTo( mCurrentItemMenu  );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
@@ -822,10 +822,12 @@ void MainWindow::initActions()
     mMoveAction->addTo( mCurrentItemMenu  );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
+#ifndef DESKTOP_VERSION
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo(mCurrentItemMenu  );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
+#endif
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( mCurrentItemMenu  );
     connect( mCancelAction, SIGNAL( activated() ),
@@ -1647,35 +1649,27 @@ void MainWindow::updateWeekNum(const DateList &selectedDates)
 }
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
-
     if ( !incidence ) {
+        mShowAction->setMenuText( i18n("Show") );
         enableIncidenceActions( false );
-
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
-
     }
-
-    //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->typeID() != todoID ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             if ( incidence->doesFloat() ) {
-            startString += ": "+incidence->dtStartDateStr( true );
-            startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
-
+                startString += ": "+incidence->dtStartDateStr( true );
+                startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
             } else {
-            startString = ": "+incidence->dtStartStr(true);
-            startString += " --- "+((Event*)incidence)->dtEndStr(true);
-
+                startString = ": "+incidence->dtStartStr(true);
+                startString += " --- "+((Event*)incidence)->dtEndStr(true);
             }
-
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-
             if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
@@ -1687,33 +1681,21 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
             else
                 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
-
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     setCaption( incidence->summary()+startString);
-
     enableIncidenceActions( true );
-
     if ( incidence->typeID() == eventID ) {
-        mShowAction->setText( i18n("Show Event...") );
-        mEditAction->setText( i18n("Edit Event...") );
-        mDeleteAction->setText( i18n("Delete Event...") );
-
+        mShowAction->setMenuText( i18n("Show Event") );
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->typeID() == todoID ) {
-        mShowAction->setText( i18n("Show Todo...") );
-        mEditAction->setText( i18n("Edit Todo...") );
-        mDeleteAction->setText( i18n("Delete Todo...") );
-
+        mShowAction->setMenuText( i18n("Show Todo") );
         mNewSubTodoAction->setEnabled( true );
     } else {
-        mShowAction->setText( i18n("Show...") );
-        mShowAction->setText( i18n("Edit...") );
-        mShowAction->setText( i18n("Delete...") );
-
+        mShowAction->setMenuText( i18n("Show") );
         mNewSubTodoAction->setEnabled( false );
     }
 }
@@ -1726,7 +1708,9 @@ void MainWindow::enableIncidenceActions( bool enabled )
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
+#ifndef DESKTOP_VERSION
     mBeamAction->setEnabled( enabled );
+#endif
     mCancelAction->setEnabled( enabled );
 }