Comment out filer/filter settings menu options as they will not be implemented for Opie 1.2

2 files changed, 12 insertions, 19 deletions

diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index f22a302..a6d574b 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -241,4 +241,4 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
         m_viewMenu->clear();
-        m_viewMenuGroup->addTo( m_viewMenu );
-        m_viewMenu->insertSeparator();
+//        m_viewMenuGroup->addTo( m_viewMenu );
+//        m_viewMenu->insertSeparator();
         m_viewMenuAppGroup = items;
@@ -366,8 +366,2 @@ void OPimMainWindow::initBars( const QString &itemName ) {
 
-//     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" ),
@@ -380,11 +374,11 @@ void OPimMainWindow::initBars( const QString &itemName ) {
     // 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." ) );
+//    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." ) );
 
diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h
index fa7a730..0d3f7b7 100644
--- a/libopie2/opiepim/ui/opimmainwindow.h
+++ b/libopie2/opiepim/ui/opimmainwindow.h
@@ -109,3 +109,2 @@ protected slots:
     virtual void slotItemBeam() = 0;
-    //virtual void slotItemFind() = 0;
     virtual void slotConfigure() = 0;
@@ -165,3 +164,3 @@ private:
     QActionGroup *m_viewMenuAppGroup;    // Action group containing application items in View menu
-    QActionGroup *m_viewMenuGroup;       // Action group containing default items in View menu
+//    QActionGroup *m_viewMenuGroup;       // Action group containing default items in View menu
     QAction      *m_itemNewAction;       // Add new item action