git-svn-id: file:///svnroot/family-shop-mgr@19 26eb2498-383b-47a6-be48-5d6f36779e85

[family-shop-mgr] / code / family-shop-mgr / FamilyShoppingManagerMainWindow.cpp

diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
index 0e6308c..bb4a8c9 100644 (file)
--- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
+++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
@@ -29,6 +29,8 @@
 FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent)
     : QMainWindow(parent), activityView(NULL)
 {
+    showListManager();
+
     editMenu = new QMenu(tr("&Edit"), this);
     editMenu->addAction(tr("Add category"));
     editMenu->addAction(tr("Remove category"));
@@ -36,11 +38,15 @@ FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent
     editMenu->addAction(tr("Remove item"));
     menuBar()->addMenu(editMenu);
 
+    goShoppingAction = new QAction(tr("Go shopping!"), this);
+    connect(goShoppingAction, SIGNAL(triggered()),
+            this, SLOT(showGoShopping()));
+    menuBar()->addAction(goShoppingAction);
+
     aboutAction = new QAction(tr("&About"), this);
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(showAbout()));
     menuBar()->addAction(aboutAction);
 
-    showListManager();
     setCentralWidget(activityView);
     update();
 }
@@ -52,14 +58,49 @@ FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow()
 
 void FamilyShoppingManagerMainWindow::showListManager()
 {
+    menuBar()->clear();
+    (showCheckedItemsAction) ? delete showCheckedItemsAction:;
+    (endShoppingAction) ? delete endShoppingAction:;
+
     delete activityView;
     activityView = new ListManagerView("ShoppingList.xml", this);
+
+    editMenu = new QMenu(tr("&Edit"), this);
+    editMenu->addAction(tr("Add category"));
+    editMenu->addAction(tr("Remove category"));
+    editMenu->addAction(tr("Add item"));
+    editMenu->addAction(tr("Remove item"));
+    menuBar()->addMenu(editMenu);
+
+    goShoppingAction = new QAction(tr("Go shopping!"), this);
+    connect(goShoppingAction, SIGNAL(triggered()),
+            this, SLOT(showGoShopping()));
+    menuBar()->addAction(goShoppingAction);
+
+    menuBar()->addAction(aboutAction);
 }
 
 void FamilyShoppingManagerMainWindow::showGoShopping()
 {
+    menuBar()->clear();
+    delete editMenu;
+    delete goShoppingAction;
+
     delete activityView;
     activityView = new GoShoppingView("ShoppingList.xml", this);
+
+    showCheckedItemsAction = new QAction(tr("&Show checked"), this);
+    showCheckedItemsAction->setCheckable(true);
+    connect(showCheckedItemsAction, SIGNAL(toggled(bool)),
+            activityView, SLOT(showChecked(bool)));
+    menuBar()->addAction(showCheckedItemsAction);
+
+    endShoppingAction = new QAction(tr("&End shopping"), this);
+    connect(endShoppingAction, SIGNAL(triggered()),
+            this, SLOT(showListManager()));
+    menuBar()->addAction(endShoppingAction);
+
+    menuBar()->addAction(aboutAction);
 }
 
 void FamilyShoppingManagerMainWindow::showAbout()