X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=6f4e57c995481e371d6203756fe96dfc78473545;hp=d7dbf4d6785697bfb4438816ba8b98abbef34e4a;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index d7dbf4d6..6f4e57c9 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -59,6 +59,7 @@ Preferences::Preferences()
 	if( strlen(index_directory) )
 		fs.complete_path(index_directory);
 	cache_size = 0x10000000;
+	cache_transitions = 1;
 	index_size = 0x400000;
 	index_count = 500;
 	use_thumbnails = 1;
@@ -74,6 +75,7 @@ Preferences::Preferences()
 	vicon_size = 50;
 	vicon_color_mode = VICON_COLOR_MODE_LOW;
 	theme[0] = 0;
+	strcpy(locale, DEFAULT_LOCALE);
 	plugin_icons[0] = 0;
 	strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
 	use_renderfarm = 0;
@@ -91,13 +93,13 @@ Preferences::Preferences()
 	ffmpeg_marker_indexes = 1;
 	memset(&use_hw_dev, 0, sizeof(use_hw_dev));
 	warn_indexes = 1;
-	warn_version = 1;
-	warn_stack = 1;
+	unsafe_gui = 0;
+	ongoing_backups = 0;
 	warn_fileref = 1;
 	bd_warn_root = 1;
 	popupmenu_btnup = 1;
 	grab_input_focus = 1;
-	textbox_focus_policy = 0;
+	textbox_focus_policy = CLICK_ACTIVATE | CLICK_DEACTIVATE;
 	auto_rotate = 1;
 	forward_render_displacement = 0;
 	dvd_yuv420p_interlace = 0;
@@ -105,7 +107,7 @@ Preferences::Preferences()
 	yuv_color_space = BC_COLORS_BT601;
 	yuv_color_range = BC_COLORS_JPEG;
 	autocolor_assets = 0;
-	ctrl_toggle = 0;
+	ctrl_toggle = 1;
 	rectify_audio = 0;
 
 // Default brender asset
@@ -190,6 +192,7 @@ void Preferences::copy_from(Preferences *that)
 	vicon_size = that->vicon_size;
 	vicon_color_mode = that->vicon_color_mode;
 	strcpy(theme, that->theme);
+	strcpy(locale, that->locale);
 	strcpy(plugin_icons, that->plugin_icons);
 	strcpy(snapshot_path, that->snapshot_path);
 
@@ -205,6 +208,7 @@ void Preferences::copy_from(Preferences *that)
 	for( int i=0; i<that->file_probes.size(); ++i )
 		this->file_probes.append(new ProbePref(*that->file_probes[i]));
 	cache_size = that->cache_size;
+	cache_transitions = that->cache_transitions;
 	project_smp = that->project_smp;
 	force_uniprocessor = that->force_uniprocessor;
 	strcpy(lv2_path, that->lv2_path);
@@ -217,8 +221,8 @@ void Preferences::copy_from(Preferences *that)
 	ffmpeg_marker_indexes = that->ffmpeg_marker_indexes;
 	strcpy(use_hw_dev, &that->use_hw_dev[0]);
 	warn_indexes = that->warn_indexes;
-	warn_version = that->warn_version;
-	warn_stack = that->warn_stack;
+	unsafe_gui = that->unsafe_gui;
+	ongoing_backups = that->ongoing_backups;
 	warn_fileref = that->warn_fileref;
 	bd_warn_root = that->bd_warn_root;
 	popupmenu_btnup = that->popupmenu_btnup;
@@ -346,8 +350,10 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	vicon_size = defaults->get("VICON_SIZE",vicon_size);
 	vicon_color_mode = defaults->get("VICON_COLOR_MODE",vicon_color_mode);
 	strcpy(theme, _(DEFAULT_THEME));
+	strcpy(locale, DEFAULT_LOCALE);
 	strcpy(plugin_icons, DEFAULT_PICON);
 	defaults->get("THEME", theme);
+	defaults->get("LOCALE", locale);
 	defaults->get("PLUGIN_ICONS", plugin_icons);
 	strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
 	defaults->get("SNAPSHOT_PATH", snapshot_path);
@@ -367,8 +373,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	memset(&use_hw_dev, 0, sizeof(use_hw_dev));
 	defaults->get("USE_HW_DEV", use_hw_dev);
 	warn_indexes = defaults->get("WARN_INDEXES", warn_indexes);
-	warn_version = defaults->get("WARN_VERSION", warn_version);
-	warn_stack = defaults->get("WARN_STACK", warn_stack);
+	unsafe_gui = defaults->get("UNSAFE_GUI", unsafe_gui);
+	ongoing_backups = defaults->get("ONGOING_BACKUPS", ongoing_backups);
 	warn_fileref = defaults->get("WARN_FILEREF", warn_fileref);
 	bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root);
 	popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup);
@@ -386,6 +392,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	use_brender = defaults->get("USE_BRENDER", use_brender);
 	brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
 	cache_size = defaults->get("CACHE_SIZE", cache_size);
+	cache_transitions = defaults->get("CACHE_TRANSITIONS", cache_transitions);
 	local_rate = defaults->get("LOCAL_RATE", local_rate);
 	use_renderfarm = defaults->get("USE_RENDERFARM", use_renderfarm);
 	renderfarm_port = defaults->get("RENDERFARM_PORT", renderfarm_port);
@@ -426,6 +433,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	int shbtns_total = defaults->get("SHBTNS_TOTAL", -1);
 	if( shbtns_total < 0 ) {
 		shbtn_prefs.append(new ShBtnPref(_("Current Manual"), "$CIN_BROWSER https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf"));
+		shbtn_prefs.append(new ShBtnPref(_("HTML Current Manual"), "$CIN_BROWSER https://cinelerra-gg.org/download/CinelerraGG_Manual"));
 		shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html"));
 		shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html"));
 		shbtn_prefs.append(new ShBtnPref(_("RenderMux"), "$CIN_DAT/doc/RenderMux.sh"));
@@ -484,6 +492,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("ANDROID_PORT", android_port);
 
 	defaults->update("CACHE_SIZE", cache_size);
+	defaults->update("CACHE_TRANSITIONS", cache_transitions);
 	defaults->update("INDEX_DIRECTORY", index_directory);
 	defaults->update("INDEX_SIZE", index_size);
 	defaults->update("INDEX_COUNT", index_count);
@@ -500,6 +509,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("VICON_SIZE",vicon_size);
 	defaults->update("VICON_COLOR_MODE",vicon_color_mode);
 	defaults->update("THEME", theme);
+	defaults->update("LOCALE", locale);
 	defaults->update("PLUGIN_ICONS", plugin_icons);
 	defaults->update("SNAPSHOT_PATH", snapshot_path);
 
@@ -515,8 +525,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
 	defaults->update("USE_HW_DEV", use_hw_dev);
 	defaults->update("WARN_INDEXES", warn_indexes);
-	defaults->update("WARN_VERSION", warn_version);
-	defaults->update("WARN_STACK", warn_stack);
+	defaults->update("UNSAFE_GUI", unsafe_gui);
+	defaults->update("ONGOING_BACKUPS", ongoing_backups);
 	defaults->update("WARN_FILEREF", warn_fileref);
 	defaults->update("BD_WARN_ROOT", bd_warn_root);
 	defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);