X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=6d02bf67970eeb45fa28f3873d1a7f775cff431c;hp=4c7557295330d35a8f1cbdd08d4eaae5b7698680;hb=32a609a6bd1181993569399ab51f314dc7cb4fba;hpb=8e69e9e7ab87fd5c273ce30a05c9973e786467d9

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 4c755729..6d02bf67 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -37,6 +37,11 @@ enum {
 	MASK_SHAPE_TRIANGLE,
 	MASK_SHAPE_OVAL,
 };
+enum {
+	MASK_SCALE_X,
+	MASK_SCALE_Y,
+	MASK_SCALE_XY,
+};
 
 // This common thread supports all the tool GUI's.
 class CWindowTool : public Thread
@@ -92,6 +97,7 @@ public:
 	virtual int close_event();
 	int keypress_event();
 	int translation_event();
+	int press(void (CWindowCanvas::*fn)());
 
 	MWindow *mwindow;
 	CWindowTool *thread;
@@ -112,18 +118,44 @@ public:
 	CWindowToolGUI *gui;
 };
 
-class CWindowCropOK : public BC_GenericButton
+class CWindowCropApply : public BC_GenericButton
 {
 public:
-	CWindowCropOK(MWindow *mwindow, CWindowToolGUI *gui,
+	CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui,
 			int x, int y);
 // Perform the cropping operation
 	int handle_event();
 	int keypress_event();
 	MWindow *mwindow;
-	CWindowToolGUI *gui;
+	CWindowCropGUI *crop_gui;
+};
+
+class CWindowCropOpMode : public BC_PopupMenu
+{
+	static const char *crop_ops[CROP_MODES];
+public:
+	CWindowCropOpMode(MWindow *mwindow, CWindowCropGUI *crop_gui,
+			int mode, int x, int y);
+	~CWindowCropOpMode();
+	void create_objects();
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowCropGUI *crop_gui;
+	int mode;
+};
+
+class CWindowCropOpItem : public BC_MenuItem
+{
+public:
+	CWindowCropOpItem(CWindowCropOpMode *popup, const char *text, int id);
+	int handle_event();
+
+	CWindowCropOpMode *popup;
+	int id;
 };
 
+
 class CWindowCropGUI : public CWindowToolGUI
 {
 public:
@@ -134,6 +166,7 @@ public:
 // Update the gui
 	void handle_event();
 	CWindowCoord *x1, *y1, *width, *height;
+	CWindowCropOpMode *crop_mode;
 };
 
 class CWindowMaskItem : public BC_ListBoxItem
@@ -329,6 +362,17 @@ public:
 	CWindowMaskGUI *gui;
 };
 
+class CWindowMaskGangPoint : public BC_Toggle
+{
+public:
+	CWindowMaskGangPoint(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y);
+	~CWindowMaskGangPoint();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
 class CWindowMaskSmoothButton : public BC_Button
 {
 public:
@@ -415,7 +459,6 @@ public:
 	CWindowMaskDelPoint(MWindow *mwindow, CWindowMaskGUI *gui,
 			int x, int y);
 	int handle_event();
-	int keypress_event();
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
 };
@@ -441,11 +484,13 @@ public:
 	~CWindowMaskFeatherSlider();
 	int handle_event();
 	int update(float v);
+	int update(int r, float v, float mn, float mx);
 	char *get_caption() { return 0; }
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
 	int stick;
 	float last_v;
+	float max;
 	Timer *timer;
 };
 
@@ -652,6 +697,7 @@ public:
 	CWindowMaskGangFader *gang_fader;
 	CWindowMaskAffectedPoint *active_point;
 	CWindowMaskDelPoint *del_point;
+	CWindowMaskGangPoint *gang_point;
 	CWindowMaskSmoothButton *mask_pnt_linear, *mask_pnt_smooth;
 	CWindowMaskSmoothButton *mask_crv_linear, *mask_crv_smooth;
 	CWindowMaskSmoothButton *mask_all_linear, *mask_all_smooth;
@@ -715,15 +761,13 @@ class CWindowCameraGUI : public CWindowToolGUI
 public:
 	CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread);
 	~CWindowCameraGUI();
+	void handle_event();
 	void create_objects();
 	void update();
 
-// Update the keyframe from text boxes
-	void handle_event();
-//	BezierAuto* get_keyframe();
 	CWindowCoord *x, *y, *z;
-private:
-// Toggles for keyframe curve mode (for camera automation only)
+	CWindowCameraAddKeyframe *add_keyframe;
+	CWindowCameraReset *reset;
 	CWindowCurveToggle *t_smooth, *t_linear;
 };
 
@@ -787,18 +831,39 @@ public:
 	CWindowCameraGUI *gui;
 };
 
+class CWindowCameraAddKeyframe : public BC_Button
+{
+public:
+	CWindowCameraAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowCameraReset : public BC_Button
+{
+public:
+	CWindowCameraReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+
 class CWindowProjectorGUI : public CWindowToolGUI
 {
 public:
 	CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread);
 	~CWindowProjectorGUI();
+	void handle_event();
 	void create_objects();
 	void update();
-	void handle_event();
-//	BezierAuto* get_keyframe();
+
 	CWindowCoord *x, *y, *z;
-private:
-// Toggles for keyframe curve mode (projector automation only)
+	CWindowProjectorAddKeyframe *add_keyframe;
+	CWindowProjectorReset *reset;
 	CWindowCurveToggle *t_smooth, *t_linear;
 };
 
@@ -862,6 +927,26 @@ public:
 	CWindowProjectorGUI *gui;
 };
 
+class CWindowProjectorAddKeyframe : public BC_Button
+{
+public:
+	CWindowProjectorAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowProjectorReset : public BC_Button
+{
+public:
+	CWindowProjectorReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
 
 
 
@@ -884,5 +969,4 @@ public:
 };
 
 
-
 #endif