1.1 --- a/mapeditor.h	Sat Mar 31 09:28:27 2007 +0000
     1.2 +++ b/mapeditor.h	Sat Mar 31 09:28:27 2007 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #ifndef MAPEDITOR_H
     1.5  #define MAPEDITOR_H
     1.6  
     1.7 -#include <QBuffer>
     1.8 +//#include <QBuffer>
     1.9  #include <QGraphicsView>
    1.10  
    1.11  #include "mapcenterobj.h"
    1.12 @@ -100,10 +100,12 @@
    1.13      BranchObj* addNewBranch(int);			// pos allows to add above/below selection
    1.14      BranchObj* addNewBranchBefore();		// insert and make selection its
    1.15      void deleteSelection();
    1.16 -	LinkableMapObj* getSelection();	// returns selection
    1.17 -	void unselect();				// before changing current noteedit
    1.18 -	void reselect();				// after  changing current noteedit
    1.19 -	bool select(const QString &);	// Select by string
    1.20 +	LinkableMapObj* getSelection();			// returns selection
    1.21 +	BranchObj* getSelectedBranch();			// returns selected branch or NULL
    1.22 +	FloatImageObj* getSelectedFloatImage();	// returns selected branch or NULL
    1.23 +	void unselect();						// before changing current noteedit
    1.24 +	void reselect();						// after  changing current noteedit
    1.25 +	bool select(const QString &);			// Select by string
    1.26  	QString getSelectString();
    1.27  private:	
    1.28  	void selectInt(LinkableMapObj*);	
    1.29 @@ -143,6 +145,8 @@
    1.30  	void deleteKeepChilds();				// remove but keep childs
    1.31  	void deleteChilds();					// remove childs
    1.32  	void editMapInfo();						// dialog to enter author, ...
    1.33 +	void ensureSelectionVisible();		
    1.34 +	void updateSelection();					// update geometry of selection
    1.35  	void updateActions();					// update e.g. format buttons
    1.36  	void updateNoteFlag();					// when TextEditor changes
    1.37  	void setMapAuthor (const QString &);
    1.38 @@ -160,6 +164,12 @@
    1.39  	int getMapDefXLinkWidth();
    1.40  	void toggleMapLinkColorHint();			// after changing linkStyles
    1.41      void selectMapLinkColor();
    1.42 +    void selectMapSelectionColor();
    1.43 +private:	
    1.44 +    void setSelectionColorInt(QColor);
    1.45 +public:	
    1.46 +    void setSelectionColor(QColor);
    1.47 +    QColor getSelectionColor();
    1.48  	bool scrollBranch();
    1.49  	bool unscrollBranch();
    1.50      void toggleScroll();
    1.51 @@ -172,7 +182,9 @@
    1.52  	void saveFloatImageInt (FloatImageObj*, const QString &, const QString &);
    1.53  public:	
    1.54  	void saveFloatImage ();
    1.55 -	void setFrame(const FrameType &);
    1.56 +	void setFrameType(const FrameType &);
    1.57 +	void setFramePenColor (const QColor &);
    1.58 +	void setFrameBrushColor (const QColor &);
    1.59  	void setIncludeImagesVer(bool);
    1.60  	void setIncludeImagesHor(bool);
    1.61  	void setHideLinkUnselected (bool);
    1.62 @@ -187,7 +199,6 @@
    1.63  											// set /mainwindo/showTestMenu=true...
    1.64  
    1.65  protected:
    1.66 -	void ensureSelectionVisible();		
    1.67  	virtual void contextMenuEvent ( QContextMenuEvent *e );
    1.68      virtual void keyPressEvent(QKeyEvent*);
    1.69      virtual void keyReleaseEvent(QKeyEvent*);