From: onil Date: Mon, 7 Dec 2009 21:59:08 +0000 (+0000) Subject: git-svn-id: file:///svnroot/family-shop-mgr@4 26eb2498-383b-47a6-be48-5d6f36779e85 X-Git-Url: http://git.maemo.org/git/?p=family-shop-mgr;a=commitdiff_plain;h=7de11476c900a10373c5f5e1bd9c0f983e5fec0a;hp=f55462957389d848375fe362136eaa1858b2fe4f git-svn-id: file:///svnroot/family-shop-mgr@4 26eb2498-383b-47a6-be48-5d6f36779e85 --- diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp index 2de033f..0e339f6 100644 --- a/code/family-shop-mgr/ShoppingTreeModel.cpp +++ b/code/family-shop-mgr/ShoppingTreeModel.cpp @@ -21,6 +21,24 @@ #include "ShoppingTreeModel.h" -ShoppingTreeModel::ShoppingTreeModel() +#include "ShoppingTreeItem.h" +#include + +ShoppingTreeModel::ShoppingTreeModel(const QString &xmlFileName, QObject *parent) : QAbstractItemModel(parent), m_document("ShoppingList") { + QFile file(xmlFileName); + if(!file.open(QIODevice::ReadOnly)) + return; + if(!m_document.setContent(&file)) + { + file.close((); + return; + } + file.close(); + QVector rootData; + foreach (QString header, headers) + rootData << header; + + rootItem = new TreeItem(rootData); + setupModelData(data.split(QString("\n")), rootItem); } diff --git a/code/family-shop-mgr/ShoppingTreeModel.h b/code/family-shop-mgr/ShoppingTreeModel.h index 726e934..55609e3 100644 --- a/code/family-shop-mgr/ShoppingTreeModel.h +++ b/code/family-shop-mgr/ShoppingTreeModel.h @@ -24,11 +24,33 @@ #include #include +#include +#include + +class ShoppingTreeItem; class ShoppingTreeModel : public QAbstractItemModel { public: - ShoppingTreeModel(); + ShoppingTreeModel(const QString &xmlFileName, QObject *parent = 0); + ~ShoppingTreeModel(); + + QVariant data(const QModelIndex &index, int role) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + QModelIndex parent(const QModelIndex &index) const; + + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; + + Qt::ItemFlags flags(const QModelIndex &index) const; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole); + + bool insertColumns(int position, int columns, const QModelIndex &parent = QModelIndex()); + bool removeColumns(int position, int columns, const QModelIndex &parent = QModelIndex()); + bool insertRows(int position, int rows, const QModelIndex &parent = QModelIndex()); + bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex()); private: QDomDocument m_document; diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user b/code/family-shop-mgr/family-shop-mgr.pro.user index 8c57c52..a08eec6 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro.user +++ b/code/family-shop-mgr/family-shop-mgr.pro.user @@ -1,300 +1,288 @@ - RunConfiguration0-BaseEnvironmentBase - 2 - - RunConfiguration0-CommandLineArguments - + RunConfiguration0-ProFile - family-shop-mgr.pro + family-shop-mgr.pro RunConfiguration0-RunConfiguration.name - family-shop-mgr + family-shop-mgr RunConfiguration0-UseDyldImageSuffix - false + false RunConfiguration0-UseTerminal - false + false RunConfiguration0-UserEnvironmentChanges - + RunConfiguration0-UserSetName - false - - - RunConfiguration0-UserSetWorkingDirectory - false - - - RunConfiguration0-UserWorkingDirectory - + false RunConfiguration0-type - Qt4ProjectManager.Qt4RunConfiguration + Qt4ProjectManager.Qt4RunConfiguration activeRunConfiguration - 0 + 0 activebuildconfiguration - Debug + Debug buildConfiguration-Debug - - Debug - 0 - 2 - - 2 + + Debug + 0 + 2 + + 2 buildConfiguration-Release - - Release - 0 - 2 - - 0 + + Release + 0 + 2 + + 0 buildconfiguration-Debug-buildstep0 - - Debug - - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + + Debug + + ALLUSERSPROFILE=C:\Documents and Settings\All Users + APPDATA=C:\Documents and Settings\Unai\Application Data + APR_ICONV_PATH=C:\Program Files\Subversion\iconv + CLIENTNAME=Console + COMMONPROGRAMFILES=C:\Program Files\Fichiers communs + COMPUTERNAME=UNAI-LAPTOP + COMSPEC=C:\WINDOWS\system32\cmd.exe + DBCONFIG=C:\adabas\sql + DBROOT=C:\adabas\ + DBWORK=C:\adabas\sql + DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ + FP_NO_HOST_CHECK=NO + HOMEDRIVE=C: + HOMEPATH=\Documents and Settings\Unai + LOGONSERVER=\\UNAI-LAPTOP + NUMBER_OF_PROCESSORS=2 + OS=Windows_NT + PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin + PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH + PROCESSOR_ARCHITECTURE=x86 + PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel + PROCESSOR_LEVEL=6 + PROCESSOR_REVISION=1c02 + PROGRAMFILES=C:\Program Files + QTDIR=C:/Qt/2009.05/qt + SESSIONNAME=Console + SYSTEMDRIVE=C: + SYSTEMROOT=C:\WINDOWS + TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + USERDOMAIN=UNAI-LAPTOP + USERNAME=Unai + USERPROFILE=C:\Documents and Settings\Unai + VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ + WINDIR=C:\WINDOWS - - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr/family-shop-mgr.pro - -spec - win32-g++ - -r + + C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr/family-shop-mgr.pro + -spec + win32-g++ + -r - c:/qt/2009.05/qt/bin/qmake.exe - true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr - + c:/qt/2009.05/qt/bin/qmake.exe + true + C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + buildconfiguration-Debug-buildstep1 - - Debug - - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + + Debug + + ALLUSERSPROFILE=C:\Documents and Settings\All Users + APPDATA=C:\Documents and Settings\Unai\Application Data + APR_ICONV_PATH=C:\Program Files\Subversion\iconv + CLIENTNAME=Console + COMMONPROGRAMFILES=C:\Program Files\Fichiers communs + COMPUTERNAME=UNAI-LAPTOP + COMSPEC=C:\WINDOWS\system32\cmd.exe + DBCONFIG=C:\adabas\sql + DBROOT=C:\adabas\ + DBWORK=C:\adabas\sql + DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ + FP_NO_HOST_CHECK=NO + HOMEDRIVE=C: + HOMEPATH=\Documents and Settings\Unai + LOGONSERVER=\\UNAI-LAPTOP + NUMBER_OF_PROCESSORS=2 + OS=Windows_NT + PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin + PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH + PROCESSOR_ARCHITECTURE=x86 + PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel + PROCESSOR_LEVEL=6 + PROCESSOR_REVISION=1c02 + PROGRAMFILES=C:\Program Files + QTDIR=C:/Qt/2009.05/qt + SESSIONNAME=Console + SYSTEMDRIVE=C: + SYSTEMROOT=C:\WINDOWS + TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + USERDOMAIN=UNAI-LAPTOP + USERNAME=Unai + USERPROFILE=C:\Documents and Settings\Unai + VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ + WINDIR=C:\WINDOWS - false - - -w + false + + -w - C:/Qt/2009.05/mingw/bin/mingw32-make.exe - true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + C:/Qt/2009.05/mingw/bin/mingw32-make.exe + true + C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr buildconfiguration-Debug-cleanstep0 - - Debug - - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + + Debug + + ALLUSERSPROFILE=C:\Documents and Settings\All Users + APPDATA=C:\Documents and Settings\Unai\Application Data + APR_ICONV_PATH=C:\Program Files\Subversion\iconv + CLIENTNAME=Console + COMMONPROGRAMFILES=C:\Program Files\Fichiers communs + COMPUTERNAME=UNAI-LAPTOP + COMSPEC=C:\WINDOWS\system32\cmd.exe + DBCONFIG=C:\adabas\sql + DBROOT=C:\adabas\ + DBWORK=C:\adabas\sql + DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ + FP_NO_HOST_CHECK=NO + HOMEDRIVE=C: + HOMEPATH=\Documents and Settings\Unai + LOGONSERVER=\\UNAI-LAPTOP + NUMBER_OF_PROCESSORS=2 + OS=Windows_NT + PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin + PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH + PROCESSOR_ARCHITECTURE=x86 + PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel + PROCESSOR_LEVEL=6 + PROCESSOR_REVISION=1c02 + PROGRAMFILES=C:\Program Files + QTDIR=C:/Qt/2009.05/qt + SESSIONNAME=Console + SYSTEMDRIVE=C: + SYSTEMROOT=C:\WINDOWS + TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp + USERDOMAIN=UNAI-LAPTOP + USERNAME=Unai + USERPROFILE=C:\Documents and Settings\Unai + VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ + WINDIR=C:\WINDOWS - true - - clean - -w + true + + clean + -w - C:/Qt/2009.05/mingw/bin/mingw32-make.exe - true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr - true - - clean + C:/Qt/2009.05/mingw/bin/mingw32-make.exe + true + C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + true + + clean buildconfiguration-Release-buildstep0 - - Release - + + Release + buildconfiguration-Release-buildstep1 - - Release + + Release buildconfiguration-Release-cleanstep0 - - Release + + Release buildconfigurations - - Debug - Release + + Debug + Release buildstep0 - - - + + + buildstep1 - - + + buildsteps - - trolltech.qt4projectmanager.qmake - trolltech.qt4projectmanager.make + + trolltech.qt4projectmanager.qmake + trolltech.qt4projectmanager.make cleanstep0 - - - true + + + true cleansteps - - trolltech.qt4projectmanager.make + + trolltech.qt4projectmanager.make defaultFileEncoding - UTF-8 + UTF-8 project - +