#include <QtGui/QMainWindow> #include <QList> class BaseWidget; class DiffWidget; class MergeWidget; class QComboBox; class CalamariWindow : public QMainWindow { Q_OBJECT public: CalamariWindow(char* file1, char* file2); CalamariWindow(QImage file1, QImage file2, QString title); CalamariWindow(char* file1, char* file2, char* file3, char* file4=0); CalamariWindow(QImage base, QImage theirs, QImage yours, MergeWidget* parent); ~CalamariWindow(); QImage getResult(); protected: void closeEvent( QCloseEvent* e ); private slots: void nil() {}; void setAutoSize( bool auto ); void setZoom( int factor ); void colorOpts(); void saveOpts(); void maskToggled( bool ); void setBrushSize( bool ); void setEraserSize( bool ); void diffBaseTheirs(); void diffBaseYours(); void help(); void about(); void helpAlpha(); private: void initDiffToolbar(); void initMergeToolbar(); void addMaskOpts( QToolBar* t ); void addZoomOpts( QToolBar* t ); void loadOpts(); BaseWidget* baseWidget; DiffWidget* diffWidget; MergeWidget* mergeWidget; int zoomFactor; QComboBox* zoomList; QList<QAction*> maskActions; int brushSize; int eraserSize; QAction* save; MergeWidget* rgbWidget; //only set if this is an alpha merging window };
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#10 | 5539 | Sam Stafford | Kick off another window to merge alpha channels, if present. | ||
#9 | 5534 | Sam Stafford |
A brand new help file, a bit of cosmetic sprucing, one critical bug fix, and a partridge in a pear tree. |
||
#8 | 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. |
||
#7 | 5524 | Sam Stafford | Eraser and spraypaint tools, and "Save" command. | ||
#6 | 5520 | Sam Stafford |
Configurable brush sizes, complete with procedurally generated icons. Spiffy. |
||
#5 | 5516 | Sam Stafford | The M is for Merge. | ||
#4 | 5515 | Sam Stafford |
A little more groundwork for merging. Color options are now saved automatically, and may include alpha channels (semitransparent stencils are nifty). |
||
#3 | 5512 | Sam Stafford | UI reshuffling - pushed stencil-related options into a dialog. | ||
#2 | 5511 | Sam Stafford | Continued infrastructure work. | ||
#1 | 5501 | Sam Stafford |
Codename CALAMARI. Built with Qt 4.1.3 - needs QtCore4.dll and QtGui4.dll to run. |