From 6ba7d4dd07f22ac39175e04f60e0f4f4fdccedab Mon Sep 17 00:00:00 2001 From: onil Date: Mon, 8 Feb 2010 13:28:02 +0000 Subject: [PATCH] git-svn-id: file:///svnroot/family-shop-mgr@20 26eb2498-383b-47a6-be48-5d6f36779e85 --- .../FamilyShoppingManagerMainWindow.cpp | 30 +++++++------------- code/family-shop-mgr/family-shop-mgr.pro.user | 24 ++++++++-------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp index bb4a8c9..e962014 100644 --- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp +++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp @@ -27,28 +27,15 @@ #include "GoShoppingView.h" FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent) - : QMainWindow(parent), activityView(NULL) + : QMainWindow(parent), activityView(NULL), showCheckedItemsAction(NULL), + endShoppingAction(NULL), goShoppingAction(NULL), editMenu(NULL) { - showListManager(); - - 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); - aboutAction = new QAction(tr("&About"), this); connect(aboutAction, SIGNAL(triggered()), this, SLOT(showAbout())); menuBar()->addAction(aboutAction); - setCentralWidget(activityView); - update(); + + showListManager(); } FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow() @@ -59,11 +46,13 @@ FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow() void FamilyShoppingManagerMainWindow::showListManager() { menuBar()->clear(); - (showCheckedItemsAction) ? delete showCheckedItemsAction:; - (endShoppingAction) ? delete endShoppingAction:; + + delete showCheckedItemsAction; + delete endShoppingAction; delete activityView; activityView = new ListManagerView("ShoppingList.xml", this); + setCentralWidget(activityView); editMenu = new QMenu(tr("&Edit"), this); editMenu->addAction(tr("Add category")); @@ -78,6 +67,7 @@ void FamilyShoppingManagerMainWindow::showListManager() menuBar()->addAction(goShoppingAction); menuBar()->addAction(aboutAction); + update(); } void FamilyShoppingManagerMainWindow::showGoShopping() @@ -88,6 +78,7 @@ void FamilyShoppingManagerMainWindow::showGoShopping() delete activityView; activityView = new GoShoppingView("ShoppingList.xml", this); + setCentralWidget(activityView); showCheckedItemsAction = new QAction(tr("&Show checked"), this); showCheckedItemsAction->setCheckable(true); @@ -101,6 +92,7 @@ void FamilyShoppingManagerMainWindow::showGoShopping() menuBar()->addAction(endShoppingAction); menuBar()->addAction(aboutAction); + update(); } void FamilyShoppingManagerMainWindow::showAbout() diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user b/code/family-shop-mgr/family-shop-mgr.pro.user index 244ccc4..2f5ac29 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro.user +++ b/code/family-shop-mgr/family-shop-mgr.pro.user @@ -97,11 +97,11 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-KgyjHUaC1G,guid=106bbfc436dd497d5877374a4b6d90b9 + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-GJlGaxlG0v,guid=0c8e1c6e41d3e6f2d1af89c24b6fc5bb DESKTOP_SESSION=default DISPLAY=:0.0 DM_CONTROL=/var/run/xdmctl - GPG_AGENT_INFO=/tmp/gpg-yzdzjF/S.gpg-agent:1952:1 + GPG_AGENT_INFO=/tmp/gpg-pfjgMn/S.gpg-agent:1953:1 GS_LIB=/home/onil/.fonts GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc @@ -117,16 +117,16 @@ PWD=/home/onil/Documents QTDIR=/usr/share/qt4 QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ - SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/2045,unix/onil-netbook:/tmp/.ICE-unix/2045 + SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/2044,unix/onil-netbook:/tmp/.ICE-unix/2044 SHELL=/bin/bash SHLVL=0 - SSH_AGENT_PID=1951 - SSH_AUTH_SOCK=/tmp/ssh-xgUrxv1901/agent.1901 + SSH_AGENT_PID=1952 + SSH_AUTH_SOCK=/tmp/ssh-pIQBwR1902/agent.1902 USER=onil WINDOWPATH=7 XCURSOR_THEME=oxy-white XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share - XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1265471673.149631-453933478 + XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1265616314.877010-1127570423 XDM_MANAGED=method=classic @@ -147,11 +147,11 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-KgyjHUaC1G,guid=106bbfc436dd497d5877374a4b6d90b9 + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-GJlGaxlG0v,guid=0c8e1c6e41d3e6f2d1af89c24b6fc5bb DESKTOP_SESSION=default DISPLAY=:0.0 DM_CONTROL=/var/run/xdmctl - GPG_AGENT_INFO=/tmp/gpg-yzdzjF/S.gpg-agent:1952:1 + GPG_AGENT_INFO=/tmp/gpg-pfjgMn/S.gpg-agent:1953:1 GS_LIB=/home/onil/.fonts GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc @@ -167,16 +167,16 @@ PWD=/home/onil/Documents QTDIR=/usr/share/qt4 QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ - SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/2045,unix/onil-netbook:/tmp/.ICE-unix/2045 + SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/2044,unix/onil-netbook:/tmp/.ICE-unix/2044 SHELL=/bin/bash SHLVL=0 - SSH_AGENT_PID=1951 - SSH_AUTH_SOCK=/tmp/ssh-xgUrxv1901/agent.1901 + SSH_AGENT_PID=1952 + SSH_AUTH_SOCK=/tmp/ssh-pIQBwR1902/agent.1902 USER=onil WINDOWPATH=7 XCURSOR_THEME=oxy-white XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share - XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1265471673.149631-453933478 + XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1265616314.877010-1127570423 XDM_MANAGED=method=classic false -- 1.7.9.5