Added preview window to file loading dialog. :-)

[ttedit] / src / editwindow.h

diff --git a/src/editwindow.h b/src/editwindow.h
old mode 100755 (executable)
new mode 100644 (file)
index 1b24dde..77104bd
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -8,10 +8,12 @@
 #ifndef __EDITWINDOW_H__
 #define __EDITWINDOW_H__
 
-#include <QtGui>
-#include "types.h"
+#include <QtWidgets>
+#include <stdint.h>
 #include "toolwindow.h"                                                        // For ToolType enum
 #include "glyphpoints.h"
+#include "painter.h"
+
 
 class EditWindow: public QWidget
 {
@@ -23,27 +25,38 @@ class EditWindow: public QWidget
                QSize sizeHint() const;
 
        protected:
-               void paintEvent(QPaintEvent * event);
-               void mousePressEvent(QMouseEvent * event);
-               void mouseMoveEvent(QMouseEvent * event);
-               void mouseReleaseEvent(QMouseEvent * event);
+               void paintEvent(QPaintEvent *);
+               void mousePressEvent(QMouseEvent *);
+               void mouseMoveEvent(QMouseEvent *);
+               void mouseReleaseEvent(QMouseEvent *);
+               void keyPressEvent(QKeyEvent *);
+               void keyReleaseEvent(QKeyEvent *);
 
        private:
                void CreateCursors(void);
-               QPoint GetAdjustedMousePosition(QMouseEvent * event);
-               QPoint GetAdjustedClientPosition(int x, int y);
+               void DrawGlyph(Painter & p, GlyphPoints & glyph);
+               void DrawGlyphPoly(Painter & p, GlyphPoints & glyph, uint16_t poly);
+               void DrawGlyphSegment(Painter & p, IPoint p1, IPoint p2, IPoint p3);
+               void ClearSelection(void);
 
+       public:
                QImage image;
-               QPoint pt, ptOffset, ptPrevious;
-               double scale;                                                   // Window scaling factor
-               int32 offsetX, offsetY;                                 // Window offsets
-               ToolType tool;                                                  // Current tool
-               GlyphPoints pts;                                                // Glyph point structure
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+               Vector pt, ptOffset, ptPrevious, addPoint;
+               bool addPointOnCurve;
+               ToolType tool;                                          // Current tool
+               GlyphPoints pts;                                        // Glyph point structure
+               int32_t ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+               int16_t polyHighlight, oldPolyHighlight;
                bool polyFirstPoint;
+               bool showRotationCenter, haveZeroPoint;
+               Vector rotationCenter, rotationZeroPoint, rotationCurrentPoint;
+               double rotationAngle;
 
                ToolWindow * toolPalette;
-               QCursor cur[8];
+               QCursor cur[12];
+               bool selectedPoints[65536];     // Potential memory leak :-O
+               QRect selection;
+               bool selectionInProgress;
 };
 
 #endif // __EDITWINDOW_H__