#include "BaseWidget.h" #include "MergeEditor.h" class CalamariWindow; class MergeWidget : public BaseWidget { Q_OBJECT public: MergeWidget( char* base, char* theirs, char* yours ); MergeWidget( QImage base, QImage theirs, QImage yours ); ~MergeWidget(void); QImage getBase() { return base; }; QImage getTheirs() { return leg1; }; QImage getYours() { return leg2; }; //Alpha merging interface functions. void beDone(); bool done() { return allDone; }; QImage mergeResult() { return merge; }; signals: void enableSave( bool ); public slots: void nil0() {}; void autoMerge(); void setTheirsMask( bool on ); void setYoursMask( bool on ); void setConflictMask( bool on ); void setBrushSize( int px ); void setEraserSize( int px ); void eraserToggle( bool on ); void paintToggle( bool on ); void sprayToggle( bool on ); void setEraserColor( QColor e ); bool save(); void saveAs(); void setResult( char* ); void exportStencils(); private slots: void nil1() {}; void imageEdited() { emit enableSave( true ); }; private: MergeEditor* editor; QImage merge; QImage base; QBitmap base_theirs; float base_theirs_t; QBitmap base_yours; float base_yours_t; QBitmap conflicts; float conflicts_t; QString result; QString resultFormat; void freshenConflicts(); void initMergeWidget(); void spawnAlphaWindow(); CalamariWindow* alphaWindow; bool allDone; };
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#7 | 5539 | Sam Stafford | Kick off another window to merge alpha channels, if present. | ||
#6 | 5534 | Sam Stafford |
A brand new help file, a bit of cosmetic sprucing, one critical bug fix, and a partridge in a pear tree. |
||
#5 | 5527 | Sam Stafford |
Diff options in merge mode, and an "export stencils" command for people who like that sort of thing. Also, a fresh build. |
||
#4 | 5524 | Sam Stafford | Eraser and spraypaint tools, and "Save" command. | ||
#3 | 5519 | Sam Stafford |
Added the paintbrush tool. Now we're getting somewhere. |
||
#2 | 5516 | Sam Stafford | The M is for Merge. | ||
#1 | 5511 | Sam Stafford | Continued infrastructure work. |