| -rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 28 | ||||
| -rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.h | 3 |
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 @@ -238,10 +238,10 @@ 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_viewMenuGroup->addTo( m_viewMenu ); +// m_viewMenu->insertSeparator(); m_viewMenuAppGroup = items; m_viewMenuAppGroup->addTo( m_viewMenu ); } } @@ -363,31 +363,25 @@ void OPimMainWindow::initBars( const QString &itemName ) { 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." ) ); +// 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 ); 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 @@ -106,9 +106,8 @@ protected slots: virtual void slotItemEdit() = 0; virtual void slotItemDuplicate() = 0; virtual void slotItemDelete() = 0; virtual void slotItemBeam() = 0; - //virtual void slotItemFind() = 0; virtual void slotConfigure() = 0; protected: /** @@ -162,9 +161,9 @@ private: 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 +// 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 |