-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 | |||
@@ -239,8 +239,8 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | |||
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 | } |
@@ -364,12 +364,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
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()) ); |
@@ -378,15 +372,15 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
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 ); |
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 | |||
@@ -107,7 +107,6 @@ protected slots: | |||
107 | virtual void slotItemDuplicate() = 0; | 107 | virtual void slotItemDuplicate() = 0; |
108 | virtual void slotItemDelete() = 0; | 108 | virtual void slotItemDelete() = 0; |
109 | virtual void slotItemBeam() = 0; | 109 | virtual void slotItemBeam() = 0; |
110 | //virtual void slotItemFind() = 0; | ||
111 | virtual void slotConfigure() = 0; | 110 | virtual void slotConfigure() = 0; |
112 | 111 | ||
113 | protected: | 112 | protected: |
@@ -163,7 +162,7 @@ private: | |||
163 | QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu | 162 | QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu |
164 | QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu | 163 | QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu |
165 | QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu | 164 | QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu |
166 | QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu | 165 | // QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu |
167 | QAction *m_itemNewAction; // Add new item action | 166 | QAction *m_itemNewAction; // Add new item action |
168 | QAction *m_itemEditAction; // Edit current item action | 167 | QAction *m_itemEditAction; // Edit current item action |
169 | QAction *m_itemDuplicateAction; // Duplicate current item action | 168 | QAction *m_itemDuplicateAction; // Duplicate current item action |