diff -r 6269016c9905 -r c6bb4fdcc55f vymmodel.h --- a/vymmodel.h Thu Aug 06 10:42:17 2009 +0000 +++ b/vymmodel.h Sat Aug 08 21:58:26 2009 +0000 @@ -565,37 +565,29 @@ bool select (TreeItem *ti ); //! Select by pointer to TreeItem bool select (const QModelIndex &index); //! Select by ModelIndex void unselect(); - void reselect(); + bool reselect(); void emitShowSelection(); //!< Show selection in all views signals: void showSelection(); -// void selectInt(LinkableMapObj*); //FIXME-4 +// bool selectInt(LinkableMapObj*); //FIXME-4 -private: - void selectNextBranchInt(); // Increment number of branch - void selectPrevBranchInt(); //! Select the branch which would be above in vymmap view - void selectAboveBranchInt(); //! Select the branch which would be above current selection in TreeView - void selectBelowBranchInt(); // Increment number of branch public: - void selectUpperBranch(); - void selectLowerBranch(); - void selectLeftBranch(); - void selectRightBranch(); - void selectFirstBranch(); - void selectLastBranch(); - void selectLastSelectedBranch(); - void selectParent(); + bool selectFirstBranch(); + bool selectLastBranch(); + bool selectLastSelectedBranch(); + bool selectParent(); public: TreeItem::Type selectionType(); LinkableMapObj* getSelectedLMO(); BranchObj* getSelectedBranchObj(); // FIXME-3 replace by item... - BranchItem* getSelectedBranchItem(); + BranchItem* getSelectedBranch(); + ImageItem* getSelectedImage(); + AttributeItem* getSelectedAttribute(); TreeItem* getSelectedItem(); QModelIndex getSelectedIndex(); - ImageItem* getSelectedImageItem(); QString getSelectString (); QString getSelectString (LinkableMapObj *lmo); QString getSelectString (TreeItem *item);