improve inst.sh, menubar, pankeyframe.png

diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am
index 5085f0e7834b424afb9e1ae407a7f12b02b6aa87..95fc4ee3131165c54b8510d1736789da8b097ea9 100644 (file)
--- 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 ac4dbdc64e0d437d98b2412de21831b7a9706afb..7dff4a38274cfb28a0bfea82f504c744eb7ae07b 100644 (file)
--- 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 6c2b1c814e40e3df90e335b5b646fa93388040f0..f4d405875d73f9d001155189c015f0dfb1b984a9 100755 (executable)
--- a/cinelerra-5.1/inst.sh
+++ b/cinelerra-5.1/inst.sh
@@ -1,12 +1,13 @@
 #!/bin/bash -e
 # inst.sh <dir> <objs...>
-
+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 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_blond/data/pankeyframe.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_blond_cv/data/pankeyframe.png
index 65f86f0c8c22cb89e6ab92bf49f25e99f9571020..31e38af199d04ae4a1ca4d31a881f91555a65500 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/pankeyframe.png differ

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 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_blue/data/pankeyframe.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_blue_dot/data/pankeyframe.png
index f9cd41359b5ef827f51fac87ba2c6ebde35e9596..a27cf9070f37e6def94259e137c2512008db2ff1 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/pankeyframe.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_bright/data/pankeyframe.png
index 65f86f0c8c22cb89e6ab92bf49f25e99f9571020..463ef0f4469866c95be7d17acabdeedd5bef32ce 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_bright/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_bright/data/pankeyframe.png differ

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 (file)
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_hulk/data/pankeyframe.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_pinklady/data/pankeyframe.png
index 85451b6ac28a392d3e5b4280b4a7970fdb7f6801..f77e0ae345b4857a59c9d762089ef8aea95db62f 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_pinklady/data/pankeyframe.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/pankeyframe.png b/cinelerra-5.1/plugins/theme_suv/data/pankeyframe.png
index 65f86f0c8c22cb89e6ab92bf49f25e99f9571020..c82c6bf30159bb5b4493642c6470fec786ad1cff 100644 (file)
Binary files a/cinelerra-5.1/plugins/theme_suv/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_suv/data/pankeyframe.png differ

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 (file)
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png differ