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

diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
index 7f78599..0e6308c 100644 (file)
--- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
+++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
@@ -20,14 +20,29 @@
  */
 
 #include "FamilyShoppingManagerMainWindow.h"
+#include <QMenuBar>
+#include <QMessageBox>
 
 #include "ListManagerView.h"
 #include "GoShoppingView.h"
 
 FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent)
-    : QMainWindow(parent), activityView(new ListManagerView("ShoppingList.xml", this))
+    : QMainWindow(parent), activityView(NULL)
 {
+    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);
 
+    aboutAction = new QAction(tr("&About"), this);
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(showAbout()));
+    menuBar()->addAction(aboutAction);
+
+    showListManager();
+    setCentralWidget(activityView);
+    update();
 }
 
 FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow()
@@ -37,10 +52,21 @@ FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow()
 
 void FamilyShoppingManagerMainWindow::showListManager()
 {
+    delete activityView;
     activityView = new ListManagerView("ShoppingList.xml", this);
 }
 
 void FamilyShoppingManagerMainWindow::showGoShopping()
 {
+    delete activityView;
     activityView = new GoShoppingView("ShoppingList.xml", this);
 }
+
+void FamilyShoppingManagerMainWindow::showAbout()
+{
+    QString text;
+    text = "Application name: Family shopping manager\n";
+    text += "Author: Unai IRIGOYEN\n\n";
+    text += "Licence: GPL";
+    QMessageBox::about(this,tr("About"), text);
+}

diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h
index 0ef19a6..16546b7 100644 (file)
--- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h
+++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.h
@@ -35,9 +35,13 @@ public:
 private slots:
     void showListManager();
     void showGoShopping();
+    void showAbout();
 
 private:
     QWidget *activityView;
+
+    QMenu *editMenu;
+    QAction *aboutAction;
 };
 
 #endif // FAMILYSHOPPINGMANAGERMAINWINDOW_H

diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp
index 20852e4..4a485e8 100644 (file)
--- a/code/family-shop-mgr/ShoppingTreeModel.cpp
+++ b/code/family-shop-mgr/ShoppingTreeModel.cpp
@@ -93,6 +93,7 @@ QAbstractItemModel(parent), m_document("ShoppingList")
         }\r
         m_domElementForItem.insert(rootItem->child(rootItem->childCount() - 1),\r
                                    child);\r
+        child = child.nextSiblingElement("item");\r
     }\r
 \r
     QHashIterator<ShoppingTreeItem*,QDomElement> i(m_domElementForItem);\r