summaryrefslogtreecommitdiff
authordrw <drw>2005-02-23 16:43:06 (UTC)
committer drw <drw>2005-02-23 16:43:06 (UTC)
commit57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e (patch) (unidiff)
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) (ignore 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
@@ -238,10 +238,10 @@ 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}
@@ -363,31 +363,25 @@ void OPimMainWindow::initBars( const QString &itemName ) {
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 );
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:
106 virtual void slotItemEdit() = 0; 106 virtual void slotItemEdit() = 0;
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
113protected: 112protected:
114 /** 113 /**
@@ -162,9 +161,9 @@ private:
162 QPopupMenu *m_viewMenu; // Pointer to view menu 161 QPopupMenu *m_viewMenu; // Pointer to view menu
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
170 QAction *m_itemDeleteAction; // Delete current item action 169 QAction *m_itemDeleteAction; // Delete current item action