Diffstat (limited to 'libopie2/opiepim/ui/opimmainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 13 |
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 @@ -211,12 +211,13 @@ void OPimMainWindow::timerEvent( QTimerEvent* e) { QPopupMenu *OPimMainWindow::itemContextMenu() { if ( !m_itemContextMenu ) { // Create context menu if hasn't been done before m_itemContextMenu = new QPopupMenu( this ); m_itemEditAction->addTo( m_itemContextMenu ); m_itemDuplicateAction->addTo( m_itemContextMenu ); + m_itemBeamAction->addTo( m_itemContextMenu ); m_itemDeleteAction->addTo( m_itemContextMenu ); } return m_itemContextMenu; } @@ -340,26 +341,26 @@ void OPimMainWindow::initBars( const QString &itemName ) { m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ), QString::null, 0, m_itemMenuGroup1, 0 ); connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); - m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), - QString::null, 0, m_itemMenuGroup1, 0 ); - connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); - m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); - m_itemDeleteAction->addTo( toolbar ); - if ( Ir::supported() ) { m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, m_itemMenuGroup1, 0 ); connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) ); m_itemBeamAction->addTo( toolbar ); } + m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), + QString::null, 0, m_itemMenuGroup1, 0 ); + connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); + m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); + m_itemDeleteAction->addTo( toolbar ); + m_itemMenuGroup1->addTo( m_itemMenu ); m_itemMenu->insertSeparator(); m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); |