Additional menu functionality for OPimMainWindow

2 files changed, 48 insertions, 15 deletions

diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 053b250..cf05329 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -261,24 +261,48 @@ void OPimMainWindow::reloadCategories() {
 
     // Remove old categories from list
     m_catSelect->clear();
 
     // Add categories to list
     Categories cats;
     cats.load( categoryFileName() );
     m_catSelect->insertItem( tr( "All" ) );
     m_catSelect->insertStringList( cats.labels( m_catGroupName ) );
     m_catSelect->insertItem( tr( "Unfiled" ) );
 }
 
+void OPimMainWindow::setItemNewEnabled( bool enable ) {
+    m_itemNewAction->setEnabled( enable );
+}
+
+void OPimMainWindow::setItemEditEnabled( bool enable ) {
+    m_itemEditAction->setEnabled( enable );
+}
+
+void OPimMainWindow::setItemDuplicateEnabled( bool enable ) {
+    m_itemDuplicateAction->setEnabled( enable );
+}
+
+void OPimMainWindow::setItemDeleteEnabled( bool enable ) {
+    m_itemDeleteAction->setEnabled( enable );
+}
+
+void OPimMainWindow::setItemBeamEnabled( bool enable ) {
+    m_itemBeamAction->setEnabled( enable );
+}
+
+void OPimMainWindow::setConfigureEnabled( bool enable ) {
+    m_configureAction->setEnabled( enable );
+}
+
 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
@@ -288,79 +312,78 @@ void OPimMainWindow::initBars( const QString &itemName ) {
     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 );
 
-    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
+    m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, m_itemMenuGroup1, 0 );
-    connect( a, SIGNAL(activated()), this, SLOT(slotItemNew()) );
-    a->setWhatsThis( tr( "Click here to create a new item." ) );
-    a->addTo( toolbar );
+    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() ) {
-        a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
-                         QString::null, 0, m_itemMenuGroup1, 0 );
-        connect( a, SIGNAL(activated()), this, SLOT(slotItemBeam()) );
-        a->setWhatsThis( tr( "Click here to transmit the selected item." ) );
-        //a->addTo( m_itemMenu );
-        a->addTo( toolbar );
+        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_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 );
 
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ),
-                     QString::null, 0, m_itemMenuGroup2, 0 );
-    connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) );
-    a->setWhatsThis( tr( "Click here to set your preferences for this application." ) );
+    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 );
 
-    a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 );
+    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." ) );
diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h
index b446583..9aa0ded 100644
--- a/libopie2/opiepim/ui/opimmainwindow.h
+++ b/libopie2/opiepim/ui/opimmainwindow.h
@@ -119,24 +119,31 @@ protected:
     void killAlarm();
     void timerEvent( QTimerEvent* );
 
     /** UI-related functions */
     QPopupMenu *itemContextMenu();
 
     void insertItemMenuItems( QActionGroup *items );
     void insertViewMenuItems( QActionGroup *items );
 
     void setViewCategory( const QString &category );
     void reloadCategories();
 
+    void setItemNewEnabled( bool enable );
+    void setItemEditEnabled( bool enable );
+    void setItemDuplicateEnabled( bool enable );
+    void setItemDeleteEnabled( bool enable );
+    void setItemBeamEnabled( bool enable );
+    void setConfigureEnabled( bool enable );
+
 private slots:
     void appMessage( const QCString&, const QByteArray& );
     void setDocument( const QString& );
 
 private:
     class Private;
     Private* d;
 
     int m_rtti;
     QCopChannel* m_channel;
     QString m_service;
     QCString m_str;
@@ -147,27 +154,30 @@ private:
 
     QString    m_catGroupName; // Name of category group
     Config     m_config;       // Configuration settings file
 
     // Menu bar data
     QPopupMenu   *m_itemContextMenu;     // Pointer to context-sensitive menu
     QPopupMenu   *m_itemMenu;            // Pointer to item menu
     QPopupMenu   *m_viewMenu;            // Pointer to view menu
     QActionGroup *m_itemMenuGroup1;      // Action group containing default items in Item menu
     QActionGroup *m_itemMenuGroup2;      // Action group containing default items in Item menu
     QActionGroup *m_viewMenuAppGroup;    // Action group containing application items in View menu
     QActionGroup *m_viewMenuGroup;       // Action group containing default items in View menu
+    QAction      *m_itemNewAction;       // Add new item action
     QAction      *m_itemEditAction;      // Edit current item action
     QAction      *m_itemDuplicateAction; // Duplicate current item action
     QAction      *m_itemDeleteAction;    // Delete current item action
+    QAction      *m_itemBeamAction;      // Beam current item action
+    QAction      *m_configureAction;     // Configure application dialog action
 
     QComboBox    *m_catSelect;           // Category selection combo box
 
     /* I would love to do this as a template
      * but can't think of a right way
      * because I need signal and slots -zecke
      */
     virtual OPimRecord* record( int rtti, const QByteArray& ) ;
     int service();
 
     /** UI-related functions */
     void initBars( const QString &itemName = tr( "Item" ) );