From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 5 Jun 2016 15:24:39 +0000 (-0600)
Subject: improve inst.sh, menubar, pankeyframe.png
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=3406c79cd1a832418ad3a8b3de7a823b79ff5675;p=goodguy%2Fhistory.git

improve inst.sh, menubar, pankeyframe.png
---

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 <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 85451b6a..a8d1684b 100644
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 65f86f0c..31e38af1 100644
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 85451b6a..2c46da33 100644
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 f9cd4135..a27cf907 100644
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 65f86f0c..463ef0f4 100644
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 85451b6a..947a9020 100644
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 85451b6a..f77e0ae3 100644
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 65f86f0c..c82c6bf3 100644
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 85451b6a..1d4e5db8 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png and b/cinelerra-5.1/plugins/theme_unflat/data/pankeyframe.png differ