From: Good Guy <good1.2guy@gmail.com>
Date: Wed, 18 Oct 2017 23:50:40 +0000 (-0600)
Subject: update sams icons, update shortcuts
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;ds=sidebyside;h=6bd49ce1b213869a304386c48d43324d7f641248;p=goodguy%2Fhistory.git

update sams icons, update shortcuts
---

diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html
index 1e875fb7..fe91e173 100644
--- a/cinelerra-5.1/doc/shortcuts.html
+++ b/cinelerra-5.1/doc/shortcuts.html
@@ -7,7 +7,7 @@
 	<title></title>
 	<meta name="generator" content="LibreOffice 5.2.7.2 (Linux)"/>
 	<meta name="created" content="00:00:00"/>
-	<meta name="changed" content="2017-08-26T11:01:16.822062835"/>
+	<meta name="changed" content="2017-10-14T18:10:05.253205156"/>
 	
 	<style type="text/css">
 		body,div,table,thead,tbody,tfoot,tr,th,td,p { font-family:"Liberation Sans"; font-size:x-small }
@@ -27,7 +27,7 @@
 	<tr>
 		<td height="29" align="left"><b><font face="Liberation Serif" size=5>Main Menu</font></b></td>
 		<td align="left"><font face="Liberation Serif" size=3>(- is a checkbox)</font></td>
-		<td align="left" sdnum="1033;0;MM/DD/YY"><font face="Liberation Serif" size=3>08/25/2017 update</font></td>
+		<td align="left" sdnum="1033;0;MM/DD/YY"><font face="Liberation Serif" size=3>10/15/2017 update</font></td>
 		<td align="left"><font face="Liberation Serif"><br></font></td>
 	</tr>
 	<tr>
@@ -63,7 +63,7 @@
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Save As…</font></td>
-		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'Shift-S'</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Save and name project</font></td>
 	</tr>
 	<tr>
@@ -75,7 +75,7 @@
 	<tr>
 		<td height="26" align="right"><font face="Liberation Serif" size=4> </font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Scan…</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'Shift-S'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'Ctrl-Alt-s'</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Open dvb scan window</font></td>
 	</tr>
 	<tr>
@@ -468,12 +468,6 @@
 		<td align="left"><font face="Liberation Serif" size=4>'Shift-P'</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Open preferences setup menu</font></td>
 	</tr>
-	<tr>
-		<td height="26" align="left"><font face="Liberation Serif" size=4>    Pulldown</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>Proxy Settings</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'Alt-P'</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>Bring up Proxy settings window</font></td>
-	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>- Edit labels</font></td>
@@ -504,6 +498,12 @@
 		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Toggle typeless keyframes mode</font></td>
 	</tr>
+	<tr>
+		<td height="26" align="right"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Proxy settings</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Alt-r</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Bring up Proxy settings window</font></td>
+	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Save settings</font></td>
@@ -735,43 +735,43 @@
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4>    Buttons</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Fast reverse</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP +'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP +' / Alt-p</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Double speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Normal reverse</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 6'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 6' / Alt-o</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Normal speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Frame reverse</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 4'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 4' / Alt-u</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Render previous frame</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Stop</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 0'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 0' / Alt-m</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Stop playback</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Frame forward</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 1'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 1' / Alt-j</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Render next frame</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Normal forward</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 3'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 3' / Alt-l</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Normal speed forward play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Fast forward</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP Enter'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KPEnter'/A-;</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Double speed forward play</font></td>
 	</tr>
 	<tr>
@@ -783,13 +783,13 @@
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>(No button)</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 5'</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 5' / Alt-i</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Slow speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>(No button)</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>'KP 2' </font></td>
+		<td align="left"><font face="Liberation Serif" size=4>'KP 2' / Alt-k</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Slow speed forward play</font></td>
 	</tr>
 	<tr>
@@ -832,7 +832,13 @@
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>'Ctrl-KP#’</font></td>
-		<td align="left"><font face="Liberation Serif" size=4>If [ ] set, “KP2,3,5,6,+,enter” play between ptrs.</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>If [ ] set, “KP2,3,5,6,+,enter” play between in/out</font></td>
+	</tr>
+	<tr>
+		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>+Shift w/Alt</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Shift with Alt+x above, adds/removes audio</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
@@ -924,6 +930,30 @@
 		<td align="left"><font face="Liberation Serif" size=4>'Alt →'</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Move to next edit</font></td>
 	</tr>
+	<tr>
+		<td height="26" align="right"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut left label</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Ct-al-shf-’&lt;’</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut from insert pointer to previous label</font></td>
+	</tr>
+	<tr>
+		<td height="26" align="right"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut right label</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Ct-al-shf-’&gt;’</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut from insert pointer to next label</font></td>
+	</tr>
+	<tr>
+		<td height="26" align="right"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut prev. edit</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Ctrl-alt-’,’</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut from insert pointer to previous edit</font></td>
+	</tr>
+	<tr>
+		<td height="26" align="right"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut next edit</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Ctrl-alt-’.’</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Cut from insert pointer to next edit</font></td>
+	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Fit</font></td>
@@ -1140,6 +1170,12 @@
 		<td align="left"><font face="Liberation Serif" size=4>'Shift+click’</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Over boundary of effect, trims only that effect</font></td>
 	</tr>
+	<tr>
+		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Double click</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Between labels, highlights selection</font></td>
+	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif" size=4>Toggle single trk</font></td>
@@ -1323,43 +1359,43 @@
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Fast reverse</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP +'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP +' / Alt+p</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle double speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Normal reverse</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 6'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 6' / Alt+o</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle normal speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Frame reverse</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 4'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 4' / Alt+u</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Render previous frame</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Stop</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 0'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 0' / Alt+m</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Stop playback</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Frame forward</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 1'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 1' / Alt+j</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Render next frame</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Normal forward</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 3'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 3' / Alt+l</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle normal speed forward play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Fast forward</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP Enter'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KPEnter'/A+;</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle double speed forward play</font></td>
 	</tr>
 	<tr>
@@ -1371,13 +1407,13 @@
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>(No button)</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 5'</font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 5' / Alt+i</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle slow speed reverse play</font></td>
 	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>(No button)</font></td>
-		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 2' </font></td>
+		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>'KP 2' / Alt+k</font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>Toggle slow speed forward play</font></td>
 	</tr>
 	<tr>
@@ -1392,6 +1428,12 @@
 		<td align="left"><font face="Liberation Serif" size=4>'Ctrl-KP#’</font></td>
 		<td align="left"><font face="Liberation Serif" size=4>If [ ] set, “KP2,3,5,6,+,enter” play between ptrs.</font></td>
 	</tr>
+	<tr>
+		<td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4><br></font></td>
+		<td align="left"><font face="Liberation Serif" size=4>+Shift w/Alt</font></td>
+		<td align="left"><font face="Liberation Serif" size=4>Shift with Alt+x above, adds/removes audio</font></td>
+	</tr>
 	<tr>
 		<td height="26" align="left"><font face="Liberation Serif,Times New Roman" size=4><br></font></td>
 		<td align="left"><font face="Liberation Serif,Times New Roman" size=4>In point</font></td>
diff --git a/cinelerra-5.1/picon_cinfinity/atransition_folder.png b/cinelerra-5.1/picon_cinfinity/atransition_folder.png
index b36bb9c1..16d0be7d 100644
Binary files a/cinelerra-5.1/picon_cinfinity/atransition_folder.png and b/cinelerra-5.1/picon_cinfinity/atransition_folder.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/label_folder.png b/cinelerra-5.1/picon_cinfinity/label_folder.png
index 92bc563b..7dd3c1ca 100644
Binary files a/cinelerra-5.1/picon_cinfinity/label_folder.png and b/cinelerra-5.1/picon_cinfinity/label_folder.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/media_folder.png b/cinelerra-5.1/picon_cinfinity/media_folder.png
index 59928ae9..03cdb9ee 100644
Binary files a/cinelerra-5.1/picon_cinfinity/media_folder.png and b/cinelerra-5.1/picon_cinfinity/media_folder.png differ
diff --git a/cinelerra-5.1/picon_cinfinity/vtransition_folder.png b/cinelerra-5.1/picon_cinfinity/vtransition_folder.png
index cfd135bf..e6c87589 100644
Binary files a/cinelerra-5.1/picon_cinfinity/vtransition_folder.png and b/cinelerra-5.1/picon_cinfinity/vtransition_folder.png differ