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

diff --git a/code/family-shop-mgr/GoShopping.ui b/code/family-shop-mgr/GoShopping.ui
index 92e0978..b756f7d 100644 (file)
--- a/code/family-shop-mgr/GoShopping.ui
+++ b/code/family-shop-mgr/GoShopping.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ui version="4.0">\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ui version="4.0">\r

- <class>Form</class>\r
- <widget class="QWidget" name="Form">\r
+ <class>GoShoppingView</class>\r
+ <widget class="QWidget" name="GoShoppingView">\r

   <property name="geometry">\r
    <rect>\r
     <x>0</x>\r
   <property name="geometry">\r
    <rect>\r
     <x>0</x>\r

diff --git a/code/family-shop-mgr/GoShoppingView.cpp b/code/family-shop-mgr/GoShoppingView.cpp
new file mode 100644 (file)
index 0000000..e841f7d
--- /dev/null
+++ b/code/family-shop-mgr/GoShoppingView.cpp
@@ -0,0 +1,34 @@
+/*\r
+ * This file is part of family-shop-mgr.\r
+ *\r
+ * family-shop-mgr is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * family-shop-mgr is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with family-shop-mgr.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Unai IRIGOYEN\r
+ * Date: 12/17/2009\r
+ *\r
+ */\r
+\r
+#include "GoShoppingView.h"\r
+#include "ui_GoShopping.h"\r
+\r
+GoShoppingView::GoShoppingView(QWidget *parent)\r
+    :QWidget(parent), ui(new Ui::GoShoppingView)\r
+{\r
+    ui->setupUi(this);\r
+}\r
+\r
+GoShoppingView::~GoShoppingView()\r
+{\r
+    delete ui;\r
+}\r

diff --git a/code/family-shop-mgr/GoShoppingView.h b/code/family-shop-mgr/GoShoppingView.h
new file mode 100644 (file)
index 0000000..c91ad79
--- /dev/null
+++ b/code/family-shop-mgr/GoShoppingView.h
@@ -0,0 +1,44 @@
+/*\r
+ * This file is part of family-shop-mgr.\r
+ *\r
+ * family-shop-mgr is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * family-shop-mgr is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with family-shop-mgr.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Unai IRIGOYEN\r
+ * Date: 12/17/2009\r
+ *\r
+ */\r
+\r
+#ifndef GOSHOPPINGVIEW_H\r
+#define GOSHOPPINGVIEW_H\r
+\r
+#include <QtGui/QWidget>\r
+\r
+namespace Ui\r
+{\r
+    class GoShoppingView;\r
+}\r
+\r
+class GoShoppingView : public QWidget\r
+{\r
+Q_OBJECT\r
+\r
+public:\r
+    GoShoppingView(QWidget *parent = 0);\r
+    ~GoShoppingView();\r
+\r
+private:\r
+    Ui::GoShoppingView *ui;\r
+};\r
+\r
+#endif // GOSHOPPINGVIEW_H\r

diff --git a/code/family-shop-mgr/ListManager.ui b/code/family-shop-mgr/ListManager.ui
index 205ddf7..39751ad 100644 (file)
--- a/code/family-shop-mgr/ListManager.ui
+++ b/code/family-shop-mgr/ListManager.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ui version="4.0">\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <ui version="4.0">\r

- <class>Form</class>\r
- <widget class="QWidget" name="Form">\r
+ <class>ListManagerView</class>\r
+ <widget class="QWidget" name="ListManagerView">\r

   <property name="geometry">\r
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r
   <property name="geometry">\r
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r

-    <width>233</width>\r
+    <width>257</width>\r

     <height>300</height>\r
    </rect>\r
   </property>\r
     <height>300</height>\r
    </rect>\r
   </property>\r

diff --git a/code/family-shop-mgr/ListManagerView.cpp b/code/family-shop-mgr/ListManagerView.cpp
new file mode 100644 (file)
index 0000000..d602753
--- /dev/null
+++ b/code/family-shop-mgr/ListManagerView.cpp
@@ -0,0 +1,34 @@
+/*\r
+ * This file is part of family-shop-mgr.\r
+ *\r
+ * family-shop-mgr is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * family-shop-mgr is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with family-shop-mgr.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Unai IRIGOYEN\r
+ * Date: 12/17/2009\r
+ *\r
+ */\r
+\r
+#include "ListManagerView.h"\r
+#include "ui_ListManager.h"\r
+\r
+ListManagerView::ListManagerView(QWidget *parent)\r
+    :QWidget(parent), ui(new Ui::ListManagerView)\r
+{\r
+    ui->setupUi(this);\r
+}\r
+\r
+ListManagerView::~ListManagerView()\r
+{\r
+    delete ui;\r
+}\r

diff --git a/code/family-shop-mgr/ListManagerView.h b/code/family-shop-mgr/ListManagerView.h
new file mode 100644 (file)
index 0000000..a91263a
--- /dev/null
+++ b/code/family-shop-mgr/ListManagerView.h
@@ -0,0 +1,44 @@
+/*\r
+ * This file is part of family-shop-mgr.\r
+ *\r
+ * family-shop-mgr is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * family-shop-mgr is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with family-shop-mgr.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ * Author: Unai IRIGOYEN\r
+ * Date: 12/17/2009\r
+ *\r
+ */\r
+\r
+#ifndef LISTMANAGERVIEW_H\r
+#define LISTMANAGERVIEW_H\r
+\r
+#include <QtGui/QWidget>\r
+\r
+namespace Ui\r
+{\r
+    class ListManagerView;\r
+}\r
+\r
+class ListManagerView : public QWidget\r
+{\r
+Q_OBJECT\r
+\r
+public:\r
+    ListManagerView(QWidget *parent = 0);\r
+    ~ListManagerView();\r
+\r
+private:\r
+    Ui::ListManagerView *ui;\r
+};\r
+\r
+#endif // LISTMANAGERVIEW_H\r

diff --git a/code/family-shop-mgr/family-shop-mgr.pro b/code/family-shop-mgr/family-shop-mgr.pro
index 8283873..2ed95e0 100644 (file)
--- a/code/family-shop-mgr/family-shop-mgr.pro
+++ b/code/family-shop-mgr/family-shop-mgr.pro
@@ -7,10 +7,14 @@ TEMPLATE = app
 SOURCES += main.cpp \\r
     FamilyShoppingManagerStartView.cpp \\r
     ShoppingTreeModel.cpp \\r
 SOURCES += main.cpp \\r
     FamilyShoppingManagerStartView.cpp \\r
     ShoppingTreeModel.cpp \\r

-    ShoppingTreeItem.cpp\r
+    ShoppingTreeItem.cpp \\r
+    GoShoppingView.cpp \\r
+    ListManagerView.cpp\r

 HEADERS += FamilyShoppingManagerStartView.h \\r
     ShoppingTreeModel.h \\r
 HEADERS += FamilyShoppingManagerStartView.h \\r
     ShoppingTreeModel.h \\r

-    ShoppingTreeItem.h\r
+    ShoppingTreeItem.h \\r
+    GoShoppingView.h \\r
+    ListManagerView.h\r

 FORMS += FamilyShoppingManagerStartView.ui \\r
     ListManager.ui \\r
     GoShopping.ui\r
 FORMS += FamilyShoppingManagerStartView.ui \\r
     ListManager.ui \\r
     GoShopping.ui\r

diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user b/code/family-shop-mgr/family-shop-mgr.pro.user
index 3a373c0..9a81fae 100644 (file)
--- a/code/family-shop-mgr/family-shop-mgr.pro.user
+++ b/code/family-shop-mgr/family-shop-mgr.pro.user
@@ -67,7 +67,7 @@
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
    <value key="QtVersionId" type="int">0</value>
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
    <value key="QtVersionId" type="int">0</value>

-   <value key="ToolChain" type="int">202</value>
+   <value key="ToolChain" type="int">2</value>

    <value key="addQDumper" type=""></value>
    <value key="buildConfiguration" type="int">0</value>
   </valuemap>
    <value key="addQDumper" type=""></value>
    <value key="buildConfiguration" type="int">0</value>
   </valuemap>

@@ -76,7 +76,9 @@
   <variable>buildConfiguration-S60_3rd_FP1 (Qt ) Debug</variable>
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">S60_3rd_FP1 (Qt ) Debug</value>
   <variable>buildConfiguration-S60_3rd_FP1 (Qt ) Debug</variable>
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">S60_3rd_FP1 (Qt ) Debug</value>

-   <value key="QtVersionId" type="int">7</value>
+   <value key="QtVersionId" type="int">0</value>
+   <value key="ToolChain" type="int">2</value>
+   <value key="addQDumper" type=""></value>

    <value key="buildConfiguration" type="int">10</value>
   </valuemap>
  </data>
    <value key="buildConfiguration" type="int">10</value>
   </valuemap>
  </data>

@@ -86,6 +88,7 @@
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">S60_3rd_FP1 (Qt ) Release</value>
    <value key="QtVersionId" type="int">0</value>
    <value key="ToolChain" type="int">2</value>
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">S60_3rd_FP1 (Qt ) Release</value>
    <value key="QtVersionId" type="int">0</value>
    <value key="ToolChain" type="int">2</value>

+   <value key="addQDumper" type=""></value>

    <value key="buildConfiguration" type="int">8</value>
   </valuemap>
  </data>
    <value key="buildConfiguration" type="int">8</value>
   </valuemap>
  </data>