xyz toggle camera/projector, single frame proxy fix, neophyte size fix, shortcuts...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / gwindowgui.h

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.h b/cinelerra-5.1/cinelerra/gwindowgui.h
index 1687e037eedba05dec428e69bfb5e58da372e159..bde6fa7ddc7a30f5c1abaab21392111fd4a15c98 100644 (file)
--- a/cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/cinelerra-5.1/cinelerra/gwindowgui.h
@@ -34,8 +34,11 @@ enum {
        NONAUTOTOGGLES_TITLES,
        NONAUTOTOGGLES_TRANSITIONS,
        NONAUTOTOGGLES_PLUGIN_AUTOS,
+       NONAUTOTOGGLES_CAMERA_XYZ,
+       NONAUTOTOGGLES_PROJECTOR_XYZ,
        NONAUTOTOGGLES_BAR1,
        NONAUTOTOGGLES_BAR2,
+       NONAUTOTOGGLES_BAR3,
        NONAUTOTOGGLES_COUNT
 };
 
@@ -55,23 +58,32 @@ public:
        int keypress_event();
        void start_color_thread(GWindowColorButton *color_button);
        void update_toggles(int use_lock);
+       void toggle_camera_xyz();
+       void toggle_projector_xyz();
        void update_mwindow();
        void load_defaults();
        void save_defaults();
+       int *get_main_value(toggleinfo *info);
+       int check_xyz(int group);
+       void xyz_check(int group, int v);
 
-       static const char *other_text[];
+       static const char *non_auto_text[];
        static const char *auto_text[];
+       static const char *xyz_group[];
+       static const char *xyz_accel[];
        static int auto_colors[];
+       static const char *toggle_text(toggleinfo *tp);
 
        MWindow *mwindow;
        GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
        GWindowColorThread *color_thread;
+       GWindowToggle *camera_xyz, *projector_xyz;
 };
 
 class GWindowToggle : public BC_CheckBox
 {
 public:
-       GWindowToggle(MWindow *mwindow, GWindowGUI *gui, int x, int y,
+       GWindowToggle(GWindowGUI *gui, int x, int y,
                const char *text, int color, toggleinfo *info);
        ~GWindowToggle();
 
@@ -79,12 +91,9 @@ public:
        void update();
        void update_gui(int color);
 
-       static int* get_main_value(MWindow *mwindow, toggleinfo *info);
-
        int color;
-       MWindow *mwindow;
-       GWindowGUI *gui;
        toggleinfo *info;
+       GWindowGUI *gui;
        GWindowColorButton *color_button;
 };
 
@@ -106,13 +115,14 @@ public:
 class GWindowColorThread : public ColorPicker
 {
 public:
-       GWindowColorThread(GWindowColorButton *color_button);
+       GWindowColorThread(GWindowGUI *gui, GWindowColorButton *color_button);
        ~GWindowColorThread();
        void start(int color);
        int handle_new_color(int color, int alpha);
        void update_gui();
        void handle_done_event(int result);
 
+       GWindowGUI *gui;
        int color;
        GWindowColorButton *color_button;
        GWindowColorUpdate *color_update;