X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Flinearblur%2Flinearblur.C;h=428b6083507ea33f244a6877724739888d54fadc;hb=255d67d0fcabfbcd208f2587a9a75697a15d6349;hp=d5d326f0cc028cc162d04336ca4e111a2073ace9;hpb=c905fabd0678fcc8ab9e32e4443ad8709adafefd;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/linearblur/linearblur.C b/cinelerra-5.1/plugins/linearblur/linearblur.C
index d5d326f0..428b6083 100644
--- a/cinelerra-5.1/plugins/linearblur/linearblur.C
+++ b/cinelerra-5.1/plugins/linearblur/linearblur.C
@@ -33,6 +33,7 @@
 #include "language.h"
 #include "loadbalance.h"
 #include "pluginvclient.h"
+#include "theme.h"
 #include "vframe.h"
 
 
@@ -134,10 +135,10 @@ void LinearBlurConfig::interpolate(LinearBlurConfig &prev,
 
 LinearBlurWindow::LinearBlurWindow(LinearBlurMain *plugin)
  : PluginClientWindow(plugin,
-	280,
-	320,
-	280,
-	320,
+	xS(280),
+	yS(320),
+	xS(280),
+	yS(320),
 	0)
 {
 	this->plugin = plugin;
@@ -149,40 +150,42 @@ LinearBlurWindow::~LinearBlurWindow()
 
 void LinearBlurWindow::create_objects()
 {
-	int x = 10, y = 10;
-	int x1 = 0; int clrBtn_w = 50;
-	int defaultBtn_w = 100;
+	int xs10 = xS(10), xs50 = xS(50), xs100 = xS(100);
+	int ys10 = yS(10), ys20 = yS(20), ys30 = yS(30), ys40 = yS(40);
+	int x = xs10, y = ys10;
+	int x1 = 0; int clrBtn_w = xs50;
+	int defaultBtn_w = xs100;
 
 	add_subwindow(new BC_Title(x, y, _("Length:")));
-	y += 20;
+	y += ys20;
 	add_subwindow(radius = new LinearBlurSize(plugin, x, y, &plugin->config.radius, 0, 100));
-	x1 = x + radius->get_w() + 10;
+	x1 = x + radius->get_w() + xs10;
 	add_subwindow(radiusClr = new LinearBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_RADIUS));
 
-	y += 30;
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("Angle:")));
-	y += 20;
+	y += ys20;
 	add_subwindow(angle = new LinearBlurSize(plugin, x, y, &plugin->config.angle, -180, 180));
 	add_subwindow(angleClr = new LinearBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_ANGLE));
 
-	y += 30;
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("Steps:")));
-	y += 20;
+	y += ys20;
 	add_subwindow(steps = new LinearBlurSize(plugin, x, y, &plugin->config.steps, 1, 200));
 	add_subwindow(stepsClr = new LinearBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_STEPS));
 
-	y += 30;
+	y += ys30;
 	add_subwindow(r = new LinearBlurToggle(plugin, x, y, &plugin->config.r, _("Red")));
-	y += 30;
+	y += ys30;
 	add_subwindow(g = new LinearBlurToggle(plugin, x, y, &plugin->config.g, _("Green")));
-	y += 30;
+	y += ys30;
 	add_subwindow(b = new LinearBlurToggle(plugin, x, y, &plugin->config.b, _("Blue")));
-	y += 30;
+	y += ys30;
 	add_subwindow(a = new LinearBlurToggle(plugin, x, y, &plugin->config.a, _("Alpha")));
-	y += 40;
+	y += ys40;
 	add_subwindow(reset = new LinearBlurReset(plugin, this, x, y));
 	add_subwindow(default_settings = new LinearBlurDefaultSettings(plugin, this,
-		(280 - 10 - defaultBtn_w), y, defaultBtn_w));
+		(xS(280) - xs10 - defaultBtn_w), y, defaultBtn_w));
 
 	show_window();
 	flush();
@@ -252,7 +255,7 @@ LinearBlurSize::LinearBlurSize(LinearBlurMain *plugin,
 	int *output,
 	int min,
 	int max)
- : BC_ISlider(x, y, 0, 200, 200, min, max, *output)
+ : BC_ISlider(x, y, 0, xS(200), yS(200), min, max, *output)
 {
 	this->plugin = plugin;
 	this->output = output;
@@ -302,7 +305,7 @@ int LinearBlurDefaultSettings::handle_event()
 
 
 LinearBlurSliderClr::LinearBlurSliderClr(LinearBlurMain *plugin, LinearBlurWindow *gui, int x, int y, int w, int clear)
- : BC_GenericButton(x, y, w, _("⌂"))
+ : BC_Button(x, y, w, plugin->get_theme()->get_image_set("reset_button"))
 {
 	this->plugin = plugin;
 	this->gui = gui;