projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
theme.C
diff --git
a/cinelerra-5.1/cinelerra/theme.C
b/cinelerra-5.1/cinelerra/theme.C
index 7bbcceb65eeef15e17f237c8cfc9bae1cae06acc..96f8b80f9f95b2aaa89c472b2b6fbb2fb416f661 100644
(file)
--- a/
cinelerra-5.1/cinelerra/theme.C
+++ b/
cinelerra-5.1/cinelerra/theme.C
@@
-78,6
+78,7
@@
Theme::Theme()
BC_WindowBase::get_resources()->recursive_resizing = 0;
audio_color = BLACK;
fade_h = 22;
BC_WindowBase::get_resources()->recursive_resizing = 0;
audio_color = BLACK;
fade_h = 22;
+ inout_highlight_color = GREEN;
meter_h = 17;
mode_h = 30;
pan_h = 32;
meter_h = 17;
mode_h = 30;
pan_h = 32;
@@
-95,8
+96,8
@@
Theme::Theme()
loadmode_w = 350;
czoom_w = 80;
loadmode_w = 350;
czoom_w = 80;
-#include "data/about_png.h"
- about_bg = new VFramePng(about_png);
+#include "data/about_
bg_
png.h"
+ about_bg = new VFramePng(about_
bg_
png);
pane_color = BLACK;
drag_pane_color = WHITE;
pane_color = BLACK;
drag_pane_color = WHITE;
@@
-128,7
+129,8
@@
Theme::Theme()
edithandleout_data = 0;
extract_data = 0;
ffmpeg_toggle = 0;
edithandleout_data = 0;
extract_data = 0;
ffmpeg_toggle = 0;
- proxy_toggle = 0;
+ proxy_s_toggle = 0;
+ proxy_p_toggle = 0;
infoasset_data = 0;
in_point = 0;
insert_data = 0;
infoasset_data = 0;
in_point = 0;
insert_data = 0;
@@
-597,7
+599,7
@@
void Theme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
{
mbuttons_x = 0;
mbuttons_y = gui->menu_h() + 1;
{
mbuttons_x = 0;
mbuttons_y = gui->menu_h() + 1;
- mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_toggle[0]->get_w()+2);
+ mbuttons_w = w - (ffmpeg_toggle[0]->get_w()+2 + proxy_
p_
toggle[0]->get_w()+2);
mbuttons_h = get_image("mbutton_bg")->get_h();
mclock_x = window_border - 5;
mclock_y = mbuttons_y - 1 + mbuttons_h;
mbuttons_h = get_image("mbutton_bg")->get_h();
mclock_x = window_border - 5;
mclock_y = mbuttons_y - 1 + mbuttons_h;