1.1 --- a/flagrowobj.h	Thu May 07 08:48:53 2009 +0000
     1.2 +++ b/flagrowobj.h	Tue May 26 11:24:51 2009 +0000
     1.3 @@ -6,47 +6,35 @@
     1.4  //#include "mapobj.h"
     1.5  #include "flagobj.h"
     1.6  
     1.7 -/*! \brief A collection of flags (FlagObj). 
     1.8 +class Flag;
     1.9 +
    1.10 +/*! \brief A collection of flags (FlagObj) in a map. 
    1.11  
    1.12     The flags are aligned horizontally  in a row on the map. 
    1.13 -   A toolbar can be created from the flags in this row.
    1.14   */
    1.15  
    1.16 -class FlagRowObj:public MapObj {	// FIXME-0 move pixmaps to mainwindow or model in the end...
    1.17 +class FlagRowObj:public MapObj {
    1.18  public:
    1.19      FlagRowObj ();
    1.20      FlagRowObj (QGraphicsScene *);
    1.21      ~FlagRowObj ();
    1.22      virtual void init ();
    1.23      virtual void copy (FlagRowObj*);
    1.24 -    virtual void clone(FlagRowObj*);
    1.25      virtual void move   (double,double);
    1.26      virtual void moveBy (double,double);
    1.27      virtual void setVisibility(bool);
    1.28      virtual FlagObj* addFlag (FlagObj *fo);			// make deep copy of FlagObj
    1.29 +	virtual QStringList activeFlagNames();
    1.30      virtual void positionBBox();
    1.31      virtual void calcBBoxSize();
    1.32  	virtual QString getFlagName (const QPointF &p);	// Find flag by position
    1.33  	bool isActive(const QString&);
    1.34 -	void toggle (const QString &name);
    1.35 -	void activate(const QString&);
    1.36 +	void activate (Flag *flag);
    1.37  	void deactivate(const QString&);
    1.38 -	void deactivateAll();
    1.39 -	void deactivateGroup(FlagObj *);	//FIXME-0
    1.40 -	void setToolBar (QToolBar *);		//FIXME-0
    1.41 -	void setEnabled (bool);
    1.42  	void setShowFlags (bool);
    1.43 -	void resetUsedCounter();
    1.44 -	QString saveToDir (const QString &,const QString &,bool);
    1.45 -	void setName (const QString&);			// prefix for exporting flags to dir
    1.46 -	void makeToolbar (QMainWindow*, const QString &);	// Create Toolbar buttons FIXME-0
    1.47 -	void updateToolbar();					// Update Toolbar buttons	FIXME-0
    1.48  private:	
    1.49 -	FlagRowObj* parentRow;					// look for flags in this row
    1.50  	FlagObj* findFlag (const QString&);
    1.51      QList <FlagObj*> flag; 
    1.52 -	QToolBar *toolbar;
    1.53 -	QString name;
    1.54  	bool showFlags;							// FloatObjects want to hide their flags
    1.55  };
    1.56  #endif