summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -205,24 +205,25 @@ void OPimMainWindow::timerEvent( QTimerEvent* e) {
Sound::soundAlarm();
}else {
killTimer( e->timerId() );
}
}
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;
}
void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) {
// Insert menu items into Item menu
if ( items ) {
// Rebuild Item menu
m_itemMenu->clear();
m_itemMenuGroup1->addTo( m_itemMenu );
@@ -334,38 +335,38 @@ void OPimMainWindow::initBars( const QString &itemName ) {
m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) );
m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) );
m_itemEditAction->addTo( toolbar );
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 );
// a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ),
// QString::null, 0, m_itemMenuGroup2, 0 );
// connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) );
// a->setWhatsThis( tr( "Click here to search for an item." ) );
// a->addTo( toolbar );