Changeset 2229

Timestamp:

08/25/08 23:33:57 (3 months ago)

Author:

hlamer

Message:

Progress of refactoring of XUPItem

Location:

v2/branches/dev

Files:

• monkey/src/templatesmanager/ui/UITemplatesWizard.cpp (modified) (1 diff)
• monkey/src/xupmanager/AddFilesDialog.cpp (modified) (2 diffs)
• monkey/src/xupmanager/AddFilesDialog.h (modified) (1 diff)
• monkey/src/xupmanager/FilteredProjectItemModel.cpp (modified) (6 diffs)
• monkey/src/xupmanager/ProjectEditorModel.cpp (modified) (3 diffs)
• monkey/src/xupmanager/ScopedProjectItemModel.cpp (modified) (4 diffs)
• monkey/src/xupmanager/ScopedProjectItemModel.h (modified) (3 diffs)
• monkey/src/xupmanager/XUPIO.cpp (modified) (1 diff)
• monkey/src/xupmanager/XUPItem.cpp (modified) (15 diffs)
• monkey/src/xupmanager/XUPItem.h (modified) (8 diffs)
• monkey/src/xupmanager/XUPProjectItem.cpp (modified) (7 diffs)
• monkey/src/xupmanager/XUPProjectItem.h (modified) (3 diffs)
• monkey/src/xupmanager/ui/UIXUPManager.cpp (modified) (8 diffs)
• monkey/src/xupmanager/ui/UIXUPManager.h (modified) (1 diff)
• monkey/src/xupmanager/ui/UIXUPProjectEditor.cpp (modified) (6 diffs)
• monkey/src/xupmanager/ui/UIXUPProjectEditor.h (modified) (1 diff)
• plugins/xup/QMakeProjectEditor/src/QMakeXUPItem.cpp (modified) (4 diffs)
• plugins/xup/XUPProjectEditor/src/XUPItem.cpp.bak (copied) (copied from v2/branches/dev/monkey/src/xupmanager/XUPItem.cpp)
• plugins/xup/XUPProjectEditor/src/XUPItem.h.bak (copied) (copied from v2/branches/dev/monkey/src/xupmanager/XUPItem.h)

v2/branches/dev/monkey/src/templatesmanager/ui/UITemplatesWizard.cpp

@@ -177 +177 @@
 {
         const QModelIndex idx = mProjects->scopedModel()->mapToSource( index );
-        if ( XUPItem* it = mProjects->itemFromIndex( idx ) )
+        if ( XUPProjectItem* it = dynamic_cast<XUPProjectItem*> (mProjects->itemFromIndex( idx )) )
         {
                 cbOperators->clear();

v2/branches/dev/monkey/src/xupmanager/AddFilesDialog.cpp

@@ -1 +1 @@
 #include "AddFilesDialog.h"
 #include "../pMonkeyStudio.h"
+
+#include "XUPItem.h"
+#include "XUPProjectItem.h"
 
 #include <QGridLayout>
@@ -92 +95 @@
         // create operators combobox
         cbOperators = new QComboBox;
-        cbOperators->addItems( pi->operators() );
+        cbOperators->addItems( pi->project()->operators() );
         hl2->addWidget( cbOperators );
         // add groupbox to layout

v2/branches/dev/monkey/src/xupmanager/AddFilesDialog.h

@@ -11 +11 @@
 #include "ScopedProjectItemModel.h"
 #include "ProjectItemModel.h"
-#include "XUPItem.h"
 
 class QListView;

v2/branches/dev/monkey/src/xupmanager/FilteredProjectItemModel.cpp

@@ -104 +104 @@
         
         // calculate row to insert to
-        int r = it->filteredVariables().indexOf( vn );
+        int r = it->project()->filteredVariables().indexOf( vn );
         int ri = -1;
         for ( int i = 0; i < pit->rowCount(); i++ )
         {
                 FilteredProjectItem* cit = pit->child( i );
-                const int ci = it->filteredVariables().indexOf( cit->item()->defaultValue() );
+                const int ci = it->project()->filteredVariables().indexOf( cit->item()->defaultValue() );
                 if ( cit->item()->isProject() )
                         continue;
@@ -127 +127 @@
 FilteredProjectItem* FilteredProjectItemModel::createFolder( const QString& name, XUPItem* inItem )
 {
-        FilteredProjectItem* fit = new FilteredProjectItem( inItem->clone( false ) );
+        FilteredProjectItem* fit = new FilteredProjectItem( inItem->clone() );
         fit->item()->setDomElement( inItem->domElement().ownerDocument().createElement( "folder" ) );
         fit->item()->setValue( "name", name );
@@ -186 +186 @@
         XUPItem* parent = it->parent();
         // check if we need to show this value
-        if ( !parent->filteredVariables().contains( parent->defaultValue() ) )
+        if ( !parent->project()->filteredVariables().contains( parent->defaultValue() ) )
                 return;
         
@@ -193 +193 @@
         
         // check file based
-        bool b = it->fileVariables().contains( parent->defaultValue() );
+        bool b = it->project()->fileVariables().contains( parent->defaultValue() );
         
         if ( !it->defaultValue().isEmpty() )
@@ -206 +206 @@
 {
         // check we need to show it
-        if ( !it->filteredVariables().contains( it->defaultValue() ) )
+        if ( !it->project()->filteredVariables().contains( it->defaultValue() ) )
                 return;
         
@@ -237 +237 @@
                 {
                         // if filtered
-                        if ( !it->filteredVariables().isEmpty() )
+                        if ( !it->project()->filteredVariables().isEmpty() )
                         {
                                 if ( it->isProject() )

v2/branches/dev/monkey/src/xupmanager/ProjectEditorModel.cpp

@@ -1 +1 @@
 #include "ProjectEditorModel.h"
 #include "XUPItem.h"
+#include "XUPProjectItem.h"
 #include "ProjectItemModel.h"
 
@@ -19 +20 @@
         if ( XUPItem* it = mSourceModel->itemFromIndex( idx ) )
         {
-                XUPItem* pit = mProject->project();
+                XUPProjectItem* pit = mProject->project();
                 // if project or parent project
                 if ( it->isProject() )
@@ -25 +26 @@
                 // if variable and filter != values
                 if ( it->isType( "variable" ) && mType != ProjectEditorModel::vtValues )
-                        return it->project() == pit && !it->fileVariables().contains( it->defaultValue() );
+                        return it->project() == pit && !it->project()->fileVariables().contains( it->defaultValue() );
                 // if value and filter != variable
                 if ( ( it->isType( "value" ) || it->isType( "folder" ) ) && mType != ProjectEditorModel::vtVariables )

v2/branches/dev/monkey/src/xupmanager/ScopedProjectItemModel.cpp

@@ -2 +2 @@
 #include "ProjectItemModel.h"
 #include "XUPItem.h"
+#include "XUPProjectItem.h"
 
 ScopedProjectItemModel::ScopedProjectItemModel( ProjectItemModel* m )
@@ -11 +12 @@
 }
 
-void ScopedProjectItemModel::setFilteredProject( XUPItem* project )
+void ScopedProjectItemModel::setFilteredProject( XUPProjectItem* project )
 {
         mProject = project;
@@ -17 +18 @@
 }
 
-XUPItem* ScopedProjectItemModel::filteredProject() const
+XUPProjectItem* ScopedProjectItemModel::filteredProject() const
 { return mProject; }
 
@@ -25 +26 @@
         {
                 if ( mProject )
-                        return ( it->children( true, false ).contains( mProject ) || it == mProject ) ||
+                        return ( it->children( true, false ).contains( static_cast<XUPItem*> (mProject) ) || it == mProject ) ||
                                 ( it->project() == mProject && it->isType( "project" ) || it->isType( "scope" ) );
                 else

v2/branches/dev/monkey/src/xupmanager/ScopedProjectItemModel.h

@@ -8 +8 @@
 class ProjectItemModel;
 class XUPItem;
+class XUPProjectItem;
 
 class Q_MONKEY_EXPORT ScopedProjectItemModel : public QSortFilterProxyModel
@@ -16 +17 @@
         ScopedProjectItemModel( ProjectItemModel* = 0 );
 
-        void setFilteredProject( XUPItem* project );
-        XUPItem* filteredProject() const;
+        void setFilteredProject( XUPProjectItem* project );
+        XUPProjectItem* filteredProject() const;
         
         inline ProjectItemModel* model() const { return mSourceModel; }
@@ -23 +24 @@
 protected:
         ProjectItemModel* mSourceModel;
-        XUPItem* mProject;
+        XUPProjectItem* mProject;
 
         virtual bool filterAcceptsRow( int sr, const QModelIndex& sp ) const;

v2/branches/dev/monkey/src/xupmanager/XUPIO.cpp

@@ -72 +72 @@
                         QDomElement de = l.at( i ).toElement();
                         // create item
-                        XUPItem* it = p->clone( false );
+                        XUPItem* it = p->clone();
                         // assign node
                         it->setDomElement( de );

v2/branches/dev/monkey/src/xupmanager/XUPItem.cpp

@@ -1 +1 @@
 #include "XUPItem.h"
+#include "XUPProjectItem.h"
 #include "ProjectItemModel.h"
-#include "XUPIO.h"
 
 
@@ -8 +8 @@
 #include <QDir>
 
-XUPItemInfos XUPItem::mXUPItemInfos;
-
-void XUPItem::registerItem()
-{
-        mXUPItemInfos.Registered = true;
-        mXUPItemInfos.TextTypes << "comment" << "value" << "emptyline" << "function";
-        mXUPItemInfos.FileVariables << "FILES";
-        mXUPItemInfos.VariableLabels["FILES"] = tr( "Project Files" );
-        mXUPItemInfos.FilteredVariables << "FILES";
-        mXUPItemInfos.Operators << "=" << "+=" << "-=" << "*=" << "~=";
-        mXUPItemInfos.Suffixes[tr( "Monkey Studio Project" )] = QStringList( "*.xup" );
-}
-
-const XUPItemInfos& XUPItem::itemInfos() const
-{ return mXUPItemInfos; }
-
-QStringList XUPItem::operators() const
-{ return mXUPItemInfos.Operators; }
-
-void XUPItem::registerOperator( const QString& s )
-{
-        if ( !mXUPItemInfos.Operators.contains( s ) )
-                mXUPItemInfos.Operators << s;
-}
-
-QStringList XUPItem::filteredVariables() const
-{ return mXUPItemInfos.FilteredVariables; }
-
-void XUPItem::registerFilteredVariables( const QString& s )
-{
-        if ( !mXUPItemInfos.FilteredVariables.contains( s ) )
-                mXUPItemInfos.FilteredVariables << s;
-}
-
-QStringList XUPItem::textTypes() const
-{ return mXUPItemInfos.TextTypes; }
-
-void XUPItem::registerTextType( const QString& s )
-{
-        if ( !mXUPItemInfos.TextTypes.contains( s ) )
-                mXUPItemInfos.TextTypes << s;
-}
-
-QStringList XUPItem::fileVariables() const
-{ return mXUPItemInfos.FileVariables; }
-
-void XUPItem::registerFileVariables( const QString& s )
-{
-        if ( !mXUPItemInfos.FileVariables.contains( s ) )
-                mXUPItemInfos.FileVariables << s;
-}
-
-QStringList XUPItem::pathVariables() const
-{ return mXUPItemInfos.PathVariables; }
-
-void XUPItem::registerPathVariables( const QString& s )
-{
-        if ( !mXUPItemInfos.PathVariables.contains( s ) )
-                mXUPItemInfos.PathVariables << s;
-}
-
-QHash<QString, QStringList> XUPItem::suffixes() const
-{ return mXUPItemInfos.Suffixes; }
-
-void XUPItem::registerSuffixes( const QString& l, const QStringList& s )
-{ mXUPItemInfos.Suffixes[l] = s; }
-
-QHash<QString, QString> XUPItem::variableLabels() const
-{ return mXUPItemInfos.VariableLabels; }
-
-void XUPItem::registerVariableLabels( const QString& v, const QString& l )
-{ mXUPItemInfos.VariableLabels[v] = l; }
-
-QHash<QString, QIcon> XUPItem::variableIcons() const
-{ return mXUPItemInfos.VariableIcons; }
-
-void XUPItem::registerVariableIcons( const QString& v, const QIcon& i )
-{ mXUPItemInfos.VariableIcons[v] = i; }
-
-QHash<QString, QStringList> XUPItem::variableSuffixes() const
-{ return mXUPItemInfos.VariableSuffixes; }
-
-void XUPItem::registerVariableSuffixes( const QString& n, const QStringList& s )
-{ mXUPItemInfos.VariableSuffixes[n] = s; }
 
 QIcon XUPItem::getIcon( const QString& o, const QString& d ) const
 { return QIcon( QFile::exists( o ) ? o : QString( ":/items/%1.png" ).arg( d ) ); }
 
-QString XUPItem::valueName( const QString& s ) const
-{
-        if ( textTypes().contains( s ) )
-                return "text";
-        return "name";
-}
-
-QStringList XUPItem::files( bool a )
-{
-        // files list
-        QStringList l;
-        
-        // check valid item
-        if ( !isType( "variable" ) || !fileVariables().contains( defaultValue() ) )
-                return l;
-        
-        // check recurs items from vit
-        foreach ( XUPItem* cit, children( false, false ) )
-                if ( cit->isType( "value" ) )
-                                l << ( a ? cit->filePath() : cit->relativeFilePath() );
-        
-        // return list
-        return l;
-}
-
 QVariant XUPItem::data( int role ) const
 {
@@ -129 +20 @@
                 if ( isType( "variable" ) )
                 {
-                        icn = QFile::exists( value( "icon" ) ) ? QIcon( value( "icon" ) ) : variableIcons().value( value( "name" ) );
+                        icn = QFile::exists( value( "icon" ) ) ? QIcon( value( "icon" ) ) : project()->variableIcons().value( value( "name" ) );
                         if ( icn.isNull() )
                                 icn = getIcon( QString(), value( "type" ) );
@@ -143 +34 @@
                 else if ( isType( "variable" ) )
                 {
-                        if ( variableLabels().contains( defaultValue() ) )
-                                txt = variableLabels().value( defaultValue() );
+                        if ( project()->variableLabels().contains( defaultValue() ) )
+                                txt = project()->variableLabels().value( defaultValue() );
                 }
                 else if ( isType( "value" ) )
@@ -150 +41 @@
                         if ( parent() )
                         {
-                                if ( fileVariables().contains( parent()->defaultValue() ) )
+                                if ( project()->fileVariables().contains( parent()->defaultValue() ) )
                                         txt = QFileInfo( defaultInterpretedValue() ).fileName();
-                                else if ( pathVariables().contains( parent()->defaultValue() ) )
+                                else if ( project()->pathVariables().contains( parent()->defaultValue() ) )
                                         txt = relativeFilePath( defaultInterpretedValue() );
                         }
@@ -196 +87 @@
 { return dynamic_cast<ProjectItemModel*>( QStandardItem::model() ); }
 
-XUPItem* XUPItem::clone( bool b ) const
-{ return b ? new XUPItem( domElement(), projectFilePath(), modified() ) : new XUPItem; }
+XUPItem* XUPItem::clone() const
+{ return new XUPItem; } //FIXME
 
 void XUPItem::appendRow( XUPItem* it )
@@ -257 +148 @@
 }
 
+QStringList XUPItem::files( bool a )
+{
+        // files list
+        QStringList l;
+        
+        // check valid item
+        if ( !isType( "variable" ) || !project()->fileVariables().contains( defaultValue() ) )
+                return l;
+        
+        // check recurs items from vit
+        foreach ( XUPItem* cit, children( false, false ) )
+                if ( cit->isType( "value" ) )
+                                l << ( a ? cit->filePath() : cit->relativeFilePath() );
+        
+        // return list
+        return l;
+}
+
+void XUPItem::addFiles( const QStringList& files, XUPItem* scope, const QString& op )
+{
+        // abort if no files
+        if ( files.isEmpty() )
+                return;
+        
+        // set scope
+        if ( !scope )
+                scope = this;
+        
+        // get variable item
+        XUPItem* vit = 0;
+        foreach ( XUPItem* cit, scope->children( false, true ) )
+        {
+                if ( cit->isType( "variable" ) && cit->defaultValue() == "FILES" && cit->value( "operator", "=" ) == op )
+                {
+                        vit = cit;
+                        break;
+                }
+        }
+        
+        // check variable exists or not
+        bool exists = vit;
+        
+        // create variable if needed
+        if ( !exists )
+        {
+                vit = clone();
+                vit->setDomElement( mDomElement.ownerDocument().createElement( "variable" ) );
+                scope->domElement().appendChild( vit->domElement() );
+                vit->setValue( vit->valueName(), "FILES" );
+                vit->setValue( "operator", op );
+                vit->setValue( "multiline", "true" );
+        }
+        
+        // get all files
+        QStringList existingFiles = vit->files();
+        
+        // add files
+        foreach ( QString f, files )
+        {
+                QString fp = filePath( f );
+                if ( !existingFiles.contains( fp ) )
+                {
+                        XUPItem* it = clone();
+                        it->setDomElement( mDomElement.ownerDocument().createElement( "value" ) );
+                        vit->domElement().appendChild( it->domElement() );
+                        it->setValue( it->valueName(), relativeFilePath( fp ) );
+                        vit->appendRow( it );
+                }
+        }
+        // append var item only at last will prevent multiple call of addFilteredValue from filtered view
+        if ( !exists )
+                scope->appendRow( vit );
+        
+        // update scope nested if needed
+        if ( scope->isType( "scope" ) )
+                scope->setValue( "nested", scope->rowCount() > 1 ? "false" : "true" );
+}
+
+void XUPItem::removeFiles( const QStringList& files, XUPItem* scope, const QString& op )
+{
+        // abort if no files
+        if ( files.isEmpty() )
+                return;
+        
+        // set scope
+        if ( !scope )
+                scope = this;
+        
+        // get variable item
+        XUPItem* vit = 0;
+        foreach ( XUPItem* cit, scope->children( false, true ) )
+        {
+                if ( cit->isType( "variable" ) && cit->defaultValue() == "FILES" && cit->value( "operator" ) == op )
+                {
+                        vit = cit;
+                        break;
+                }
+        }
+        
+        // if not variable, cancel
+        if ( !vit )
+                return;
+        
+        // check each child
+        foreach ( XUPItem* cit, vit->children( false, false ) )
+                if ( cit->isType( "value" ) && files.contains( cit->filePath() ) )
+                        cit->remove();
+        
+        // remove variable item if emptyline
+        if ( !vit->hasChildren() )
+                vit->remove();
+        
+        // update scope nested if needed
+        if ( scope->isType( "scope" ) )
+                scope->setValue( "nested", scope->rowCount() > 1 ? "false" : "true" );
+}
+
 void XUPItem::setDomElement( const QDomElement& e )
 {
@@ -277 +285 @@
 QString XUPItem::defaultInterpretedValue() const
 { return defaultValue(); }
+
+QString XUPItem::valueName( const QString& s ) const
+{
+        if ( project()->textTypes().contains( s ) ) //FIXME Do it's right?
+                return "text";
+        return "name";
+}
 
 QString XUPItem::valueName() const
@@ -351 +366 @@
 bool XUPItem::isProjectContainer() const
 { return false; }
-
-bool XUPItem::loadProject( const QString& s, const QString& v )
-{
-        if ( XUPIO::loadXUP( this, s, v ) )
-        {
-                mProjectFilePath = s;
-                setModified( false );
-                return true;
-        }
-        return false;
-}
-
-bool XUPItem::saveProject( const QString& s, const QString& v )
-{
-        if ( XUPIO::saveXUP( this, s.isEmpty() ? projectFilePath() : s, v ) )
-        {
-                mProjectFilePath = s.isEmpty() ? projectFilePath() : s;
-                setModified( false );
-                return true;
-        }
-        return false;
-}
-
-void XUPItem::addFiles( const QStringList& files, XUPItem* scope, const QString& op )
-{
-        // abort if no files
-        if ( files.isEmpty() )
-                return;
-        
-        // set scope
-        if ( !scope )
-                scope = this;
-        
-        // get variable item
-        XUPItem* vit = 0;
-        foreach ( XUPItem* cit, scope->children( false, true ) )
-        {
-                if ( cit->isType( "variable" ) && cit->defaultValue() == "FILES" && cit->value( "operator", "=" ) == op )
-                {
-                        vit = cit;
-                        break;
-                }
-        }
-        
-        // check variable exists or not
-        bool exists = vit;
-        
-        // create variable if needed
-        if ( !exists )
-        {
-                vit = clone( false );
-                vit->setDomElement( mDomElement.ownerDocument().createElement( "variable" ) );
-                scope->domElement().appendChild( vit->domElement() );
-                vit->setValue( vit->valueName(), "FILES" );
-                vit->setValue( "operator", op );
-                vit->setValue( "multiline", "true" );
-        }
-        
-        // get all files
-        QStringList existingFiles = vit->files();
-        
-        // add files
-        foreach ( QString f, files )
-        {
-                QString fp = filePath( f );
-                if ( !existingFiles.contains( fp ) )
-                {
-                        XUPItem* it = clone( false );
-                        it->setDomElement( mDomElement.ownerDocument().createElement( "value" ) );
-                        vit->domElement().appendChild( it->domElement() );
-                        it->setValue( it->valueName(), relativeFilePath( fp ) );
-                        vit->appendRow( it );
-                }
-        }
-        
-        // append var item only at last will prevent multiple call of addFilteredValue from filtered view
-        if ( !exists )
-                scope->appendRow( vit );
-        
-        // update scope nested if needed
-        if ( scope->isType( "scope" ) )
-                scope->setValue( "nested", scope->rowCount() > 1 ? "false" : "true" );
-}
-
-void XUPItem::removeFiles( const QStringList& files, XUPItem* scope, const QString& op )
-{
-        // abort if no files
-        if ( files.isEmpty() )
-                return;
-        
-        // set scope
-        if ( !scope )
-                scope = this;
-        
-        // get variable item
-        XUPItem* vit = 0;
-        foreach ( XUPItem* cit, scope->children( false, true ) )
-        {
-                if ( cit->isType( "variable" ) && cit->defaultValue() == "FILES" && cit->value( "operator" ) == op )
-                {
-                        vit = cit;
-                        break;
-                }
-        }
-        
-        // if not variable, cancel
-        if ( !vit )
-                return;
-        
-        // check each child
-        foreach ( XUPItem* cit, vit->children( false, false ) )
-                if ( cit->isType( "value" ) && files.contains( cit->filePath() ) )
-                        cit->remove();
-