From: Good Guy Date: Wed, 23 Dec 2015 21:49:02 +0000 (-0700) Subject: icon fixes for theme data X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=02d3ec98b097986b38992df0d2184bc85ccaa38b;p=goodguy%2Fhistory.git icon fixes for theme data --- diff --git a/cinelerra-5.0/cinelerra/theme.C b/cinelerra-5.0/cinelerra/theme.C index ef69bb42..549dd11c 100644 --- a/cinelerra-5.0/cinelerra/theme.C +++ b/cinelerra-5.0/cinelerra/theme.C @@ -94,6 +94,7 @@ Theme::Theme() preferences_category_overlap = 0; loadmode_w = 350; + czoom_w = 80; #include "data/about_png.h" about_bg = new VFramePng(about_png); @@ -628,8 +629,6 @@ void Theme::draw_mwindow_bg(MWindowGUI *gui) void Theme::get_cwindow_sizes(CWindowGUI *gui, int cwindow_controls) { - czoom_w = 80; - int edit_w = EditPanel::calculate_w(mwindow, 1, 14); int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin; int zoom_w = ZoomPanel::calculate_w(czoom_w); diff --git a/cinelerra-5.0/plugins/blondtheme/blondtheme.C b/cinelerra-5.0/plugins/blondtheme/blondtheme.C index 1ee3f367..1eec4db4 100644 --- a/cinelerra-5.0/plugins/blondtheme/blondtheme.C +++ b/cinelerra-5.0/plugins/blondtheme/blondtheme.C @@ -313,6 +313,63 @@ void BlondTheme::initialize() "generic_dn.png", "new_cancel_images"); + new_toggle("loadmode_new.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_new"); + new_toggle("loadmode_none.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_none"); + new_toggle("loadmode_newcat.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_newcat"); + new_toggle("loadmode_cat.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_cat"); + new_toggle("loadmode_newtracks.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_newtracks"); + new_toggle("loadmode_paste.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_paste"); + new_toggle("loadmode_resource.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_resource"); + new_toggle("loadmode_nested.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_nested"); + resources->bar_data = new_image("bar", "bar.png"); diff --git a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C index 82d27732..4f908684 100644 --- a/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C +++ b/cinelerra-5.0/plugins/bluedottheme/bluedottheme.C @@ -35,7 +35,7 @@ #include "patchbay.h" #include "preferencesthread.h" #include "recordgui.h" -//#include "recordmonitor.h" +#include "recordmonitor.h" #include "setformat.h" #include "statusbar.h" #include "timebar.h" @@ -96,6 +96,13 @@ BlueDotTheme::BlueDotTheme() BlueDotTheme::~BlueDotTheme() { + delete channel_position_data; + delete keyframe_data; + delete camerakeyframe_data; + delete maskkeyframe_data; + delete modekeyframe_data; + delete pankeyframe_data; + delete projectorkeyframe_data; } void BlueDotTheme::initialize() @@ -170,6 +177,62 @@ void BlueDotTheme::initialize() // COPIED FROM DEFAULT THEME <<4 resources->menu_highlighted_fontcolor = DDBLUE; //Specific to BD + new_toggle("loadmode_new.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_new"); + new_toggle("loadmode_none.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_none"); + new_toggle("loadmode_newcat.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_newcat"); + new_toggle("loadmode_cat.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_cat"); + new_toggle("loadmode_newtracks.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_newtracks"); + new_toggle("loadmode_paste.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_paste"); + new_toggle("loadmode_resource.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_resource"); + new_toggle("loadmode_nested.png", + "loadmode_up.png", + "loadmode_hi.png", + "loadmode_checked.png", + "loadmode_dn.png", + "loadmode_checkedhi.png", + "loadmode_nested"); //There are differences here, but we won't change until the end. //Specific to BD @@ -235,6 +298,31 @@ void BlueDotTheme::initialize() resources->bar_data = new_image("bar", "bar.png"); + //clock font + resources->medium_7segment = new_image_set(20, + "black_0.png", + "black_1.png", + "black_2.png", + "black_3.png", + "black_4.png", + "black_5.png", + "black_6.png", + "black_7.png", + "black_8.png", + "black_9.png", + "black_colon.png", + "black_period.png", + "black_a.png", + "black_b.png", + "black_c.png", + "black_d.png", + "black_e.png", + "black_f.png", + "black_space.png", + "black_dash.png"); + + resources->bar_data = new_image("bar", "bar.png"); + resources->check = new_image("check", "check.png"); resources->min_menu_w = 0; resources->menu_popup_bg = 0; // if (0) use menu_light, menu_up, menu_shadow @@ -790,11 +878,6 @@ void BlueDotTheme::initialize() //Specific to BD resources->audiovideo_color = DKGREY; -//Specific to BD - Copied from Blonde, replace letters - //clock font - resources->medium_7segment = new_image_set(20, - "black_0.png", "black_1.png", "black_2.png", "black_3.png", "black_4.png", "black_5.png", "black_6.png", "black_7.png", "black_8.png", "black_9.png", "black_colon.png", "black_period.png", "black_a.png", "black_b.png", "black_c.png", "black_d.png", "black_e.png", "black_f.png", "black_space.png", "black_dash.png"); - //Specific to BD //tooltip resources->tooltip_bg_color = 0xfff7e3; diff --git a/cinelerra-5.0/plugins/bluedottheme/data/bgcolor.c b/cinelerra-5.0/plugins/bluedottheme/data/bgcolor.c new file mode 100644 index 00000000..ee433332 --- /dev/null +++ b/cinelerra-5.0/plugins/bluedottheme/data/bgcolor.c @@ -0,0 +1,30 @@ +#include +#include +#include +//for f in picture.png scope.png; do +// pngtopam -alpha < $f > /tmp/a +// pngtopnm < $f | /tmp/a.out > /tmp/b +// pnmtopng -alpha=/tmp/a < /tmp/b > /tmp/data1/$f +//done +int main(int ac, char **av) +{ + int r, g, b; + char line[1024]; + do { + fputs(fgets(line,sizeof(line),stdin),stdout); + } while( strcmp(line,"255\n") ); + while( (r=getc(stdin)) >= 0 && (g=getc(stdin)) >= 0 && (b=getc(stdin)) >= 0 ) { + double rr = r/255., gg = g/255., bb = b/255.; + int y = (int)(( 0.29900*rr + 0.58700*gg + 0.11400*bb)*255. + 0.5); + int u = (int)((-0.16874*rr - 0.33126*gg + 0.50000*bb + 0.5) * 255. + 0.5); + int v = (int)(( 0.50000*rr - 0.41869*gg - 0.08131*bb + 0.5) * 255. + 0.5); + if( abs(u-0x80) < 2 && abs(v-0x80) < 2 && y <= 0x48 ) + if( (y += 0x100-0x48) >= 0x100 ) y = 0x100-1; + double yy = y/255., uu = (u-128)/255., vv = (v-128)/255.; + r = (int)((yy + 1.40200*vv) * 255. + 0.5); + g = (int)((yy- 0.34414*uu - 0.71414*vv) * 255. + 0.5); + b = (int)((yy+ 1.77200*uu) * 255. + 0.5); + putc(r, stdout); putc(g, stdout); putc(b, stdout); + } + return 0; +} diff --git a/cinelerra-5.0/plugins/bluedottheme/data/check.png b/cinelerra-5.0/plugins/bluedottheme/data/check.png new file mode 100644 index 00000000..64deb932 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/check.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_cat.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_cat.png new file mode 100644 index 00000000..dfab5bb6 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_cat.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checked.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checked.png new file mode 100644 index 00000000..718a3849 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checked.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checkedhi.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checkedhi.png new file mode 100644 index 00000000..8ebfa5cf Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_checkedhi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_dn.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_dn.png new file mode 100644 index 00000000..b39b5874 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_dn.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_hi.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_hi.png new file mode 100644 index 00000000..e5951d87 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_hi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_nested.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_nested.png new file mode 100644 index 00000000..139d504d Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_nested.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_new.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_new.png new file mode 100644 index 00000000..2fdd1f5e Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_new.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newcat.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newcat.png new file mode 100644 index 00000000..7b11d1b5 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newcat.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newtracks.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newtracks.png new file mode 100644 index 00000000..26ae7242 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_newtracks.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_none.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_none.png new file mode 100644 index 00000000..43a70c55 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_none.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_paste.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_paste.png new file mode 100644 index 00000000..76755cbd Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_paste.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_resource.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_resource.png new file mode 100644 index 00000000..13c0cab3 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_resource.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/loadmode_up.png b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_up.png new file mode 100644 index 00000000..af5d9bd1 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/loadmode_up.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_add.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_add.png index 037f4747..ab072d0f 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_add.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_add.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_average.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_average.png index 3edf8524..0b2fdef3 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_average.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_average.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_darken.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_darken.png index 2c3f6c8a..13590c41 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_darken.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_darken.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_divide.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_divide.png index 1724296b..f270f272 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_divide.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_divide.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dn.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dn.png new file mode 100644 index 00000000..04b56a87 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dn.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dst.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dst.png index 933eb89c..675e6622 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_dst.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dst.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstatop.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstatop.png index 8ac13873..006c6b95 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstatop.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstatop.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstin.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstin.png index 7fab8e1b..2ac6b832 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstin.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstin.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstout.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstout.png index 09cfb006..a4afb616 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstout.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstout.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstover.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstover.png index d9328280..f9fd61d6 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_dstover.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_dstover.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_hi.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_hi.png new file mode 100644 index 00000000..06bbd888 Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/mode_hi.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_lighten.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_lighten.png index fa9a5877..c2687c36 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_lighten.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_lighten.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_max.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_max.png index 665e1b90..eb5c7904 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_max.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_max.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_min.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_min.png index eff2d446..185d146e 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_min.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_min.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_multiply.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_multiply.png index 5306b2ac..df472904 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_multiply.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_multiply.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_normal.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_normal.png index 78a77671..f51f7425 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_normal.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_normal.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_or.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_or.png index 9a531226..0342a9e0 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_or.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_or.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_replace.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_replace.png index 276d594c..cf210434 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_replace.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_replace.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_src.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_src.png index 1b0038d8..129c52cb 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_src.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_src.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcatop.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcatop.png index 36426557..6d855d11 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcatop.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcatop.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcin.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcin.png index 31bcc425..d2d0ca97 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcin.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcin.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcout.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcout.png index 6119c40a..26880228 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcout.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcout.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcover.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcover.png index a8ff0f26..3aba0b49 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_srcover.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_srcover.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_subtract.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_subtract.png index 81f86809..36efaf5a 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_subtract.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_subtract.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_up.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_up.png new file mode 100644 index 00000000..b2ca3fab Binary files /dev/null and b/cinelerra-5.0/plugins/bluedottheme/data/mode_up.png differ diff --git a/cinelerra-5.0/plugins/bluedottheme/data/mode_xor.png b/cinelerra-5.0/plugins/bluedottheme/data/mode_xor.png index c7f6765a..3790b42b 100644 Binary files a/cinelerra-5.0/plugins/bluedottheme/data/mode_xor.png and b/cinelerra-5.0/plugins/bluedottheme/data/mode_xor.png differ