projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andrea supplied DPX and Cineform render formats
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
radialblur
/
radialblur.C
diff --git
a/cinelerra-5.1/plugins/radialblur/radialblur.C
b/cinelerra-5.1/plugins/radialblur/radialblur.C
index 5137a6f2572a1d882742e2deea7368a360730c74..7524a9fd1a027834b923c78670e957f5a857a180 100644
(file)
--- a/
cinelerra-5.1/plugins/radialblur/radialblur.C
+++ b/
cinelerra-5.1/plugins/radialblur/radialblur.C
@@
-38,8
+38,8
@@
void RadialBlurConfig::reset(int clear)
{
switch(clear) {
case RESET_ALL :
{
switch(clear) {
case RESET_ALL :
- x =
50
;
- y =
50
;
+ x =
xS(50)
;
+ y =
yS(50)
;
angle = 0;
steps = 1;
r = 1;
angle = 0;
steps = 1;
r = 1;
@@
-47,9
+47,9
@@
void RadialBlurConfig::reset(int clear)
b = 1;
a = 1;
break;
b = 1;
a = 1;
break;
- case RESET_XSLIDER : x =
50
;
+ case RESET_XSLIDER : x =
xS(50)
;
break;
break;
- case RESET_YSLIDER : y =
50
;
+ case RESET_YSLIDER : y =
yS(50)
;
break;
case RESET_ANGLE : angle = 0;
break;
break;
case RESET_ANGLE : angle = 0;
break;
@@
-57,8
+57,8
@@
void RadialBlurConfig::reset(int clear)
break;
case RESET_DEFAULT_SETTINGS :
default:
break;
case RESET_DEFAULT_SETTINGS :
default:
- x =
50
;
- y =
50
;
+ x =
xS(50)
;
+ y =
yS(50)
;
angle = 33;
steps = 10;
r = 1;
angle = 33;
steps = 10;
r = 1;
@@
-126,10
+126,10
@@
void RadialBlurConfig::interpolate(RadialBlurConfig &prev,
RadialBlurWindow::RadialBlurWindow(RadialBlurMain *plugin)
: PluginClientWindow(plugin,
RadialBlurWindow::RadialBlurWindow(RadialBlurMain *plugin)
: PluginClientWindow(plugin,
-
280
,
-
370
,
-
280
,
-
370
,
+
xS(250)
,
+
yS(380)
,
+
xS(250)
,
+
yS(380)
,
0)
{
this->plugin = plugin;
0)
{
this->plugin = plugin;
@@
-141,46
+141,48
@@
RadialBlurWindow::~RadialBlurWindow()
void RadialBlurWindow::create_objects()
{
void RadialBlurWindow::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(45);
+ int x = xs10, y = ys10;
+ int x1 = 0; int clrBtn_w = xs50;
+ int defaultBtn_w = xs100;
add_subwindow(new BC_Title(x, y, _("X:")));
add_subwindow(new BC_Title(x, y, _("X:")));
- y += 20;
+ y +=
ys
20;
add_subwindow(this->x = new RadialBlurSize(plugin, x, y, &plugin->config.x, 0, 100));
add_subwindow(this->x = new RadialBlurSize(plugin, x, y, &plugin->config.x, 0, 100));
- x1 = x + this->x->get_w() + 10;
+ x1 = x + this->x->get_w() +
xs
10;
add_subwindow(xClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_XSLIDER));
add_subwindow(xClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_XSLIDER));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Y:")));
add_subwindow(new BC_Title(x, y, _("Y:")));
- y += 20;
+ y +=
ys
20;
add_subwindow(this->y = new RadialBlurSize(plugin, x, y, &plugin->config.y, 0, 100));
add_subwindow(yClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_YSLIDER));
add_subwindow(this->y = new RadialBlurSize(plugin, x, y, &plugin->config.y, 0, 100));
add_subwindow(yClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_YSLIDER));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Angle:")));
add_subwindow(new BC_Title(x, y, _("Angle:")));
- y += 20;
+ y +=
ys
20;
add_subwindow(angle = new RadialBlurSize(plugin, x, y, &plugin->config.angle, 0, 360));
add_subwindow(angleClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_ANGLE));
add_subwindow(angle = new RadialBlurSize(plugin, x, y, &plugin->config.angle, 0, 360));
add_subwindow(angleClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_ANGLE));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Steps:")));
add_subwindow(new BC_Title(x, y, _("Steps:")));
- y += 20;
+ y +=
ys
20;
add_subwindow(steps = new RadialBlurSize(plugin, x, y, &plugin->config.steps, 1, 100));
add_subwindow(stepsClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_STEPS));
add_subwindow(steps = new RadialBlurSize(plugin, x, y, &plugin->config.steps, 1, 100));
add_subwindow(stepsClr = new RadialBlurSliderClr(plugin, this, x1, y, clrBtn_w, RESET_STEPS));
- y += 30;
+ y +=
ys
30;
add_subwindow(r = new RadialBlurToggle(plugin, x, y, &plugin->config.r, _("Red")));
add_subwindow(r = new RadialBlurToggle(plugin, x, y, &plugin->config.r, _("Red")));
- y += 30;
+ y +=
ys
30;
add_subwindow(g = new RadialBlurToggle(plugin, x, y, &plugin->config.g, _("Green")));
add_subwindow(g = new RadialBlurToggle(plugin, x, y, &plugin->config.g, _("Green")));
- y += 30;
+ y +=
ys
30;
add_subwindow(b = new RadialBlurToggle(plugin, x, y, &plugin->config.b, _("Blue")));
add_subwindow(b = new RadialBlurToggle(plugin, x, y, &plugin->config.b, _("Blue")));
- y += 30;
+ y +=
ys
30;
add_subwindow(a = new RadialBlurToggle(plugin, x, y, &plugin->config.a, _("Alpha")));
add_subwindow(a = new RadialBlurToggle(plugin, x, y, &plugin->config.a, _("Alpha")));
- y += 40;
+ y +=
ys
40;
add_subwindow(reset = new RadialBlurReset(plugin, this, x, y));
add_subwindow(default_settings = new RadialBlurDefaultSettings(plugin, this,
add_subwindow(reset = new RadialBlurReset(plugin, this, x, y));
add_subwindow(default_settings = new RadialBlurDefaultSettings(plugin, this,
- (
280 - 10
- defaultBtn_w), y, defaultBtn_w));
+ (
xS(250) - xS(10)
- defaultBtn_w), y, defaultBtn_w));
show_window();
flush();
show_window();
flush();
@@
-251,7
+253,7
@@
RadialBlurSize::RadialBlurSize(RadialBlurMain *plugin,
int *output,
int min,
int max)
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;
{
this->plugin = plugin;
this->output = output;
@@
-306,7
+308,7
@@
int RadialBlurDefaultSettings::handle_event()
RadialBlurSliderClr::RadialBlurSliderClr(RadialBlurMain *plugin, RadialBlurWindow *gui, int x, int y, int w, int clear)
RadialBlurSliderClr::RadialBlurSliderClr(RadialBlurMain *plugin, RadialBlurWindow *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;
{
this->plugin = plugin;
this->gui = gui;