From 3406c79cd1a832418ad3a8b3de7a823b79ff5675 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 5 Jun 2016 09:24:39 -0600 Subject: [PATCH] improve inst.sh, menubar, pankeyframe.png --- cinelerra-5.1/Makefile.am | 4 +--- cinelerra-5.1/guicast/bcmenubar.C | 12 ++++++------ cinelerra-5.1/inst.sh | 5 +++-- .../plugins/theme_blond/data/pankeyframe.png | Bin 522 -> 430 bytes .../plugins/theme_blond_cv/data/pankeyframe.png | Bin 236 -> 216 bytes .../plugins/theme_blue/data/pankeyframe.png | Bin 522 -> 396 bytes .../plugins/theme_blue_dot/data/pankeyframe.png | Bin 577 -> 593 bytes .../plugins/theme_bright/data/pankeyframe.png | Bin 236 -> 208 bytes .../plugins/theme_hulk/data/pankeyframe.png | Bin 522 -> 433 bytes .../plugins/theme_pinklady/data/pankeyframe.png | Bin 522 -> 454 bytes .../plugins/theme_suv/data/pankeyframe.png | Bin 236 -> 208 bytes .../plugins/theme_unflat/data/pankeyframe.png | Bin 522 -> 434 bytes 12 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index 5085f0e7..95fc4ee3 100644 --- a/cinelerra-5.1/Makefile.am +++ b/cinelerra-5.1/Makefile.am @@ -50,9 +50,7 @@ cinstall: COPYING README msg.txt ffmpeg doc models cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" . cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" . - if test "x$(WANT_LADSPA_BUILD)" = "xyes"; then \ - cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" . ; \ - fi + cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" . cd bin/applications; $(inst_sh) "$(DESTDIR)$(datadir)/applications" . cd bin/pixmaps; $(inst_sh) "$(DESTDIR)$(datadir)/pixmaps" . diff --git a/cinelerra-5.1/guicast/bcmenubar.C b/cinelerra-5.1/guicast/bcmenubar.C index ac4dbdc6..7dff4a38 100644 --- a/cinelerra-5.1/guicast/bcmenubar.C +++ b/cinelerra-5.1/guicast/bcmenubar.C @@ -122,10 +122,6 @@ int BC_MenuBar::add_menu(BC_Menu* menu) int BC_MenuBar::focus_out_event() { - for(int i = 0; i < menu_titles.total; i++) { - if( menu_titles.values[i]->active ) - return 0; - } deactivate(); return 0; } @@ -205,10 +201,14 @@ int BC_MenuBar::cursor_motion_event() int BC_MenuBar::cursor_leave_event() { - for(int i = 0; i < menu_titles.total; i++) - { + for(int i = 0; i < menu_titles.total; i++) { menu_titles.values[i]->dispatch_cursor_leave(); } + for(int i = 0; i < menu_titles.total; i++) { + if( menu_titles.values[i]->active ) + return 0; + } + deactivate(); return 0; } diff --git a/cinelerra-5.1/inst.sh b/cinelerra-5.1/inst.sh index 6c2b1c81..f4d40587 100755 --- a/cinelerra-5.1/inst.sh +++ b/cinelerra-5.1/inst.sh @@ -1,12 +1,13 @@ #!/bin/bash -e # inst.sh - +cr=' +' dir="$1"; shift 1 $mkinstalldirs "$dir" for f in "$@"; do if [ -f "$f" ]; then $install_sh -c "$f" "$dir"; continue; fi - if [ -d "$f" ]; then ( cd $f; $inst_sh "$dir/$f" * ) + if [ -d "$f" ]; then ( cd $f; IFS="$cr"; $inst_sh "$dir/$f" `ls -1` ) else echo "*** Error - install $f in $dir failed." 1>&2; exit 1; fi done diff --git a/cinelerra-5.1/plugins/theme_blond/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_blond/data/pankeyframe.png index 85451b6ac28a392d3e5b4280b4a7970fdb7f6801..a8d1684bb300c47efe85ff8a1034a2ef3d89df76 100644 GIT binary patch delta 404 zcmV;F0c-w>1g-;+B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rb1_cc(0c)Y^8~^|TJ4r-AR5;7+)W1qxQ4q)R&s?rpSS{LVnpkXLtu& zn!+gfKaX<`PET57_)7_vqam}XePBb@4c y8(Y4N|MXsYsI)BQrxxa1+Kp|8_rKQvvnxUkOvFVZbqxvt0000Z^U6+%?9k+G!KN$DW|h9tvf_|& zLu&n+LJi}FymHlU2OU-f3pzO=8O10n+TVH}AlAK?Y^-Q^`H=p?w@JckHe3Jh0e&^s z<-2?m1!ea=a3EV~3-gv-S68&BkH{L9YzcGLOnaXdQfamlz04t+am28PPS~j<=c(J^ zxQlW+o>=$A=`@pG{KWQin`p*9MbC}c>w`OBmkU06r{!pxNvl1%LG~3lV~37;9gjiI mNjcN$a{APl`R|8+9A5zlO>AuOMWe+40000Y#WBR<^xH|+dl0tIzp6;k)luQLF96!e;OXk;vd$@?2>>%QMN0qx delta 208 zcmcb?_=a(UN2BR0pdfpRr>`sfMNUyZef={=9VdW7nVv3=Ar-gYPPPg*7Xaj+rDd_FJNP}O1OPv>BFc4Q(e6; z?&S#Cceu{!DbM<->=>znTfZA}n;Ns3Y<~-H=zqzw|D`hPt6f^{KwB9+UHx3vIVCg! E04r5X9RL6T diff --git a/cinelerra-5.1/plugins/theme_blue/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_blue/data/pankeyframe.png index 85451b6ac28a392d3e5b4280b4a7970fdb7f6801..2c46da33fb417f3431e0ef48700465639bab52b6 100644 GIT binary patch delta 369 zcmV-%0gnEP1dIcaB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rb1_cc&34CEwZvX%R8A(JzR5;7+l)X;Ea1_OVwKs^BQZo&fErLkR3b5K`l^1*upX#A6@8$TL6@eY zUk}vIY}xa5l?p|S!zJPvQB0GJ0f2<}VOUQXXTZ^U6+%?9k+G!KN$DW|h9tvf_|& zLu&n+LJi}FymHlU2OU-f3pzO=8O10n+TVH}AlAK?Y^-Q^`H=p?w@JckHe3Jh0e&^s z<-2?m1!ea=a3EV~3-gv-S68&BkH{L9YzcGLOnaXdQfamlz04t+am28PPS~j<=c(J^ zxQlW+o>=$A=`@pG{KWQin`p*9MbC}c>w`OBmkU06r{!pxNvl1%LG~3lV~37;9gjiI mNjcN$a{APl`R|8+9A5zlO>AuOMWe+40000-?w{PAKaKj--3pceQyAncVqZ_BM z?9BMJe_0V(8SjV?SxBPM*4Jh#L>7DZ8RKyrn523F?Dx3~oV9>Ei;SuSF3Z?iRk6OT z!rZ;r0{5c&yqRN^1z(59)0}>VkkM~|MpZM00000NkvXX1g=70f(YXYq5uE@ delta 552 zcmV+@0@wY~1i=K5B!3BTNLh0L01FZT01FZU(%pXi00007bV*G`2i6N62O9u!X*S*f z00H1hL_t(I%cWGmYZXBd{`NRh7zo(S151lEK`a8h)&YxXT76YP+ixzp=1^{~S zn*$>*e_93rn15^UByEUQF{aaYl%jbcsNyXVaw^=Q)*#J}tTMeFU(@XyahE4K4GfsM zT~swqbdQ8TT=$8ad)`6yo#oW^0oR9_+XZjUg12U&i6jYKWY#LPa8Q!-)14NcW9C1O z@@9S?{C=kF(^5baNoK7wOJ5_$?K(BLKO?hNRhZvig@3tqh|%ry8v+zy?!gPMLb4;P zy0;Bvu*$4>UYIv`e}gx#_-hGYM1v?^L=y?GUxs=3rI#t?62?Dr<3EYpVVvo q1AvM82qD!M;&3e+Q#g$i{{I6<%r9KY>hHk-000077|LvJg8HJgr9t<#_@bR(wnw(8MN75Js+l&NrB__5R zO?=E%lNHgyE8W!g@A-3SsgrH2&q9JGv$xsJ(bGM$a6*Ks&yp;K6h&cAsm=o1#~B|@ cfAFv{*sW7}yHdmdKI;Vst01-GoD*ylh delta 208 zcmcb>_=a(UN2BR0pdfpRr>`sfMNUyZef={=9VdW7nVv3=Ar-gYPPPg*7Xaj+rDd_FJNP}O1OPv>BFc4Q(e6; z?&S#Cceu{!DbM<->=>znTfZA}n;Ns3Y<~-H=zqzw|D`hPt6f^{KwB9+UHx3vIVCg! E03_8*6#xJL diff --git a/cinelerra-5.1/plugins/theme_hulk/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_hulk/data/pankeyframe.png index 85451b6ac28a392d3e5b4280b4a7970fdb7f6801..947a9020f87f8c3caef955f231d2df5b03ec4cba 100644 GIT binary patch delta 407 zcmV;I0cie;1hE5wO6_;O)j_RO2GC{5#i-R=ut9b1dm+flk^3~ZoyhzG)y ztiUk9p<*(7UPSBVAHclriFD&9%g_hmzOaNow$5kF8acPVt-GX7w%R4YN-i#>*}26vCiale$y-e+cr(T>Ze+B{}RUAKh>j=_7p2% zD1~j|O>N=U7|cmd+Lopi@2dWL6Q3=Qu+6UGNO&{?_DXtgXd_zd=kj5+)^pZ39OLG% zN;a`8J&V@si;rHZ^U6+%?9k+G!KN$DW|h9tvf_|& zLu&n+LJi}FymHlU2OU-f3pzO=8O10n+TVH}AlAK?Y^-Q^`H=p?w@JckHe3Jh0e&^s z<-2?m1!ea=a3EV~3-gv-S68&BkH{L9YzcGLOnaXdQfamlz04t+am28PPS~j<=c(J^ zxQlW+o>=$A=`@pG{KWQin`p*9MbC}c>w`OBmkU06r{!pxNvl1%LG~3lV~37;9gjiI mNjcN$a{APl`R|8+9A5zlO>AuOMWe+40000vS9t5#B7pTJBdLq>l;T%e8%^h;V5vd)rTmX zwEwVpZPels9MBfXp$RKU1GoaRz;q9p4^9Jg0_4WxU#0sFmX|@7fK@;dIkJ2kHoG&B z3#sm&55Cxi?RiAjfGNZ(P@MywQ9YG|z02XBUNM+~P9+}ErtN7OoSIaF`|+>!e|QJQ WJZzR5z}w{j0000Z^U6+%?9k+G!KN$DW|h9tvf_|& zLu&n+LJi}FymHlU2OU-f3pzO=8O10n+TVH}AlAK?Y^-Q^`H=p?w@JckHe3Jh0e&^s z<-2?m1!ea=a3EV~3-gv-S68&BkH{L9YzcGLOnaXdQfamlz04t+am28PPS~j<=c(J^ zxQlW+o>=$A=`@pG{KWQin`p*9MbC}c>w`OBmkU06r{!pxNvl1%LG~3lV~37;9gjiI mNjcN$a{APl`R|8+9A5zlO>AuOMWe+40000Eu8E|JyU0G72+KJs4m<;p17ZH94Djj-)XNwiyZLN=$4s zn)sNjCM%+YSGuX~pLnN))X6s1XCXn8+1u>q=;mdKI;Vst0I_jBg8%>k delta 208 zcmcb>_=a(UN2BR0pdfpRr>`sfMNUyZef={=9VdW7nVv3=Ar-gYPPPg*7Xaj+rDd_FJNP}O1OPv>BFc4Q(e6; z?&S#Cceu{!DbM<->=>znTfZA}n;Ns3Y<~-H=zqzw|D`hPt6f^{KwB9+UHx3vIVCg! E03_8*6#xJL diff --git a/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png index 85451b6ac28a392d3e5b4280b4a7970fdb7f6801..1d4e5db80e2d2bdf41e436bdc64428d6c5b1dffe 100644 GIT binary patch delta 408 zcmV;J0cZY-1hNB=B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rb1_cc#D21jyd;kCeKS@MER5;7+)W1rdK@bJ--+X=-i&PiwG)*jSKr0oS zTLvQLnnD7;L0-o<@CAfmkt?Fug>)vV0$LaX#x6FZf@qvHD}RXp@S=7OEG)A#XV2`O z8J_K-7Iz)yjA4D|u~%F}{#lAue|iSYX`>qEFeq)8=obDuwH#}H-jrA0!mO?GR(gYe z3SesEM6HoC)??MzYk)cHqx7OMNauF+nUdzwk~Xi@)W)D%U3o4~4;| z(2yq3y5o6U(tm_-AdL!>#s8@)o3XN*_xY?VG0jW)s>ha1T}u63?mUz|3-9n!z8VL@ zVgXKJSNb80;pHtb7csk1zpz#O$8~fqT$4@5zH}yZZUFlxt>8;^ZQNhj?~OY*D-6iO zAiS3LRl4!n_ugBt;}zyaX|*(rZ^U6+%?9k+G!KN$DW|h9tvf_|& zLu&n+LJi}FymHlU2OU-f3pzO=8O10n+TVH}AlAK?Y^-Q^`H=p?w@JckHe3Jh0e&^s z<-2?m1!ea=a3EV~3-gv-S68&BkH{L9YzcGLOnaXdQfamlz04t+am28PPS~j<=c(J^ zxQlW+o>=$A=`@pG{KWQin`p*9MbC}c>w`OBmkU06r{!pxNvl1%LG~3lV~37;9gjiI mNjcN$a{APl`R|8+9A5zlO>AuOMWe+40000