Add beam to context menu, flip beam and delete actions in menu/toolbars

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
@@ -169,96 +169,97 @@ OPimRecord* OPimMainWindow::record( int rtti,  const QByteArray& array ) {
     if ( !record || !record->loadFromStream(str) ) {
         delete record;
         record = 0l;
     }
 
     return record;
 }
 
 /*
  * get the rtti for the service
  */
 int OPimMainWindow::service() {
     if ( m_rtti == -1 )
         m_rtti  =  OPimResolver::self()->serviceId( m_service );
 
     return m_rtti;
 }
 
 void OPimMainWindow::doAlarm( const QDateTime&, int  ) {
 
 }
 
 void OPimMainWindow::startAlarm(int count  ) {
     m_alarmCount = count;
     m_playedCount = 0;
     Sound::soundAlarm();
     m_timerId = startTimer( 5000 );
 }
 
 void OPimMainWindow::killAlarm() {
     killTimer( m_timerId );
 }
 
 void OPimMainWindow::timerEvent( QTimerEvent* e) {
     if ( m_playedCount <m_alarmCount ) {
         m_playedCount++;
         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 );
         m_itemMenu->insertSeparator();
         items->addTo( m_itemMenu );
         m_itemMenu->insertSeparator();
         m_itemMenuGroup2->addTo( m_itemMenu );
     }
 }
 
 void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
     // Insert menu items into View menu
     if ( items ) {
         // Rebuild Item menu
         m_viewMenu->clear();
         m_viewMenuGroup->addTo( m_viewMenu );
         m_viewMenu->insertSeparator();
         m_viewMenuAppGroup = items;
         m_viewMenuAppGroup->addTo( m_viewMenu );
     }
 }
 
 void OPimMainWindow::setViewCategory( const QString &category ) {
     // Find category in list
     for ( int i = 0; i < m_catSelect->count(); i++ ) {
         if ( m_catSelect->text( i ) == category ) {
             m_catSelect->setCurrentItem( i );
             emit categorySelected( category );
             return;
         }
     }
 }
 
 void OPimMainWindow::reloadCategories() {
     QString selected = m_catSelect->currentText();
 
     // Remove old categories from list
     m_catSelect->clear();
 
@@ -298,103 +299,103 @@ void OPimMainWindow::setShowCategories( bool show ) {
     show ? m_catSelect->show()
          : m_catSelect->hide();
 }
 
 void OPimMainWindow::initBars( const QString &itemName ) {
     QString itemStr = itemName.lower();
 
     setToolBarsMovable( false );
 
     // Create application menu bar
     QToolBar *mbHold = new QToolBar( this );
     mbHold->setHorizontalStretchable( true );
     QMenuBar *menubar = new QMenuBar( mbHold );
     menubar->setMargin( 0 );
 
     // Create application menu bar
     QToolBar *toolbar = new QToolBar( this );
 
     // Create sub-menus
     m_itemMenu = new QPopupMenu( this );
     m_itemMenu->setCheckable( true );
     menubar->insertItem( itemName, m_itemMenu );
     m_viewMenu = new QPopupMenu( this );
     m_viewMenu->setCheckable( true );
     menubar->insertItem( tr( "View" ), m_viewMenu );
 
     m_viewMenuAppGroup = 0l;
 
     // Item menu
     m_itemMenuGroup1 = new QActionGroup( this, QString::null, false );
 
     m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, m_itemMenuGroup1, 0 );
     connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) );
     m_itemNewAction->setWhatsThis( tr( "Click here to create a new item." ) );
     m_itemNewAction->addTo( toolbar );
 
     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 );
 
     m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ),
                                      QString::null, 0, m_itemMenuGroup2, 0 );
     connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) );
     m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) );
 
     m_itemMenuGroup2->addTo( m_itemMenu );
 
     // View menu
     m_viewMenuGroup = new QActionGroup( this, QString::null, false );
 
     QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) );
     a->setWhatsThis( tr( "Click here to filter the items displayed." ) );
 
     a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) );
     a->setWhatsThis( tr( "Click here to modify the current filter settings." ) );
 
     // Create view toolbar
     toolbar = new QToolBar( this );
     m_catSelect = new QComboBox( toolbar );
     connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) );
     QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) );
 
     // Do initial load of categories
     reloadCategories();
 }
 
 } // namespace Opie