X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=1f6bb04a72a04f7568e4836788d1fd09cb3d3667;hp=6a35151855fb6650e850b599cb7d336859d2b9b2;hb=0c086b3e7b552e0f6b06c8696d7682d9d4bd91db;hpb=debf38f78ae5ce154f54183b1638278bf8a24736

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 6a351518..1f6bb04a 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -69,6 +69,8 @@ Preferences::Preferences()
 	trap_sigsegv = 1;
 	trap_sigintr = 1;
 	awindow_picon_h = 50;
+	vicon_size = 50;
+	vicon_color_mode = VICON_COLOR_MODE_LOW;
 	theme[0] = 0;
 	plugin_icons[0] = 0;
 	strcpy(snapshot_path, "/tmp");
@@ -95,6 +97,8 @@ Preferences::Preferences()
 	highlight_inverse = 0xffffff;
 	yuv_color_space = BC_COLORS_BT601;
 	yuv_color_range = BC_COLORS_JPEG;
+	autocolor_assets = 0;
+	ctrl_toggle = 0;
 
 // Default brender asset
 	brender_asset = new Asset;
@@ -174,6 +178,8 @@ void Preferences::copy_from(Preferences *that)
 	keyframe_reticle = that->keyframe_reticle;
 	perpetual_session = that->perpetual_session;
 	awindow_picon_h = that->awindow_picon_h;
+	vicon_size = that->vicon_size;
+	vicon_color_mode = that->vicon_color_mode;
 	strcpy(theme, that->theme);
 	strcpy(plugin_icons, that->plugin_icons);
 	strcpy(snapshot_path, that->snapshot_path);
@@ -210,6 +216,8 @@ void Preferences::copy_from(Preferences *that)
 	highlight_inverse = that->highlight_inverse;
 	yuv_color_space = that->yuv_color_space;
 	yuv_color_range = that->yuv_color_range;
+	autocolor_assets = that->autocolor_assets;
+	ctrl_toggle = that->ctrl_toggle;
 	renderfarm_nodes.remove_all_objects();
 	renderfarm_ports.remove_all();
 	renderfarm_enabled.remove_all();
@@ -316,6 +324,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	trap_sigintr = defaults->get("TRAP_SIGINTR", trap_sigintr);
 
 	awindow_picon_h = defaults->get("AWINDOW_PICON_H", awindow_picon_h);
+	vicon_size = defaults->get("VICON_SIZE",vicon_size);
+	vicon_color_mode = defaults->get("VICON_COLOR_MODE",vicon_color_mode);
 	strcpy(theme, _(DEFAULT_THEME));
 	strcpy(plugin_icons, DEFAULT_PICON);
 	defaults->get("THEME", theme);
@@ -346,6 +356,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	highlight_inverse = defaults->get("HIGHLIGHT_INVERSE", highlight_inverse);
 	yuv_color_space = defaults->get("YUV_COLOR_SPACE", yuv_color_space);
 	yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range);
+	autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets);
+	ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle);
 	use_brender = defaults->get("USE_BRENDER", use_brender);
 	brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
 	cache_size = defaults->get("CACHE_SIZE", cache_size);
@@ -458,6 +470,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("TRAP_SIGSEGV", trap_sigsegv);
 	defaults->update("TRAP_SIGINTR", trap_sigintr);
 	defaults->update("AWINDOW_PICON_H", awindow_picon_h);
+	defaults->update("VICON_SIZE",vicon_size);
+	defaults->update("VICON_COLOR_MODE",vicon_color_mode);
 	defaults->update("THEME", theme);
 	defaults->update("PLUGIN_ICONS", plugin_icons);
 	defaults->update("SNAPSHOT_PATH", snapshot_path);
@@ -483,6 +497,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("HIGHLIGHT_INVERSE", highlight_inverse);
 	defaults->update("YUV_COLOR_SPACE", yuv_color_space);
 	defaults->update("YUV_COLOR_RANGE", yuv_color_range);
+	defaults->update("AUTOCOLOR_ASSETS", autocolor_assets);
+	defaults->update("CTRL_TOGGLE", ctrl_toggle);
 	brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
 	defaults->update("USE_BRENDER", use_brender);
 	defaults->update("BRENDER_FRAGMENT", brender_fragment);