Diffstat (limited to 'libopie2/opiepim/ui/opimmainwindow.cpp') (more/less context) (ignore 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 | |||
@@ -230,26 +230,26 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { | |||
230 | m_itemMenu->insertSeparator(); | 230 | m_itemMenu->insertSeparator(); |
231 | items->addTo( m_itemMenu ); | 231 | items->addTo( m_itemMenu ); |
232 | m_itemMenu->insertSeparator(); | 232 | m_itemMenu->insertSeparator(); |
233 | m_itemMenuGroup2->addTo( m_itemMenu ); | 233 | m_itemMenuGroup2->addTo( m_itemMenu ); |
234 | } | 234 | } |
235 | } | 235 | } |
236 | 236 | ||
237 | void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | 237 | void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { |
238 | // Insert menu items into View menu | 238 | // Insert menu items into View menu |
239 | if ( items ) { | 239 | if ( items ) { |
240 | // Rebuild Item menu | 240 | // Rebuild Item menu |
241 | m_viewMenu->clear(); | 241 | m_viewMenu->clear(); |
242 | m_viewMenuGroup->addTo( m_viewMenu ); | 242 | // m_viewMenuGroup->addTo( m_viewMenu ); |
243 | m_viewMenu->insertSeparator(); | 243 | // m_viewMenu->insertSeparator(); |
244 | m_viewMenuAppGroup = items; | 244 | m_viewMenuAppGroup = items; |
245 | m_viewMenuAppGroup->addTo( m_viewMenu ); | 245 | m_viewMenuAppGroup->addTo( m_viewMenu ); |
246 | } | 246 | } |
247 | } | 247 | } |
248 | 248 | ||
249 | void OPimMainWindow::setViewCategory( const QString &category ) { | 249 | void OPimMainWindow::setViewCategory( const QString &category ) { |
250 | // Find category in list | 250 | // Find category in list |
251 | for ( int i = 0; i < m_catSelect->count(); i++ ) { | 251 | for ( int i = 0; i < m_catSelect->count(); i++ ) { |
252 | if ( m_catSelect->text( i ) == category ) { | 252 | if ( m_catSelect->text( i ) == category ) { |
253 | m_catSelect->setCurrentItem( i ); | 253 | m_catSelect->setCurrentItem( i ); |
254 | emit categorySelected( category ); | 254 | emit categorySelected( category ); |
255 | return; | 255 | return; |
@@ -355,47 +355,41 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
355 | m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), | 355 | m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), |
356 | QString::null, 0, m_itemMenuGroup1, 0 ); | 356 | QString::null, 0, m_itemMenuGroup1, 0 ); |
357 | connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); | 357 | connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); |
358 | m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); | 358 | m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); |
359 | m_itemDeleteAction->addTo( toolbar ); | 359 | m_itemDeleteAction->addTo( toolbar ); |
360 | 360 | ||
361 | m_itemMenuGroup1->addTo( m_itemMenu ); | 361 | m_itemMenuGroup1->addTo( m_itemMenu ); |
362 | 362 | ||
363 | m_itemMenu->insertSeparator(); | 363 | m_itemMenu->insertSeparator(); |
364 | 364 | ||
365 | m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); | 365 | m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); |
366 | 366 | ||
367 | // a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), | ||
368 | // QString::null, 0, m_itemMenuGroup2, 0 ); | ||
369 | // connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); | ||
370 | // a->setWhatsThis( tr( "Click here to search for an item." ) ); | ||
371 | // a->addTo( toolbar ); | ||
372 | |||
373 | m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), | 367 | m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), |
374 | QString::null, 0, m_itemMenuGroup2, 0 ); | 368 | QString::null, 0, m_itemMenuGroup2, 0 ); |
375 | connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) ); | 369 | connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) ); |
376 | m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) ); | 370 | m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) ); |
377 | 371 | ||
378 | m_itemMenuGroup2->addTo( m_itemMenu ); | 372 | m_itemMenuGroup2->addTo( m_itemMenu ); |
379 | 373 | ||
380 | // View menu | 374 | // View menu |
381 | m_viewMenuGroup = new QActionGroup( this, QString::null, false ); | 375 | // m_viewMenuGroup = new QActionGroup( this, QString::null, false ); |
382 | 376 | ||
383 | QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); | 377 | // QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); |
384 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); | 378 | // connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); |
385 | a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); | 379 | // a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); |
386 | 380 | // | |
387 | a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); | 381 | // a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); |
388 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); | 382 | // connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); |
389 | a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); | 383 | // a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); |
390 | 384 | ||
391 | // Create view toolbar | 385 | // Create view toolbar |
392 | toolbar = new QToolBar( this ); | 386 | toolbar = new QToolBar( this ); |
393 | m_catSelect = new QComboBox( toolbar ); | 387 | m_catSelect = new QComboBox( toolbar ); |
394 | connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); | 388 | connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); |
395 | QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); | 389 | QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); |
396 | 390 | ||
397 | // Do initial load of categories | 391 | // Do initial load of categories |
398 | reloadCategories(); | 392 | reloadCategories(); |
399 | } | 393 | } |
400 | 394 | ||
401 | } // namespace Opie | 395 | } // namespace Opie |