X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=6e7ffc914d72f2a3bc33c9737cbc81f84a27dcd0;hp=5f9d40ea241dc280b8181a5a357ec0b2248fd937;hb=050b37188b98a61408badd0582e0605a77275201;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 5f9d40ea..6e7ffc91 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -68,6 +68,9 @@ Preferences::Preferences()
 	autostart_lv2ui = 0;
 	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");
@@ -94,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;
@@ -172,6 +177,9 @@ void Preferences::copy_from(Preferences *that)
 	use_thumbnails = that->use_thumbnails;
 	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);
@@ -208,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();
@@ -305,6 +315,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	defaults->get("INDEX_DIRECTORY", index_directory);
 	index_size = defaults->get("INDEX_SIZE", index_size);
 	index_count = defaults->get("INDEX_COUNT", index_count);
+	use_thumbnails = defaults->get("USE_THUMBNAILS", use_thumbnails);
 	keyframe_reticle = defaults->get("KEYFRAME_RETICLE", keyframe_reticle);
 	perpetual_session = defaults->get("PERPETUAL_SESSION", perpetual_session);
 	strcpy(lv2_path, DEFAULT_LV2_PATH);
@@ -313,6 +324,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	trap_sigsegv = defaults->get("TRAP_SIGSEGV", trap_sigsegv);
 	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);
@@ -343,6 +357,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);
@@ -385,7 +401,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	shbtn_prefs.remove_all_objects();
 	int shbtns_total = defaults->get("SHBTNS_TOTAL", -1);
 	if( shbtns_total < 0 ) {
-		shbtn_prefs.append(new ShBtnPref(_("Features5"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0));
+		shbtn_prefs.append(new ShBtnPref(_("Features"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0));
 		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));
@@ -454,6 +470,9 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("AUTOSTART_LV2UI", autostart_lv2ui);
 	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);
@@ -479,6 +498,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);