projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
waveform addition on videoscope of IRE 92.2 + 6.3 lines by Andrew
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
appearanceprefs.C
diff --git
a/cinelerra-5.1/cinelerra/appearanceprefs.C
b/cinelerra-5.1/cinelerra/appearanceprefs.C
index 435f70ad1bf6df6a54397e854a0f4ca2ee2ef3fd..1f87883551ba69b5096b71932046dd05437ec904 100644
(file)
--- a/
cinelerra-5.1/cinelerra/appearanceprefs.C
+++ b/
cinelerra-5.1/cinelerra/appearanceprefs.C
@@
-95,7
+95,7
@@
void AppearancePrefs::create_objects()
add_subwindow(plugin_icons = new ViewPluginIcons(x1, y, pwindow));
plugin_icons->create_objects();
y += plugin_icons->get_h() + ys10;
add_subwindow(plugin_icons = new ViewPluginIcons(x1, y, pwindow));
plugin_icons->create_objects();
y += plugin_icons->get_h() + ys10;
- add_subwindow(new BC_Title(x, y, _("L
ocal
e:")));
+ add_subwindow(new BC_Title(x, y, _("L
anguag
e:")));
LayoutLocale *layout_locale;
add_subwindow(layout_locale = new LayoutLocale(x1, y, pwindow));
layout_locale->create_objects();
LayoutLocale *layout_locale;
add_subwindow(layout_locale = new LayoutLocale(x1, y, pwindow));
layout_locale->create_objects();
@@
-184,9
+184,8
@@
void AppearancePrefs::create_objects()
y += ys35;
add_subwindow(title = new BC_Title(x, y, _("Composer BG Color:")));
int clr_color = pwindow->thread->edl->session->cwindow_clear_color;
y += ys35;
add_subwindow(title = new BC_Title(x, y, _("Composer BG Color:")));
int clr_color = pwindow->thread->edl->session->cwindow_clear_color;
- int clr_alpha = pwindow->thread->edl->session->cwindow_clear_alpha;
add_subwindow(cwdw_bg_color = new Composer_BG_Color(pwindow,
add_subwindow(cwdw_bg_color = new Composer_BG_Color(pwindow,
- x2, y, xS(80), yS(24), clr_color
, clr_alpha
));
+ x2, y, xS(80), yS(24), clr_color));
draw_3d_border(x2-2,y-2, xS(80)+4,xS(24)+4, 1);
cwdw_bg_color->create_objects();
x2 += cwdw_bg_color->get_w();
draw_3d_border(x2-2,y-2, xS(80)+4,xS(24)+4, 1);
cwdw_bg_color->create_objects();
x2 += cwdw_bg_color->get_w();
@@
-206,7
+205,7
@@
void AppearancePrefs::create_objects()
if( y2 < y ) y2 = y;
add_subwindow(new BC_Bar(x0, y2, get_w()-x0 - xs30));
if( y2 < y ) y2 = y;
add_subwindow(new BC_Bar(x0, y2, get_w()-x0 - xs30));
- y += ys
1
5;
+ y += ys
3
5;
x = x0; y1 = y;
add_subwindow(title = new BC_Title(x, y, _("Warnings:"), LARGEFONT,
x = x0; y1 = y;
add_subwindow(title = new BC_Title(x, y, _("Warnings:"), LARGEFONT,
@@
-932,8
+931,8
@@
int RectifyAudioToggle::handle_event()
}
Composer_BG_Color::Composer_BG_Color(PreferencesWindow *pwindow,
}
Composer_BG_Color::Composer_BG_Color(PreferencesWindow *pwindow,
- int x, int y, int w, int h, int color
, int alpha
)
- : ColorBoxButton(_("Composer BG color"), x, y, w, h, color,
alpha
, 1)
+ int x, int y, int w, int h, int color)
+ : ColorBoxButton(_("Composer BG color"), x, y, w, h, color,
-1
, 1)
{
this->pwindow = pwindow;
}
{
this->pwindow = pwindow;
}
@@
-955,7
+954,6
@@
void Composer_BG_Color::handle_done_event(int result)
int Composer_BG_Color::handle_new_color(int color, int alpha)
{
pwindow->thread->edl->session->cwindow_clear_color = color;
int Composer_BG_Color::handle_new_color(int color, int alpha)
{
pwindow->thread->edl->session->cwindow_clear_color = color;
- pwindow->thread->edl->session->cwindow_clear_alpha = alpha;
return 1;
}
return 1;
}