X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=5fb48ad633a3c5c278a90d4b292cbdec17d6eb8b;hb=b75f0c6910f5f1e1094f17874cd404e3f0faee8c;hp=27269e231cfc43bb2c624c0e008a6ebbdf8fd5fa;hpb=3ac8199743f244669cc87ceef9c3cd23710552f3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 27269e23..5fb48ad6 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -85,6 +85,7 @@ Preferences::Preferences()
 	bd_warn_root = 1;
 	popupmenu_btnup = 1;
 	textbox_focus_policy = 0;
+	forward_render_displacement = 0;
 	dvd_yuv420p_interlace = 0;
 
 // Default brender asset
@@ -199,6 +200,7 @@ void Preferences::copy_from(Preferences *that)
 	bd_warn_root = that->bd_warn_root;
 	popupmenu_btnup = that->popupmenu_btnup;
 	textbox_focus_policy = that->textbox_focus_policy;
+	forward_render_displacement = that->forward_render_displacement;
 	dvd_yuv420p_interlace = that->dvd_yuv420p_interlace;
 	renderfarm_nodes.remove_all_objects();
 	renderfarm_ports.remove_all();
@@ -314,9 +316,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	trap_sigsegv = defaults->get("TRAP_SIGSEGV", trap_sigsegv);
 	trap_sigintr = defaults->get("TRAP_SIGINTR", trap_sigintr);
 
-	strcpy(theme, DEFAULT_THEME);
-	defaults->get("THEME", theme);
+	strcpy(theme, _(DEFAULT_THEME));
 	strcpy(plugin_icons, DEFAULT_PICON);
+	defaults->get("THEME", theme);
 	defaults->get("PLUGIN_ICONS", plugin_icons);
 
 	for(int i = 0; i < MAXCHANNELS; i++)
@@ -352,6 +354,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root);
 	popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup);
 	textbox_focus_policy = defaults->get("TEXTBOX_FOCUS_POLICY", textbox_focus_policy);
+	forward_render_displacement = defaults->get("FORWARD_RENDER_DISPLACEMENT", forward_render_displacement);
 	dvd_yuv420p_interlace = defaults->get("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
 	use_brender = defaults->get("USE_BRENDER", use_brender);
 	brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
@@ -400,6 +403,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 		shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0));
 		shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 0));
 		shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0));
+		shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html", 0));
 		shbtns_total = 0;
 	}
 	for( int i=0; i<shbtns_total; ++i ) {
@@ -480,6 +484,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("BD_WARN_ROOT", bd_warn_root);
 	defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);
 	defaults->update("TEXTBOX_FOCUS_POLICY", textbox_focus_policy);
+	defaults->update("FORWARD_RENDER_DISPLACEMENT", forward_render_displacement);
 	defaults->update("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
 	brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
 	defaults->update("USE_BRENDER", use_brender);