X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=f875a14a30bac80becd05082c7d60a9fd5a31c2a;hb=83b70dd60863377cb281e6be5206304e10373e30;hp=a68d4d17759520bbc2e9f0eecdcfcf0b5c96d428;hpb=a718f58e6d8061f83bd0c0b10848ac415cd21fcd;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index a68d4d17..f875a14a 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -128,6 +128,8 @@ MWindowGUI::MWindowGUI(MWindow *mwindow)
 	cwindow_remote_handler = 0;
 	record_remote_handler = 0;
 	android_control = 0;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Program Window");
 }
 
 
@@ -1042,6 +1044,7 @@ void MWindowGUI::default_positions()
 	mwindow->cwindow->gui->unlock_window();
 	mwindow->awindow->gui->unlock_window();
 //printf("MWindowGUI::default_positions 2\n");
+	mwindow->tile_mixers();
 }
 
 
@@ -1089,20 +1092,23 @@ int MWindowGUI::keypress_event()
 
 	switch( get_keypress() ) {
 	case 'A':
-		if( !alt_down() && ctrl_down() ) {
+		if( !alt_down() ) {
+			if( !ctrl_down() || !shift_down() ) break;
 			mwindow->edl->tracks->clear_selected_edits();
 			draw_overlays(1);
 			result = 1;
-		}
-		break;
+			break;
+		} // fall thru
 	case 'a':
-		if( !ctrl_down() && alt_down() ) {
-			stop_transport("MWindowGUI::keypress_event 1");
-			mwindow->nearest_auto_keyframe(shift_down(),
-				!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
-			result = 1;
-		}
-		else if( ctrl_down() && alt_down() ) {
+		if( !alt_down() ) break;
+		stop_transport("MWindowGUI::keypress_event 1");
+		mwindow->nearest_auto_keyframe(shift_down(),
+			!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
+		result = 1;
+		break;
+
+	case '\'':
+		if( ctrl_down() && alt_down() ) {
 			mwindow->select_edits(1);
 			result = 1;
 		}
@@ -1309,6 +1315,9 @@ int MWindowGUI::keypress_event()
 	if(result)
 		cursor_motion_event();
 
+	if(!result)
+		result = context_help_check_and_show();
+
 	return result;
 }
 
@@ -2367,6 +2376,8 @@ FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 	this->mwindow = mwindow;
 	this->mbuttons = mbuttons;
 	set_tooltip(get_value() ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("FFmpeg Early Probe Explanation");
 }
 
 FFMpegToggle::~FFMpegToggle()
@@ -2391,6 +2402,8 @@ StackButton::StackButton(MWindow *mwindow, int x, int y)
 {
 	this->mwindow = mwindow;
 	set_tooltip(_("Close EDL"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("OpenEDL");
 }
 
 int StackButton::handle_event()
@@ -2421,6 +2434,8 @@ ProxyToggle::ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 	scaler_images = mwindow->edl->session->proxy_use_scaler;
 	set_tooltip(mwindow->edl->session->proxy_state!=PROXY_DISABLED ?
 		_("Disable proxy") : _("Enable proxy"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Proxy");
 }
 
 void ProxyToggle::show()
@@ -2474,6 +2489,6 @@ int ProxyToggle::keypress_event()
 			return handle_event();
 		}
 	}
-	return 0;
+	return context_help_check_and_show();
 }