summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index bdf20a9..f22a302 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -215,4 +215,5 @@ QPopupMenu *OPimMainWindow::itemContextMenu() {
215 m_itemEditAction->addTo( m_itemContextMenu ); 215 m_itemEditAction->addTo( m_itemContextMenu );
216 m_itemDuplicateAction->addTo( m_itemContextMenu ); 216 m_itemDuplicateAction->addTo( m_itemContextMenu );
217 m_itemBeamAction->addTo( m_itemContextMenu );
217 m_itemDeleteAction->addTo( m_itemContextMenu ); 218 m_itemDeleteAction->addTo( m_itemContextMenu );
218 } 219 }
@@ -344,10 +345,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
344 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); 345 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) );
345 346
346 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ),
347 QString::null, 0, m_itemMenuGroup1, 0 );
348 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
349 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) );
350 m_itemDeleteAction->addTo( toolbar );
351
352 if ( Ir::supported() ) { 347 if ( Ir::supported() ) {
353 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), 348 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
@@ -358,4 +353,10 @@ void OPimMainWindow::initBars( const QString &itemName ) {
358 } 353 }
359 354
355 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ),
356 QString::null, 0, m_itemMenuGroup1, 0 );
357 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
358 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) );
359 m_itemDeleteAction->addTo( toolbar );
360
360 m_itemMenuGroup1->addTo( m_itemMenu ); 361 m_itemMenuGroup1->addTo( m_itemMenu );
361 362