X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcpanel.C;h=5f8dd4d7c048ba179266cc81b2f30bc950219284;hb=HEAD;hp=fa440711d9ee41effe6f4a8f57a12110b8c4bf41;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cpanel.C b/cinelerra-5.1/cinelerra/cpanel.C
index fa440711..1f82e046 100644
--- a/cinelerra-5.1/cinelerra/cpanel.C
+++ b/cinelerra-5.1/cinelerra/cpanel.C
@@ -132,6 +132,7 @@ void CPanel::set_operation(int value)
 	    operation[CWINDOW_CAMERA]->get_value() ||
 	    operation[CWINDOW_PROJECTOR]->get_value() ) {
 		cpanel_zoom->set_shown(1);
+		subwindow->update_canvas(0);
 	}
 	else
 		cpanel_zoom->set_shown(0);
@@ -150,6 +151,8 @@ CPanelProtect::CPanelProtect(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Protect video from changes (F1)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelProtect::~CPanelProtect()
 {
@@ -174,6 +177,8 @@ CPanelMask::CPanelMask(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Edit mask (F3)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Masks");
 }
 CPanelMask::~CPanelMask()
 {
@@ -196,6 +201,8 @@ CPanelRuler::CPanelRuler(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Ruler (F4)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelRuler::~CPanelRuler()
 {
@@ -218,6 +225,8 @@ CPanelMagnify::CPanelMagnify(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Zoom view (F2)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelMagnify::~CPanelMagnify()
 {
@@ -238,6 +247,8 @@ CPanelCamera::CPanelCamera(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Adjust camera automation (F5)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Camera and Projector");
 }
 CPanelCamera::~CPanelCamera()
 {
@@ -258,6 +269,8 @@ CPanelProj::CPanelProj(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Adjust projector automation (F6)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Camera and Projector");
 }
 CPanelProj::~CPanelProj()
 {
@@ -278,6 +291,8 @@ CPanelCrop::CPanelCrop(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Crop a layer or output (F7)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Cropping");
 }
 
 CPanelCrop::~CPanelCrop()
@@ -302,6 +317,8 @@ CPanelEyedrop::CPanelEyedrop(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Get color (F8)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 
 CPanelEyedrop::~CPanelEyedrop()
@@ -326,6 +343,8 @@ CPanelToolWindow::CPanelToolWindow(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Show tool info (F9)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 
 CPanelToolWindow::~CPanelToolWindow()
@@ -357,6 +376,8 @@ CPanelTitleSafe::CPanelTitleSafe(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Show safe regions (F10)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelTitleSafe::~CPanelTitleSafe()
 {
@@ -387,7 +408,8 @@ int CPanelZoom::handle_event()
 	double zoom = pow(10.,value);
 	switch( mwindow->edl->session->cwindow_operation ) {
 	case CWINDOW_ZOOM:
-		gui->subwindow->zoom_canvas(zoom, 1);
+		gui->subwindow->canvas->set_zoom(mwindow->edl, zoom);
+		gui->subwindow->update_canvas();
 		break;
 	case CWINDOW_CAMERA:
 		aidx = AUTOMATION_CAMERA_Z;