X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fappearanceprefs.C;h=0bf2e4f5ea008ac4605eef52263ade677e7d9515;hb=ad2996ab94e6e12c9c14a5b9f14792f76111dff7;hp=01779b4f13bca8360faf040f0523f9779cec8c08;hpb=9d5997d77ab7736be577456d8fd3dda0ba522d39;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C
index 01779b4f..0bf2e4f5 100644
--- a/cinelerra-5.1/cinelerra/appearanceprefs.C
+++ b/cinelerra-5.1/cinelerra/appearanceprefs.C
@@ -33,12 +33,6 @@
 #include "theme.h"
 
 
-#define MOVE_ALL_EDITS_TITLE N_("Drag all following edits")
-#define MOVE_ONE_EDIT_TITLE N_("Drag only one edit")
-#define MOVE_NO_EDITS_TITLE N_("Drag source only")
-#define MOVE_EDITS_DISABLED_TITLE N_("No effect")
-
-
 AppearancePrefs::AppearancePrefs(MWindow *mwindow, PreferencesWindow *pwindow)
  : PreferencesDialog(mwindow, pwindow)
 {
@@ -139,6 +133,13 @@ void AppearancePrefs::create_objects()
 	add_subwindow(seconds = new TimeFormatSeconds(pwindow, this,
 		pwindow->thread->edl->session->time_format == TIME_SECONDS,
 		x, y));
+	x = x0;
+	y += 35;
+	add_subwindow(title = new BC_Title(x, y, _("Highlighting Inversion color:")));
+	x += title->get_w() + margin;
+	char hex_color[BCSTRLEN];
+	sprintf(hex_color, "%06x", preferences->highlight_inverse);
+        add_subwindow(new HighlightInverseColor(pwindow, x, y, hex_color));
 	y += 35;
 
 	UseTipWindow *tip_win = new UseTipWindow(pwindow, x1, y1);
@@ -156,6 +157,9 @@ void AppearancePrefs::create_objects()
 	PopupMenuBtnup *pop_win = new PopupMenuBtnup(pwindow, x1, y1);
 	add_subwindow(pop_win);
 	y1 += pop_win->get_h() + 5;
+	GrabFocusPolicy *grab_input_focus = new GrabFocusPolicy(pwindow, x1, y1);
+	add_subwindow(grab_input_focus);
+	y1 += grab_input_focus->get_h() + 5;
 	ActivateFocusPolicy *focus_activate = new ActivateFocusPolicy(pwindow, x1, y1);
 	add_subwindow(focus_activate);
 	y1 += focus_activate->get_h() + 5;
@@ -322,14 +326,15 @@ void ViewPluginIcons::create_objects()
 	add_item(new ViewPluginIconItem(this, DEFAULT_PICON));
 	FileSystem fs;
 	const char *plugin_path = File::get_plugin_path();
-	if( fs.update(plugin_path) ) return;
+	char picon_path[BCTEXTLEN];
+	snprintf(picon_path,sizeof(picon_path)-1,"%s/picon", plugin_path);
+	if( fs.update(picon_path) ) return;
 	for( int i=0; i<fs.dir_list.total; ++i ) {
 		char *fs_path = fs.dir_list[i]->path;
 		if( !fs.is_dir(fs_path) ) continue;
 		char *cp = strrchr(fs_path,'/');
 		cp = !cp ? fs_path : cp+1;
-		if( strncmp("picon_", cp, 6) ) continue;
-		if( !strcmp(cp += 6,DEFAULT_PICON) ) continue;
+		if( !strcmp(cp,DEFAULT_PICON) ) continue;
 		add_item(new ViewPluginIconItem(this, cp));
 	}
 }
@@ -439,6 +444,19 @@ int PopupMenuBtnup::handle_event()
 	return 1;
 }
 
+GrabFocusPolicy::GrabFocusPolicy(PreferencesWindow *pwindow, int x, int y)
+ : BC_CheckBox(x, y, (pwindow->thread->preferences->grab_input_focus) != 0,
+	_("Set Input Focus when window entered"))
+{
+	this->pwindow = pwindow;
+}
+
+int GrabFocusPolicy::handle_event()
+{
+	pwindow->thread->preferences->grab_input_focus = get_value();
+	return 1;
+}
+
 ActivateFocusPolicy::ActivateFocusPolicy(PreferencesWindow *pwindow, int x, int y)
  : BC_CheckBox(x, y, (pwindow->thread->preferences->textbox_focus_policy & CLICK_ACTIVATE) != 0,
 	_("Click to activate text focus"))
@@ -473,7 +491,7 @@ int DeactivateFocusPolicy::handle_event()
 
 ForwardRenderDisplacement::ForwardRenderDisplacement(PreferencesWindow *pwindow, int x, int y)
  : BC_CheckBox(x, y, pwindow->thread->preferences->forward_render_displacement,
-	_("Forward render enable displacement"))
+	_("Always show next frame"))
 {
 	this->pwindow = pwindow;
 }
@@ -484,3 +502,22 @@ int ForwardRenderDisplacement::handle_event()
 	return 1;
 }
 
+HighlightInverseColor::HighlightInverseColor(PreferencesWindow *pwindow, int x, int y, const char *hex)
+ : BC_TextBox(x, y, 80, 1, hex)
+{
+	this->pwindow = pwindow;
+}
+
+int HighlightInverseColor::handle_event()
+{
+	int inverse_color = strtoul(get_text(),0,16);
+	if( (inverse_color &= 0xffffff) == 0 ) {
+		inverse_color = 0xffffff;
+		char string[BCSTRLEN];
+		sprintf(string,"%06x", inverse_color);
+		update(string);
+	}
+	pwindow->thread->preferences->highlight_inverse = inverse_color;
+	return 1;
+}
+