summaryrefslogtreecommitdiff
authordrw <drw>2005-02-23 16:43:06 (UTC)
committer drw <drw>2005-02-23 16:43:06 (UTC)
commit57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e (patch) (side-by-side diff)
treed36a6d071f2d3bd5ba1083ae66a6d37585a40a2f
parent81d6c0b396ce1f4acae85a8449367800787fe5c3 (diff)
downloadopie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.zip
opie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.tar.gz
opie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.tar.bz2
Comment out filer/filter settings menu options as they will not be implemented for Opie 1.2
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp28
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.h3
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
@@ -240,6 +240,6 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
// Rebuild Item menu
m_viewMenu->clear();
- m_viewMenuGroup->addTo( m_viewMenu );
- m_viewMenu->insertSeparator();
+// m_viewMenuGroup->addTo( m_viewMenu );
+// m_viewMenu->insertSeparator();
m_viewMenuAppGroup = items;
m_viewMenuAppGroup->addTo( m_viewMenu );
@@ -365,10 +365,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
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 );
@@ -379,13 +373,13 @@ 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." ) );
// Create view toolbar
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
@@ -108,5 +108,4 @@ protected slots:
virtual void slotItemDelete() = 0;
virtual void slotItemBeam() = 0;
- //virtual void slotItemFind() = 0;
virtual void slotConfigure() = 0;
@@ -164,5 +163,5 @@ private:
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
+// 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