1.1 --- a/vymmodel.h Wed May 20 15:40:14 2009 +0000
1.2 +++ b/vymmodel.h Tue May 26 11:23:44 2009 +0000
1.3 @@ -8,12 +8,10 @@
1.4 #include "mapcenterobj.h"
1.5 #include "mapeditor.h"
1.6 #include "parser.h"
1.7 -#include "selection.h"
1.8 #include "treeitem.h"
1.9 #include "treemodel.h"
1.10
1.11 class BranchItem;
1.12 -class MapCenterItem;
1.13 class MapEditor;
1.14
1.15 class VymModel : public TreeModel {
1.16 @@ -282,7 +280,7 @@
1.17 void sortChildren(); //!< Sort children lexically
1.18
1.19 // The create methods are used to quickly parse a XML file
1.20 - MapCenterItem* createMapCenter(); //!< Create and select MapCenter
1.21 + BranchItem* createMapCenter(); //!< Create and select MapCenter // FIXME-3 maybe join this also with createBranch
1.22 BranchItem* createBranch(); //!< Create and select Branch
1.23 TreeItem* createImage(); //!< Create and select image
1.24
1.25 @@ -290,9 +288,9 @@
1.26
1.27 Disclaimer: Still experimental, not fully supported yet.
1.28 */
1.29 - MapCenterItem* addMapCenter();
1.30 + BranchItem* addMapCenter();
1.31 private:
1.32 - MapCenterItem* addMapCenter(QPointF absPos);
1.33 + BranchItem* addMapCenter(QPointF absPos);
1.34
1.35 /*! \brief Add new branch
1.36
1.37 @@ -425,8 +423,8 @@
1.38 void reposition(); //!< Call reposition for all MCOs
1.39 void setHideTmpMode (TreeItem::HideTmpMode mode);
1.40
1.41 - QPolygonF shape(BranchObj *bo); //!< Returns arbitrary shape of subtree
1.42 - void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
1.43 + //FIXME-5 QPolygonF shape(BranchObj *bo); //!< Returns arbitrary shape of subtree
1.44 + //FIXME-5 void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
1.45
1.46 void emitNoteHasChanged (TreeItem *ti);
1.47 void emitDataHasChanged (TreeItem *ti);
1.48 @@ -539,7 +537,6 @@
1.49 // Selection related
1.50 ////////////////////////////////////////////
1.51 private:
1.52 - Selection selection;
1.53 TreeItem *latestAddedItem; // latest added object, reset on setChanged()
1.54
1.55 signals:
1.56 @@ -607,6 +604,8 @@
1.57 private:
1.58 void setSelectionColorInt(QColor);
1.59 QItemSelectionModel *selModel;
1.60 + QString lastSelectString;
1.61 + bool selectionBlocked; //! Used to block changes of selection while editing a heading
1.62
1.63 public:
1.64 void setSelectionColor(QColor);