summaryrefslogtreecommitdiff
authordrw <drw>2005-02-08 00:36:16 (UTC)
committer drw <drw>2005-02-08 00:36:16 (UTC)
commitc5b7caa3eeadd30684b6a5edcaa51a41bc15bf6e (patch) (unidiff)
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
@@ -214,6 +214,7 @@ QPopupMenu *OPimMainWindow::itemContextMenu() {
214 m_itemContextMenu = new QPopupMenu( this ); 214 m_itemContextMenu = new QPopupMenu( this );
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 }
219 220
@@ -343,12 +344,6 @@ void OPimMainWindow::initBars( const QString &itemName ) {
343 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); 344 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) );
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" ),
354 QString::null, 0, m_itemMenuGroup1, 0 ); 349 QString::null, 0, m_itemMenuGroup1, 0 );
@@ -357,6 +352,12 @@ void OPimMainWindow::initBars( const QString &itemName ) {
357 m_itemBeamAction->addTo( toolbar ); 352 m_itemBeamAction->addTo( toolbar );
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
362 m_itemMenu->insertSeparator(); 363 m_itemMenu->insertSeparator();