From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 27 Oct 2017 01:27:52 +0000 (-0600)
Subject: drag win rework, new search, igor theme fixes, sams preset icon
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=22a5ea2ff7a04c02465dc9b2256f04c38433142e;p=goodguy%2Fhistory.git

drag win rework, new search, igor theme fixes, sams preset icon
---

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 8b3bd1a2..f7d690ac 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -25,10 +25,11 @@
 #include "assets.h"
 #include "awindowgui.h"
 #include "awindow.h"
+#include "bccmodels.h"
 #include "bcsignals.h"
 #include "bchash.h"
 #include "cache.h"
-#include "bccmodels.h"
+#include "clip.h"
 #include "clippopup.h"
 #include "cursors.h"
 #include "cwindowgui.h"
@@ -613,9 +614,13 @@ void AWindowGUI::create_objects()
 	mwindow->theme->get_awindow_sizes(this);
 	load_defaults(mwindow->defaults);
 
-	add_subwindow(asset_list = new AWindowAssets(mwindow, this,
-		mwindow->theme->alist_x, mwindow->theme->alist_y,
-		mwindow->theme->alist_w, mwindow->theme->alist_h));
+	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
+	search_text = new AWindowSearchText(mwindow, this, x1, y1);
+	search_text->create_objects();
+	int dy = search_text->get_h() + 10;
+	y1 += dy;  h1 -= dy;
+	add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
 	vicon_thread = new VIconThread(asset_list);
 	vicon_thread->start();
@@ -713,9 +718,12 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
-	asset_list->reposition_window(
-		mwindow->theme->alist_x, mwindow->theme->alist_y,
-		mwindow->theme->alist_w, mwindow->theme->alist_h);
+	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
+	search_text->reposition_window(x1, y1, w1);
+	int dy = search_text->get_h() + 10;
+	y1 += dy;  h1 -= dy;
+	asset_list->reposition_window(x1, y1, w1, h1);
 	divider->reposition_window(
 		mwindow->theme->adivider_x, mwindow->theme->adivider_y,
 		mwindow->theme->adivider_w, mwindow->theme->adivider_h);
@@ -1189,6 +1197,8 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 		if( folder < 0 ||
 		    (picon->indexable && picon->indexable->awindow_folder == folder) ||
 		    (picon->edl && picon->edl->local_session->awindow_folder == folder) ) {
+			const char *text = search_text->get_text();
+			if( text && text[0] && !strstr(picon->get_text(), text) ) continue;
 			BC_ListBoxItem *item2, *item1;
 			dst[0].append(item1 = picon);
 			if( picon->edl )
@@ -1198,8 +1208,8 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 				dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr));
 			else
 				dst[1].append(item2 = new BC_ListBoxItem(""));
-			item1->set_autoplace_text(1);
-			item2->set_autoplace_text(1);
+			item1->set_autoplace_text(1);  item1->set_autoplace_icon(1);
+			item2->set_autoplace_text(1);  item2->set_autoplace_icon(1);
 		}
 	}
 }
@@ -1760,16 +1770,63 @@ int AWindowAssets::focus_out_event()
 	return BC_ListBox::focus_out_event();
 }
 
+AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w)
+ : BC_TextBox(x, y, w, 1, "")
+{
+	this->search_text = search_text;
+}
 
+int AWindowSearchTextBox::handle_event()
+{
+	return search_text->handle_event();
+}
 
+AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	this->x = x;
+	this->y = y;
+}
 
+void AWindowSearchText::create_objects()
+{
+	int x1 = x, y1 = y, margin = 10;
+	gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:")));
+	x1 += text_title->get_w() + margin;
+	int w1 = gui->get_w() - x1 - 2*margin;
+	gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
+}
 
+int AWindowSearchText::handle_event()
+{
+	gui->async_update_assets();
+	return 1;
+}
 
+int AWindowSearchText::get_w()
+{
+	return text_box->get_w() + text_title->get_w() + 10;
+}
 
+int AWindowSearchText::get_h()
+{
+	return bmax(text_box->get_h(),text_title->get_h());
+}
 
+void AWindowSearchText::reposition_window(int x, int y, int w)
+{
+	int x1 = x, y1 = y, margin = 10;
+	text_title->reposition_window(x1, y1);
+	x1 += text_title->get_w() + margin;
+	int w1 = gui->get_w() - x1 - 2*margin;
+	text_box->reposition_window(x1, y1, w1);
+}
 
-
-
+const char *AWindowSearchText::get_text()
+{
+	return text_box->get_text();
+}
 
 AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->newbin_data)
diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index e8bd76f5..f7c90120 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -179,6 +179,7 @@ public:
 	AWindowAssets *asset_list;
 	AWindowFolders *folder_list;
 	AWindowDivider *divider;
+	AWindowSearchText *search_text;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -309,6 +310,34 @@ public:
 	AWindowGUI *gui;
 };
 
+class AWindowSearchTextBox : public BC_TextBox
+{
+public:
+	AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w);
+	int handle_event();
+
+	AWindowSearchText *search_text;
+};
+
+class AWindowSearchText
+{
+public:
+	AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y);
+
+	int handle_event();
+	void create_objects();
+
+	MWindow *mwindow;
+	AWindowGUI *gui;
+	int x, y;
+	BC_Title *text_title;
+	BC_TextBox *text_box;
+	int get_w();
+	int get_h();
+	void reposition_window(int x, int y, int w);
+	const char *get_text();
+};
+
 class AWindowNewFolder : public BC_Button
 {
 public:
diff --git a/cinelerra-5.1/cinelerra/awindowgui.inc b/cinelerra-5.1/cinelerra/awindowgui.inc
index e83b8de0..0fb16fbc 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.inc
+++ b/cinelerra-5.1/cinelerra/awindowgui.inc
@@ -30,6 +30,8 @@ class AWindowRemovePlugin;
 class AWindowGUI;
 class AWindowAssets;
 class AWindowDivider;
+class AWindowSearchTextBox;
+class AWindowSearchText;
 class AWindowFolders;
 class AWindowNewFolder;
 class AWindowDeleteFolder;
diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index 172eaf91..5c682797 100644
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -277,8 +277,6 @@ void PluginDialog::create_objects()
 		thread->data_type);
 
 // Construct listbox items
-	for(int i = 0; i < plugindb.total; i++)
-		standalone_data.append(new BC_ListBoxItem(_(plugindb.values[i]->title)));
 	for(int i = 0; i < plugin_locations.total; i++)
 	{
 		Track *track = mwindow->edl->tracks->number(plugin_locations.values[i]->module);
@@ -309,12 +307,15 @@ void PluginDialog::create_objects()
 	add_subwindow(standalone_title = new BC_Title(mwindow->theme->plugindialog_new_x,
 		mwindow->theme->plugindialog_new_y - 20,
 		_("Plugins:")));
+	int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
+	int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
+	add_subwindow(search_text = new PluginDialogSearchText(this, x1, y1, w1));
+	int dy = search_text->get_h() + 10;
+	y1 += dy;  h1 -= dy;
+	load_plugin_list(0);
+
 	add_subwindow(standalone_list = new PluginDialogNew(this,
-		&standalone_data,
-		mwindow->theme->plugindialog_new_x,
-		mwindow->theme->plugindialog_new_y,
-		mwindow->theme->plugindialog_new_w,
-		mwindow->theme->plugindialog_new_h));
+		&standalone_data, x1, y1, w1, h1));
 //
 // 	if(thread->plugin)
 // 		add_subwindow(standalone_change = new PluginDialogChangeNew(mwindow,
@@ -421,10 +422,13 @@ int PluginDialog::resize_event(int w, int h)
 
 	standalone_title->reposition_window(mwindow->theme->plugindialog_new_x,
 		mwindow->theme->plugindialog_new_y - 20);
-	standalone_list->reposition_window(mwindow->theme->plugindialog_new_x,
-		mwindow->theme->plugindialog_new_y,
-		mwindow->theme->plugindialog_new_w,
-		mwindow->theme->plugindialog_new_h);
+	int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
+	int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
+	search_text->reposition_window(x1, y1, w1);
+	int dy = search_text->get_h() + 10;
+	y1 += dy;  h1 -= dy;
+	standalone_list->reposition_window(x1, y1, w1, h1);
+
 // 	if(standalone_attach)
 // 		standalone_attach->reposition_window(mwindow->theme->plugindialog_newattach_x,
 // 			mwindow->theme->plugindialog_newattach_y);
@@ -432,10 +436,6 @@ int PluginDialog::resize_event(int w, int h)
 // 		standalone_change->reposition_window(mwindow->theme->plugindialog_newattach_x,
 // 			mwindow->theme->plugindialog_newattach_y);
 
-
-
-
-
 	shared_title->reposition_window(mwindow->theme->plugindialog_shared_x,
 		mwindow->theme->plugindialog_shared_y - 20);
 	shared_list->reposition_window(mwindow->theme->plugindialog_shared_x,
@@ -559,19 +559,12 @@ void PluginDialog::save_settings()
 
 PluginDialogNew::PluginDialogNew(PluginDialog *dialog,
 	ArrayList<BC_ListBoxItem*> *standalone_data,
-	int x,
-	int y,
-	int w,
-	int h)
- : BC_ListBox(x,
- 	y,
-	w,
-	h,
-	LISTBOX_TEXT,
-	standalone_data)
+	int x, int y, int w, int h)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT, standalone_data)
 {
 	this->dialog = dialog;
 }
+
 PluginDialogNew::~PluginDialogNew() { }
 int PluginDialogNew::handle_event()
 {
@@ -753,6 +746,32 @@ int PluginDialogModules::selection_changed()
 	return 1;
 }
 
+void PluginDialog::load_plugin_list(int redraw)
+{
+	standalone_data.remove_all_objects();
+	const char *text = search_text->get_text();
+
+	for( int i=0; i<plugindb.total; ++i ) {
+		const char *title = plugindb.values[i]->title;
+		if( text && text[0] && !strstr(title, text) ) continue;
+		standalone_data.append(new BC_ListBoxItem(title));
+	}
+
+	if( redraw )
+		standalone_list->draw_items(1);
+}
+
+PluginDialogSearchText::PluginDialogSearchText(PluginDialog *dialog, int x, int y, int w)
+ : BC_TextBox(x, y, w, 1, "")
+{
+	this->dialog = dialog;
+}
+
+int PluginDialogSearchText::handle_event()
+{
+	dialog->load_plugin_list(1);
+	return 1;
+}
 
 PluginDialogSingle::PluginDialogSingle(PluginDialog *dialog, int x, int y)
  : BC_CheckBox(x,
diff --git a/cinelerra-5.1/cinelerra/plugindialog.h b/cinelerra-5.1/cinelerra/plugindialog.h
index 31c1b584..05d52fe0 100644
--- a/cinelerra-5.1/cinelerra/plugindialog.h
+++ b/cinelerra-5.1/cinelerra/plugindialog.h
@@ -26,6 +26,7 @@ class PluginDialogTextBox;
 class PluginDialogDetach;
 class PluginDialogNew;
 class PluginDialogShared;
+class PluginDialogSearchText;
 class PluginDialogModules;
 class PluginDialogAttachNew;
 class PluginDialogChangeNew;
@@ -104,6 +105,7 @@ public:
 	int attach_module(int number);
 	void save_settings();
 	int resize_event(int w, int h);
+	void load_plugin_list(int redraw);
 
 	BC_Title *standalone_title;
 	PluginDialogNew *standalone_list;
@@ -112,7 +114,7 @@ public:
 	BC_Title *module_title;
 	PluginDialogModules *module_list;
 	PluginDialogSingle *single_standalone;
-
+	PluginDialogSearchText *search_text;
 
 	PluginDialogThru *thru;
 
@@ -236,6 +238,14 @@ public:
 	PluginDialog *dialog;
 };
 
+class PluginDialogSearchText : public BC_TextBox
+{
+public:
+	PluginDialogSearchText(PluginDialog *dialog, int x, int y, int w);
+	int handle_event();
+
+	PluginDialog *dialog;
+};
 
 /*
  * class PluginDialogAttachShared : public BC_GenericButton
diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 960598c3..fc36e851 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -4531,8 +4531,6 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 
 						int cx, cy;
 						get_abs_cursor(cx, cy);
-						cx -= mwindow->theme->get_image("clip_icon")->get_w() / 2,
-						cy -= mwindow->theme->get_image("clip_icon")->get_h() / 2;
 						gui->drag_popup = new BC_DragWindow(gui,
 							mwindow->theme->get_image("clip_icon"), cx, cy);
 
@@ -4645,8 +4643,6 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
 					}
 					int cx, cy;
 					get_abs_cursor(cx, cy);
-					cx -= frame->get_w() / 2;
-					cy -= frame->get_h() / 2;
 					gui->drag_popup = new BC_DragWindow(gui, frame, cx, cy);
 						break; }
 
@@ -4655,8 +4651,6 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
 					VFrame *frame = mwindow->theme->get_image("clip_icon");
 					int cx, cy;
 					get_abs_cursor(cx, cy);
-					cx -= frame->get_w() / 2;
-					cy -= frame->get_h() / 2;
 					gui->drag_popup = new BC_DragWindow(gui, frame, cx, cy);
 					break; }
 				}
diff --git a/cinelerra-5.1/guicast/bcdragwindow.C b/cinelerra-5.1/guicast/bcdragwindow.C
index 8d70fb8f..72e7c850 100644
--- a/cinelerra-5.1/guicast/bcdragwindow.C
+++ b/cinelerra-5.1/guicast/bcdragwindow.C
@@ -20,40 +20,39 @@
  */
 
 #include "bcdragwindow.h"
+#include "bcbitmap.h"
 #include "bcpixmap.h"
 
 #include "vframe.h"
 #include <unistd.h>
 
 BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window,
-	BC_Pixmap *pixmap, int icon_x, int icon_y)
- : BC_Popup(parent_window, icon_x, icon_y, pixmap->get_w(), pixmap->get_h(),
-	-1, 0, pixmap)
+	BC_Pixmap *pixmap, int center_x, int center_y)
+ : BC_Popup(parent_window,
+	center_x - pixmap->get_w() / 2, center_y - pixmap->get_h() / 2,
+	pixmap->get_w(), pixmap->get_h(), -1, 0,
+	prepare_pixmap(pixmap, parent_window))
 {
 	drag_pixmap = 0;
-	init_x = icon_x;
-	init_y = icon_y;
+	init_x = get_x();
+	init_y = get_y();
 	end_x = BC_INFINITY;
 	end_y = BC_INFINITY;
-	icon_offset_x = init_x - parent_window->get_abs_cursor_x(0);
-	icon_offset_y = init_y - parent_window->get_abs_cursor_y(0);
-//printf("BC_DragWindow::BC_DragWindow 1 %d %d\n", icon_offset_x, icon_offset_y);
 	do_animation = 1;
 }
 
 
 BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window,
-	VFrame *frame, int icon_x, int icon_y)
- : BC_Popup(parent_window, icon_x, icon_y, frame->get_w(), frame->get_h(),
-	-1, 0, prepare_frame(frame, parent_window))
+	VFrame *frame, int center_x, int center_y)
+ : BC_Popup(parent_window,
+	center_x - frame->get_w() / 2, center_y - frame->get_h() / 2,
+	frame->get_w(), frame->get_h(), -1, 0,
+	prepare_frame(frame, parent_window))
 {
-	init_x = icon_x;
-	init_y = icon_y;
+	init_x = get_x();
+	init_y = get_y();
 	end_x = BC_INFINITY;
 	end_y = BC_INFINITY;
-	icon_offset_x = init_x - parent_window->get_abs_cursor_x(0);
-	icon_offset_y = init_y - parent_window->get_abs_cursor_y(0);
-//printf("BC_DragWindow::BC_DragWindow 1 %d %d\n", icon_offset_x, icon_offset_y);
 	do_animation = 1;
 }
 
@@ -62,31 +61,13 @@ BC_DragWindow::~BC_DragWindow()
 	delete drag_pixmap;
 }
 
-int BC_DragWindow::get_init_x(BC_WindowBase *parent_window, int icon_x)
-{
-	int output_x, temp = 0;
-	Window tempwin;
-	XTranslateCoordinates(parent_window->top_level->display,
-		parent_window->win, parent_window->top_level->rootwin,
-		icon_x, temp, &output_x, &temp, &tempwin);
-	return output_x;
-}
-
-int BC_DragWindow::get_init_y(BC_WindowBase *parent_window, int icon_y)
-{
-	int output_y, temp = 0;
-	Window tempwin;
-	XTranslateCoordinates(parent_window->top_level->display,
-		parent_window->win, parent_window->top_level->rootwin,
-		temp, icon_y, &temp, &output_y, &tempwin);
-	return output_y;
-}
-
 int BC_DragWindow::cursor_motion_event()
 {
 	int cx, cy;
 	get_abs_cursor(cx, cy);
-	reposition_window(cx + icon_offset_x, cy + icon_offset_y, get_w(), get_h());
+	cx -= get_w() / 2;
+	cy -= get_h() / 2;
+	reposition_window(cx, cy, get_w(), get_h());
 	flush();
 	return 1;
 }
@@ -97,16 +78,6 @@ int BC_DragWindow::button_release_event()
 	return BC_WindowBase::button_release_event();
 }
 
-int BC_DragWindow::get_offset_x()
-{
-	return icon_offset_x;
-}
-
-int BC_DragWindow::get_offset_y()
-{
-	return icon_offset_y;
-}
-
 int BC_DragWindow::drag_failure_event()
 {
 	if(!do_animation) return 0;
@@ -134,15 +105,13 @@ void BC_DragWindow::set_animation(int value)
 
 BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_window)
 {
-	VFrame *temp_frame = 0;
+	VFrame *temp_frame = frame;
 	int tw = frame->get_w(), th = frame->get_h();
 
 	if( frame->get_color_model() != BC_RGBA8888 ) {
 		temp_frame = new VFrame(tw, th, BC_RGBA8888);
 		temp_frame->transfer_from(frame);
 	}
-	else
-		temp_frame = new VFrame(*frame);
 
 	int tx = tw/2, ty = th/2, tx1 = tx-1, ty1 = ty-1, tx2 = tx+2, ty2 = ty+2;
 	int bpp = BC_CModels::calculate_pixelsize(temp_frame->get_color_model());
@@ -155,8 +124,18 @@ BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_win
 	}
 	drag_pixmap = new BC_Pixmap(parent_window, temp_frame, PIXMAP_ALPHA);
 
-	delete temp_frame;
+	if( temp_frame != frame )
+		delete temp_frame;
 	return drag_pixmap;
 }
 
+BC_Pixmap *BC_DragWindow::prepare_pixmap(BC_Pixmap *pixmap, BC_WindowBase *parent_window)
+{
+	int pix_w = pixmap->get_w(), pix_h = pixmap->get_h();
+	BC_Bitmap bitmap(parent_window, pix_w, pix_h, BC_RGB888, 0);
+	Pixmap xpixmap = pixmap->get_pixmap();
+	VFrame frame(pix_w, pix_h, BC_RGB888);
+	bitmap.read_drawable(xpixmap, 0,0,&frame);
+	return prepare_frame(&frame, parent_window);
+}
 
diff --git a/cinelerra-5.1/guicast/bcdragwindow.h b/cinelerra-5.1/guicast/bcdragwindow.h
index 360b3e45..4312c8f0 100644
--- a/cinelerra-5.1/guicast/bcdragwindow.h
+++ b/cinelerra-5.1/guicast/bcdragwindow.h
@@ -28,25 +28,20 @@
 class BC_DragWindow : public BC_Popup
 {
 public:
-	BC_DragWindow(BC_WindowBase *parent_window, BC_Pixmap *pixmap, int icon_x, int icon_y);
-	BC_DragWindow(BC_WindowBase *parent_window, VFrame *frame, int icon_x, int icon_y);
+	BC_DragWindow(BC_WindowBase *parent_window, BC_Pixmap *pixmap, int center_x, int center_y);
+	BC_DragWindow(BC_WindowBase *parent_window, VFrame *frame, int center_x, int center_y);
 	~BC_DragWindow();
 
 	int cursor_motion_event();
 	int button_release_event();
 	int drag_failure_event();
-	int get_offset_x();
-	int get_offset_y();
 // Disable failure animation
 	void set_animation(int value);
 	BC_Pixmap *prepare_frame(VFrame *frame, BC_WindowBase *parent_window);
+	BC_Pixmap *prepare_pixmap(BC_Pixmap *pixmap, BC_WindowBase *parent_window);
 private:
-	static int get_init_x(BC_WindowBase *parent_window, int icon_x);
-	static int get_init_y(BC_WindowBase *parent_window, int icon_y);
-
 	int init_x, init_y;
 	int end_x, end_y;
-	int icon_offset_x, icon_offset_y;
 	int do_animation;
 	BC_Pixmap *drag_pixmap;
 };
diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C
index e85cb599..88afc836 100644
--- a/cinelerra-5.1/guicast/bclistbox.C
+++ b/cinelerra-5.1/guicast/bclistbox.C
@@ -3126,22 +3126,15 @@ int BC_ListBox::drag_start_event()
 				int cx, cy;
 				get_abs_cursor(cx, cy);
 				if( item_return->icon_vframe ) {
-					cx -= item_return->icon_vframe->get_w() / 2,
-					cy -= item_return->icon_vframe->get_h() / 2;
 					drag_popup = new BC_DragWindow(this,
 						item_return->icon_vframe, cx, cy);
 				}
 				else
-// this probably works not!
 				if( item_return->icon ) {
-					cx -= item_return->icon->get_w() / 2,
-					cy -= item_return->icon->get_h() / 2;
 					drag_popup = new BC_DragWindow(this,
 						item_return->icon, cx, cy);
 				}
 				else {
-					cx -= drag_icon_vframe->get_w() / 2,
-					cy -= drag_icon_vframe->get_h() / 2;
 					drag_popup = new BC_DragWindow(this,
 						drag_icon_vframe, cx, cy);
 				}
@@ -3229,9 +3222,9 @@ int BC_ListBox::drag_stop_event()
 			if( display_format == LISTBOX_ICONS ) {
 				reposition_item(data,
 					selection_number,
-					top_level->cursor_x + drag_popup->get_offset_x() -
+					top_level->cursor_x - drag_popup->get_w() / 2 -
 						LISTBOX_MARGIN - 2 + xposition,
-					top_level->cursor_y + drag_popup->get_offset_y() -
+					top_level->cursor_y - drag_popup->get_h() / 2 -
 						LISTBOX_MARGIN - 2 + yposition);
 			}
 			else
diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index c79bc581..2b6e7e7d 100644
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -6,10 +6,20 @@ For usage help, refer to the following:
   https://cinelerra-cv.org/five/Features5.pdf
   http://beccatoria.dreamwidth.org/144288.html#cutid2
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
-.
 Cinfinity icons selected in Preferences (Creative Common
   By https://creativecommons.org/licenses/by/3.0/)
 .
+October 2017 New Features of note:
+  HV7 mods merged in to include X11 Direct playback for
+   large format files and Presets for plugins with edit.
+  Multiple windows available now for multiple assets.
+  Many more new icons for ffmpeg plugins + others.
+  Alternative shortcut keys for computers without numpad.
+  Snap/Cut editing and snap while dragging stickiness.
+  Snapshot capability for single frame png, jpg, or tiff.
+  Preference for Set Input Focus when window entered.
+  Upgraded Russian translation provided by Igor.
+  Search box in the Resources window to narrow choices.
 September 2017 New Features of note:
   Proxy Editing added to Settings pulldown.
   OpenCV optional compile with 4 plugins now available.
diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index a037c855..31d29f89 100644
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -525,10 +525,10 @@ void BlondTheme::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -698,7 +698,7 @@ void BlondTheme::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
diff --git a/cinelerra-5.1/plugins/theme_blond/data/histogram.png b/cinelerra-5.1/plugins/theme_blond/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_blond/data/histogram.png
rename to cinelerra-5.1/plugins/theme_blond/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blond/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png
index 98290509..e8e24ffd 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg
new file mode 100644
index 00000000..cff43cd8
--- /dev/null
+++ b/cinelerra-5.1/plugins/theme_blond/data/setformat_bg.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/5.1/img_for_5.1(1004)/BLOND/setformat_bg.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#ded9b3"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#cecea2;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#c8c696;fill-opacity:1;stroke:#ded9b3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#ded9b3;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/histogram.png b/cinelerra-5.1/plugins/theme_blond_cv/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_blond_cv/data/histogram.png
rename to cinelerra-5.1/plugins/theme_blond_cv/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
index a821e92b..33a3fb87 100644
--- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C
+++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
@@ -525,10 +525,10 @@ void BlueDotTheme::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -698,7 +698,7 @@ void BlueDotTheme::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
diff --git a/cinelerra-5.1/plugins/theme_blue/data/histogram.png b/cinelerra-5.1/plugins/theme_blue/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_blue/data/histogram.png
rename to cinelerra-5.1/plugins/theme_blue/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blue/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png
index a97aa62d..92328937 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg
new file mode 100644
index 00000000..e925e87b
--- /dev/null
+++ b/cinelerra-5.1/plugins/theme_blue/data/setformat_bg.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#092340"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.77227792"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="fill:#1a1447;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#939ed4;fill-opacity:1;stroke:#092340;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#092340;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 0e83545b..1bfb1666 100644
--- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@ -704,7 +704,7 @@ void BrightTheme::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
 	new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial");
diff --git a/cinelerra-5.1/plugins/theme_bright/data/histogram.png b/cinelerra-5.1/plugins/theme_bright/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_bright/data/histogram.png
rename to cinelerra-5.1/plugins/theme_bright/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_bright/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/histogram.png b/cinelerra-5.1/plugins/theme_hulk/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_hulk/data/histogram.png
rename to cinelerra-5.1/plugins/theme_hulk/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_hulk/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png
index 33c8958d..cb1ba1b9 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg
new file mode 100644
index 00000000..39551639
--- /dev/null
+++ b/cinelerra-5.1/plugins/theme_hulk/data/setformat_bg.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/5.1/img_for_5.1(1004)/HULK/setformat_bg.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#560070"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.38613896"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#75b697;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#82d4a9;fill-opacity:1;stroke:#560070;stroke-width:1.00010681;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#560070;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index bb33e96f..518a2ccc 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -526,10 +526,10 @@ void HULKTHEME::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -699,7 +699,7 @@ void HULKTHEME::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/histogram.png b/cinelerra-5.1/plugins/theme_pinklady/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_pinklady/data/histogram.png
rename to cinelerra-5.1/plugins/theme_pinklady/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_pinklady/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png
index bb7be124..c4c72bd3 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg
new file mode 100644
index 00000000..67b5c107
--- /dev/null
+++ b/cinelerra-5.1/plugins/theme_pinklady/data/setformat_bg.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#70002d"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.38613896"
+     inkscape:cx="454.5"
+     inkscape:cy="261"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="fill:#ffb1d0;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#d46a95;fill-opacity:1;stroke:#70002d;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#70002d;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 87dfc476..321ec319 100644
--- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@ -511,10 +511,10 @@ void PINKLADY::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -684,7 +684,7 @@ void PINKLADY::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
diff --git a/cinelerra-5.1/plugins/theme_suv/data/histogram.png b/cinelerra-5.1/plugins/theme_suv/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_suv/data/histogram.png
rename to cinelerra-5.1/plugins/theme_suv/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_suv/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C
index 87eb46ce..e294c888 100644
--- a/cinelerra-5.1/plugins/theme_suv/suv.C
+++ b/cinelerra-5.1/plugins/theme_suv/suv.C
@@ -686,7 +686,7 @@ void SUV::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/histogram.png b/cinelerra-5.1/plugins/theme_unflat/data/histogram_img.png
similarity index 100%
rename from cinelerra-5.1/plugins/theme_unflat/data/histogram.png
rename to cinelerra-5.1/plugins/theme_unflat/data/histogram_img.png
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png
index a9777b50..88d80576 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit0.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png
index cb696176..20e200a2 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit1.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png
index c07d3046..3496ac75 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png and b/cinelerra-5.1/plugins/theme_unflat/data/preset_edit2.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png
index cc59e995..f9e80268 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png and b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg
new file mode 100644
index 00000000..5a26490c
--- /dev/null
+++ b/cinelerra-5.1/plugins/theme_unflat/data/setformat_bg.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   width="630"
+   height="560"
+   sodipodi:docname="setformat_bg.svg"
+   inkscape:export-filename="/home/dell/Downloads/CNR/ADDITIONS/them/setformat_bgUNF630.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       id="linearGradient3709">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3711" />
+      <stop
+         style="stop-color:#9e9e9e;stop-opacity:1;"
+         offset="1"
+         id="stop3713" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective10-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3715"
+       x1="447.5"
+       y1="530"
+       x2="448.77637"
+       y2="81.708862"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99902889,0,0,1.002011,0.28960303,-1.0330366)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3709"
+       id="linearGradient3731"
+       x1="122.52665"
+       y1="173.40161"
+       x2="122.44225"
+       y2="18.06407"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.77227792"
+     inkscape:cx="511.00945"
+     inkscape:cy="249.87888"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:showpageshadow="false" />
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     id="rect3604"
+     width="630"
+     height="560"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:0.81815666;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 0.40907832,10.409079 239.18184168,0 0,59.181843 -239.18184168,0 0,-59.181843 z"
+     id="rect2818"
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:0.99802053;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 10.49901,82.49901 0,32.85659 0,400.14539 279.00198,0 0,-419.049 -170.15328,0 0,-1.09639 C 110.86273,84.082402 108.08141,82.49901 94.10451,82.49901 l -83.6055,0 z"
+     id="rect2820"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2933"
+     d="m 309.50005,82.500049 0,31.055831 0,401.94407 310.00095,0 0,-418.8395 -202.99089,0 0,-1.10457 C 405.8772,82.642261 405.22853,82.500049 391.23263,82.500049 z"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:#666666;stroke-width:1.00010681;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#666666;stroke-width:2.10565186;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 270.94717,367.5 c 0,67.07342 -54.37376,121.44717 -121.44717,121.44717 -67.073423,0 -121.447174,-54.37375 -121.447174,-121.44717 0,-67.07342 54.373751,-121.44717 121.447174,-121.44717 67.07341,0 121.44717,54.37375 121.44717,121.44717 z"
+     id="path3707"
+     sodipodi:nodetypes="csssc"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 4374f19b..26859167 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -520,10 +520,10 @@ void UNFLATTHEME::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -693,7 +693,7 @@ void UNFLATTHEME::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");