Diffstat (limited to 'libopie2/opiepim/ui/opimmainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 28 |
1 files changed, 11 insertions, 17 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 @@ -226,34 +226,34 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { 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_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; } } } @@ -351,51 +351,45 @@ void OPimMainWindow::initBars( const QString &itemName ) { 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." ) ); +// 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 |