From 21a8c5a8cc3dfabd4403a7293a21377f9268e05c Mon Sep 17 00:00:00 2001 From: onil Date: Wed, 10 Mar 2010 16:58:35 +0000 Subject: [PATCH] git-svn-id: file:///svnroot/family-shop-mgr@25 26eb2498-383b-47a6-be48-5d6f36779e85 --- .../FamilyShoppingManagerMainWindow.cpp | 10 +++++----- .../FamilyShoppingManagerMainWindow.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp index 393639b..6e56f7f 100644 --- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp +++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp @@ -30,7 +30,7 @@ /*******************************************************************/ FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent) - : QMainWindow(parent), activityView(NULL), editMenu(NULL), + : QMainWindow(parent), activityView(NULL), //editMenu(NULL), showCheckedItemsAction(NULL), goShoppingAction(NULL), endShoppingAction(NULL) { aboutAction = new QAction(tr("&About"), this); @@ -59,11 +59,11 @@ void FamilyShoppingManagerMainWindow::showListManager() activityView = new ListManagerView("ShoppingList.xml", this); setCentralWidget(activityView); - editMenu = new QMenu(tr("&Edit"), this); +// editMenu = new QMenu(tr("&Edit"), this); addCategoryAction = new QAction(tr("Add category"), this); connect(addCategoryAction, SIGNAL(triggered()), this, SLOT(addCategory())); - editMenu->addAction(addCategoryAction); +// editMenu->addAction(addCategoryAction); // removeCategoryAction = new QAction(tr("Remove category"), this); // connect(removeCategoryAction, SIGNAL(triggered()), // this, SLOT(removeRow())); @@ -76,7 +76,7 @@ void FamilyShoppingManagerMainWindow::showListManager() // connect(removeItemAction, SIGNAL(triggered()), // this, SLOT(removeRow())); // editMenu->addAction(removeItemAction); - menuBar()->addMenu(editMenu); + menuBar()->addAction(addCategoryAction); goShoppingAction = new QAction(tr("Go shopping!"), this); connect(goShoppingAction, SIGNAL(triggered()), @@ -91,7 +91,7 @@ void FamilyShoppingManagerMainWindow::showListManager() void FamilyShoppingManagerMainWindow::showGoShopping() { menuBar()->clear(); - delete editMenu; +// delete editMenu; delete goShoppingAction; delete activityView; diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h index 701dc62..fe55da6 100644 --- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h +++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h @@ -47,7 +47,7 @@ private slots: private: QWidget *activityView; - QMenu *editMenu; +// QMenu *editMenu; QAction *showCheckedItemsAction; QAction *goShoppingAction; QAction *endShoppingAction; -- 1.7.9.5