# HG changeset patch # User insilmaril # Date 1240952024 0 # Node ID bf3ea1f1520b053a751a771e11cb1c935b303793 # Parent 04039e47ac745ba2954157a7394a1ca81db9b846 minor fixes diff -r 04039e47ac74 -r bf3ea1f1520b treeitem.h --- a/treeitem.h Tue Apr 28 09:51:48 2009 +0000 +++ b/treeitem.h Tue Apr 28 20:53:44 2009 +0000 @@ -25,28 +25,28 @@ ~TreeItem(); void init(); - QString saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset); + virtual QString saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset); // General housekeeping - void setModel (VymModel *m); - VymModel* getModel(); + virtual void setModel (VymModel *m); + virtual VymModel* getModel(); - void appendChild (TreeItem *child); - void removeChild (int row); + virtual void appendChild (TreeItem *child); + virtual void removeChild (int row); - TreeItem *child(int row); - int childCount() const; - int childNumber() const; - int columnCount() const; - int branchCount() const; - int imageCount() const; - int xlinkCount() const; + virtual TreeItem *child(int row); + virtual int childCount() const; + virtual int childNumber() const; + virtual int columnCount() const; + virtual int branchCount() const; + virtual int imageCount() const; + virtual int xlinkCount() const; - int row() const; - int column() const; - int depth() ; - TreeItem *parent(); + virtual int row() const; + virtual int column() const; + virtual int depth() ; + virtual TreeItem *parent(); /*! Return number of item in parent by type, e.g. first branch has number 0 */ diff -r 04039e47ac74 -r bf3ea1f1520b vymmodel.cpp --- a/vymmodel.cpp Tue Apr 28 09:51:48 2009 +0000 +++ b/vymmodel.cpp Tue Apr 28 20:53:44 2009 +0000 @@ -241,25 +241,25 @@ FloatImageObj (mapScene).resetSaveCounter();// FIXME-2 this can be done local to vymmodel maybe... // Build xml recursivly - if (!saveSel || typeid (*saveSel) == typeid (MapCenterObj)) + if (!saveSel || saveSel->getType()==TreeItem::MapCenter) // Save all mapcenters as complete map, if saveSel not set s+=saveTreeToDir(tmpdir,prefix,writeflags,offset); else { - if ( typeid(*saveSel) == typeid(BranchObj) ) + if (saveSel->getType()==TreeItem::Branch) // Save Subtree - s+=((BranchObj*)(saveSel))->saveToDir(tmpdir,prefix,offset); - else if ( typeid(*saveSel) == typeid(FloatImageObj) ) + s+=saveSel->saveToDir(tmpdir,prefix,offset); + //FIXME-2 else if (saveSel->getType()==TreeItem::Image) // Save image - s+=((FloatImageObj*)(saveSel))->saveToDir(tmpdir,prefix); + //s+=((FloatImageObj*)(saveSel))->saveToDir(tmpdir,prefix); } // Save local settings s+=settings.getDataXML (destPath); // Save selection - if (!selection.isEmpty() && !saveSel ) - s+=xml.valueElement("select",selection.getSelectString()); + if (getSelectedItem() && !saveSel ) + s+=xml.valueElement("select",getSelectString()); xml.decIndent(); s+=xml.endElement("vymmap"); diff -r 04039e47ac74 -r bf3ea1f1520b vymview.cpp --- a/vymview.cpp Tue Apr 28 09:51:48 2009 +0000 +++ b/vymview.cpp Tue Apr 28 20:53:44 2009 +0000 @@ -16,7 +16,11 @@ // Create TreeView treeview=new QTreeView; treeview->setModel ((QAbstractItemModel*)model); - treeview->setMinimumWidth (350); + //treeview->setMinimumWidth (50); + QList widths; + widths<<30; + widths<<150; + setSizes(widths); treeview->setColumnWidth (0,350); selModel=treeview->selectionModel();