X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=b25e16a28f4cd14f76dc25b0cda55ca095e3fa11;hb=e21da84b50724b40b38b5e0373d1a25e587169ee;hp=942651f2fbeab4d9ba230638523b0137c680b4c4;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 942651f2..b25e16a2 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,9 +119,13 @@ public:
 	int handle_event();
 
 	CWindowToolGUI *gui;
-	CWindowCoordSlider *slider;
-	CWindowCoordRange *range;
 	int type;
+	CWindowToolAutoRangeTumbler *min_tumbler;
+	CWindowCoordSlider *slider;
+	CWindowToolAutoRangeTumbler *max_tumbler;
+	CWindowToolAutoRangeReset *range_reset;
+	CWindowToolAutoRangeTextBox *range_text;
+	CWindowCoordRangeTumbler *range;
 };
 
 class CWindowCoordSlider : public BC_FSlider
@@ -134,11 +139,11 @@ public:
 	CWindowCoord *coord;
 };
 
-class CWindowCoordRange : public BC_Tumbler
+class CWindowCoordRangeTumbler : public BC_Tumbler
 {
 public:
-	CWindowCoordRange(CWindowCoord *coord, int x, int y);
-	~CWindowCoordRange();
+	CWindowCoordRangeTumbler(CWindowCoord *coord, int x, int y);
+	~CWindowCoordRangeTumbler();
 	int update(float scale);
 	int handle_up_event();
 	int handle_down_event();
@@ -804,6 +809,38 @@ public:
 };
 
 
+class CWindowToolAutoRangeTumbler : public BC_Tumbler
+{
+public:
+	CWindowToolAutoRangeTumbler(CWindowCoord *coord, int x, int y,
+			int use_max, const char *tip);
+	int handle_up_event();
+	int handle_down_event();
+
+	CWindowCoord *coord;
+	int use_max;
+};
+
+class CWindowToolAutoRangeReset : public BC_Button
+{
+public:
+	CWindowToolAutoRangeReset(CWindowCoord *coord, int x, int y);
+	int handle_event();
+
+	CWindowCoord *coord;
+};
+
+class CWindowToolAutoRangeTextBox : public BC_TextBox
+{
+public:
+	CWindowToolAutoRangeTextBox(CWindowCoord *coord, int x, int y);
+	int button_press_event();
+	int handle_event();
+	int update_range();
+
+	CWindowCoord *coord;
+};
+
 
 class CWindowCameraGUI : public CWindowToolGUI
 {
@@ -814,9 +851,11 @@ public:
 	void create_objects();
 	void update();
 
+	BC_TitleBar *bar1, *bar2;
 	CWindowCoord *x, *y, *z;
 	CWindowCameraAddKeyframe *add_keyframe;
 	CWindowCameraReset *reset;
+	BC_TitleBar *bar3, *bar4, *bar5;
 	CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump;
 	CWindowCurveAutoSpan *auto_span;
 	CWindowCurveAutoEdge *auto_edge;
@@ -912,9 +951,11 @@ public:
 	void create_objects();
 	void update();
 
+	BC_TitleBar *bar1, *bar2;
 	CWindowCoord *x, *y, *z;
 	CWindowProjectorAddKeyframe *add_keyframe;
 	CWindowProjectorReset *reset;
+	BC_TitleBar *bar3, *bar4, *bar5;
 	CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump;
 	CWindowCurveAutoSpan *auto_span;
 	CWindowCurveAutoEdge *auto_edge;