X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=00e485e3c4cde4b90bda439e79d3a10539d0323f;hp=3d05d38aa01815ca96c6bd47203d41edfecb3098;hb=fb3e53778e49a406768506de9bf8edfd3d4c36e6;hpb=8fd64d1d3770c95e2a7cba1049e909cadb4e1fbf

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 3d05d38a..00e485e3 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -90,6 +90,7 @@ public:
 	virtual void handle_event() {};
 // Update text boxes from keyframe here
 	virtual void update() {};
+
 // Update EDL and preview only
 	void update_preview(int changed_edl=0);
 	void draw_preview(int changed_edl);
@@ -97,6 +98,7 @@ public:
 	virtual int close_event();
 	int keypress_event();
 	int translation_event();
+	int press(void (CWindowCanvas::*fn)());
 
 	MWindow *mwindow;
 	CWindowTool *thread;
@@ -106,29 +108,81 @@ public:
 class CWindowCoord : public BC_TumbleTextBox
 {
 public:
-	CWindowCoord(CWindowToolGUI *gui, int x, int y,
-			float value, int logincrement);
-	CWindowCoord(CWindowToolGUI *gui, int x, int y,
-			int value);
-
+	CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int group=-1);
+	CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int group=-1);
+	void create_objects();
+	void update_gui(float value);
 // Calls the window's handle_event
 	int handle_event();
 
 	CWindowToolGUI *gui;
+	CWindowCoordSlider *slider;
+	CWindowCoordRange *range;
+	int type;
+};
+
+class CWindowCoordSlider : public BC_FSlider
+{
+public:
+	CWindowCoordSlider(CWindowCoord *coord, int x, int y, int w,
+		float mn, float mx, float value);
+	~CWindowCoordSlider();
+	int handle_event();
+
+	CWindowCoord *coord;
 };
 
-class CWindowCropOK : public BC_GenericButton
+class CWindowCoordRange : public BC_Tumbler
 {
 public:
-	CWindowCropOK(MWindow *mwindow, CWindowToolGUI *gui,
+	CWindowCoordRange(CWindowCoord *coord, int x, int y);
+	~CWindowCoordRange();
+	int update(float scale);
+	int handle_up_event();
+	int handle_down_event();
+
+	CWindowCoord *coord;
+};
+
+
+class CWindowCropApply : public BC_GenericButton
+{
+public:
+	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:
@@ -139,6 +193,7 @@ public:
 // Update the gui
 	void handle_event();
 	CWindowCoord *x1, *y1, *width, *height;
+	CWindowCropOpMode *crop_mode;
 };
 
 class CWindowMaskItem : public BC_ListBoxItem
@@ -456,11 +511,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;
 };
 
@@ -731,15 +788,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;
 };
 
@@ -803,18 +858,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;
 };
 
@@ -878,6 +954,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;
+};
+
 
 
 
@@ -900,5 +996,4 @@ public:
 };
 
 
-
 #endif