summaryrefslogtreecommitdiff
authordrw <drw>2005-02-08 00:36:16 (UTC)
committer drw <drw>2005-02-08 00:36:16 (UTC)
commitc5b7caa3eeadd30684b6a5edcaa51a41bc15bf6e (patch) (side-by-side diff)
treeb96d5854f86a32ebccb8bbcc76d28cb0dde421e5
parent17b12cbae223e1e86212db0d092e4ed3bbe43e59 (diff)
downloadopie-c5b7caa3eeadd30684b6a5edcaa51a41bc15bf6e.zip
opie-c5b7caa3eeadd30684b6a5edcaa51a41bc15bf6e.tar.gz
opie-c5b7caa3eeadd30684b6a5edcaa51a41bc15bf6e.tar.bz2
Add beam to context menu, flip beam and delete actions in menu/toolbars
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
@@ -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 );