X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=50dfc6cfde6664a34d02a4594eb0aff0bf68ef97;hb=5dd3a36e05dd2a50ed626bcd4e317d5f4ca9bf57;hp=b27342e0d15805923d85a7a47d4b428122ce243f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index b27342e0..50dfc6cf 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -66,7 +66,7 @@
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
- : BC_MenuItem(_("Preferences..."), _("Shift+P"), 'P')
+ : BC_MenuItem(_("Preferences..."), _("Shift-P"), 'P')
 {
 	this->mwindow = mwindow;
 
@@ -214,6 +214,8 @@ int PreferencesThread::apply_settings()
 
 	mwindow->reset_android_remote();
 	mwindow->gui->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
+	mwindow->gui->ffmpeg_toggle->set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
+		_("Try FFMpeg first") : _("Try FFMpeg last") );
 	mwindow->gui->mainshbtns->load(mwindow->preferences);
 	double tc_position = 
 		mwindow->edl->session->get_frame_offset() / mwindow->edl->session->frame_rate;
@@ -358,15 +360,7 @@ PreferencesWindow::PreferencesWindow(MWindow *mwindow,
 	int x,
 	int y)
  : BC_Window(_(PROGRAM_NAME ": Preferences"),
- 	x,
-	y,
- 	WIDTH,
-	HEIGHT,
-	(int)BC_INFINITY,
-	(int)BC_INFINITY,
-	0,
-	0,
-	1)
+ 	x,y, WIDTH,HEIGHT, WIDTH,HEIGHT, 1,0,1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;