#include <QPixmap> #include "ImageProjector.h" class MergeEditor : public ImageProjector { Q_OBJECT public: MergeEditor(void); ~MergeEditor(void); void setTheirs( QImage* t ); void setYours( QImage* y ) { yours = y; }; public slots: void nil1() {}; void setBlend( int alpha ); private: QImage* theirs; QImage* yours; QPixmap texture; QImage scratch; QImage s_alpha; };
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#4 | 5534 | Sam Stafford |
A brand new help file, a bit of cosmetic sprucing, one critical bug fix, and a partridge in a pear tree. |
||
#3 | 5524 | Sam Stafford | Eraser and spraypaint tools, and "Save" command. | ||
#2 | 5519 | Sam Stafford |
Added the paintbrush tool. Now we're getting somewhere. |
||
#1 | 5516 | Sam Stafford | The M is for Merge. |