Fixes after report from Matt:

- errors in names/hotkeys pulldowns fixed
- full window option in pulldown win caused ortho on/off event
- weight paint now shows vertex color Panel in editbuttons
- adding armature while vpaint mode, didnt end vpaint mode
- cleaned up some buttons design
- leftmouse press-hold for toolbox also moved 3d cursor

10 files changed, 30 insertions, 20 deletions

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 77e0d4b9ed3..d14e3044784 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1996,7 +1996,7 @@ void editing_panels()
 			if(G.f & G_FACESELECT)
 				editing_panel_mesh_texface();
 			
-			if(G.f & (G_VERTEXPAINT | G_TEXTUREPAINT) )
+			if(G.f & (G_VERTEXPAINT | G_TEXTUREPAINT | G_WEIGHTPAINT) )
 				editing_panel_mesh_paint();
 		}
 		break;
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index df7737fce1c..797e4ec705e 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -2074,9 +2074,9 @@ static void material_panel_texture(Material *ma)
 	for(a= 0; a<8; a++) {
 		mtex= ma->mtex[a];
 		if(mtex && mtex->tex) {
-			if(ma->septex & (1<<a)) strcpy(str, "Off");
-			else strcpy(str, "On");
-			uiDefButC(block, TOG|BIT|a, B_MATPRV_DRAW, str,	-24, 180-22*a, 32, 20, &ma->septex, 0.0, 0.0, 0, 0, "Disable or enable this channel");
+			if(ma->septex & (1<<a)) 
+				uiDefButC(block, TOG|BIT|a, B_MATPRV_DRAW, " ",	-20, 180-22*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Disable or enable this channel");
+			else uiDefIconButC(block, TOG|BIT|a, B_MATPRV_DRAW, ICON_CHECKBOX_HLT,	-20, 180-22*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Disable or enable this channel");
 		}
 	}
 	
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 21cce203943..1df6d71750c 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -1500,6 +1500,9 @@ void add_primitiveArmature(int type)
 	if ELEM(curarea->spacetype, SPACE_VIEW3D, SPACE_INFO); else return;
 	if(G.vd==NULL) return;
 	
+	G.f &= ~(G_VERTEXPAINT+G_FACESELECT+G_TEXTUREPAINT+G_WEIGHTPAINT);
+	setcursor_space(SPACE_VIEW3D, CURSOR_STD);
+
 	check_editmode(OB_ARMATURE);
 	
 	/* If we're not the "obedit", make a new object and enter editmode */
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 968ed473648..e16dc7d9cfd 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -254,7 +254,7 @@ int gesture(void)
 			timer++;
 			if(timer>=10*U.menuthreshold1) {
 				toolbox_n();
-				return 0;
+				return 1;
 			}
 		}
 		
diff --git a/source/blender/src/header_ipo.c b/source/blender/src/header_ipo.c
index f1791638781..f34777e29ba 100644
--- a/source/blender/src/header_ipo.c
+++ b/source/blender/src/header_ipo.c
@@ -645,7 +645,7 @@ void ipo_buttons(void)
 
 	xco = 8;
 	uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, windowtype_pup(), xco,0,XIC+10,YIC, &(curarea->butspacetype), 1.0, SPACEICONMAX, 0, 0, "Displays Current Window Type. Click for menu of available types.");
-	xco+= XIC+10;
+	xco+= XIC+14;
 	
 	test_editipo();	/* test if current editipo is OK, make_editipo sets v2d->cur */
 
diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c
index 1fc2edd494e..bdc2615040c 100644
--- a/source/blender/src/header_seq.c
+++ b/source/blender/src/header_seq.c
@@ -425,7 +425,7 @@ void seq_buttons()
 
 	xco = 8;
 	uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, windowtype_pup(), xco,0,XIC+10,YIC, &(curarea->butspacetype), 1.0, SPACEICONMAX, 0, 0, "Displays Current Window Type. Click for menu of available types.");
-	xco+= XIC+10;
+	xco+= XIC+14;
 
 	uiBlockSetEmboss(block, UI_EMBOSSN);
 	if(curarea->flag & HEADER_NO_PULLDOWN) {
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 2e3bbd29b2a..8e4fb3aa9ae 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -464,7 +464,7 @@ void text_buttons(void)
 
 	xco = 8;
 	uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, windowtype_pup(), xco,0,XIC+10,YIC, &(curarea->butspacetype), 1.0, SPACEICONMAX, 0, 0, "Displays Current Window Type. Click for menu of available types.");
-	xco+= XIC+10;
+	xco+= XIC+14;
 
 	uiBlockSetEmboss(block, UI_EMBOSSN);
 	if(curarea->flag & HEADER_NO_PULLDOWN) {
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index d8c0142d8f1..b2a724ee68d 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -303,8 +303,8 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "View Properties...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 15, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Background Image...",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 14, "");
-	if(!curarea->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,0, "");
-	else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
+	if(!curarea->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
+	else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
 	
 	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -1515,7 +1515,7 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused)
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Shrink/Fatten Along Normals|Alt S",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Shear|Ctrl S",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Warp|Ctrl W",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Warp|Shift W",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
 	
 	uiDefBut(block, SEPR, 0, "",			0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -2524,7 +2524,7 @@ static char *view3d_modeselect_pup(void)
 
 	if (OBACT && OBACT->type == OB_MESH) {
 	
-		sprintf(tempstr, formatstr, "UV FaceSelect", V3D_FACESELECTMODE_SEL, ICON_FACESEL_HLT);
+		sprintf(tempstr, formatstr, "UV Face Select", V3D_FACESELECTMODE_SEL, ICON_FACESEL_HLT);
 		strcat(string, tempstr);
 		sprintf(tempstr, formatstr, "Vertex Paint", V3D_VERTEXPAINTMODE_SEL, ICON_VPAINT_HLT);
 		strcat(string, tempstr);
@@ -2533,7 +2533,7 @@ static char *view3d_modeselect_pup(void)
 
 	
 		if ( ((Mesh*)(OBACT->data))->dvert)  {
-			sprintf(tempstr, formatstr, "Texture Paint", V3D_WEIGHTPAINTMODE_SEL, ICON_WPAINT_HLT);
+			sprintf(tempstr, formatstr, "Weight Paint", V3D_WEIGHTPAINTMODE_SEL, ICON_WPAINT_HLT);
 			strcat(string, tempstr);
 		}
 	}
@@ -3016,7 +3016,7 @@ void view3d_buttons(void)
 	
 	xco = 8;
 	uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, windowtype_pup(), xco,0,XIC+10,YIC, &(curarea->butspacetype), 1.0, SPACEICONMAX, 0, 0, "Displays Current Window Type. Click for menu of available types.");
-	xco+= XIC+10;
+	xco+= XIC+14;
 
 	uiBlockSetEmboss(block, UI_EMBOSSN);
 	if(curarea->flag & HEADER_NO_PULLDOWN) {
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 5e22463a1c6..ec381deb268 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2059,16 +2059,22 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 			0, 0, 0, 0, 0, "");
 
 		uiDefButS(block, TOGN|BIT|8, B_DRAWINFO, "ObData",
-			(xpos+edgespace),y2,(smallprefbut+2),buth,
+			(xpos+edgespace),y2,(smallprefbut),buth,
 			&(U.flag), 0, 0, 0, 0, "Link new objects' material to the obData block");
 
 		uiDefButS(block, TOG|BIT|8, B_DRAWINFO, "Object",
-			(xpos+edgespace+smallprefbut+2),y2,(smallprefbut+2),buth,
+			(xpos+edgespace+midspace+smallprefbut),y2,(smallprefbut),buth,
 			&(U.flag), 0, 0, 0, 0, "Link new objects' material to the object block");
 
-		uiDefButS(block, NUMSLI, B_DRAWINFO, "UndoSteps:",
-                       (xpos+edgespace+2*smallprefbut+8),y2,(medprefbut+2),buth,
-                       &(U.undosteps), 1, 64, 0, 0, "Number of undo steps avail. in Editmode.  Smaller conserves memory.");
+
+
+		uiDefBut(block, LABEL,0,"Mesh Undo",
+			(xpos+edgespace+medprefbut),y3label, medprefbut,buth,
+			0, 0, 0, 0, 0, "");
+
+		uiDefButS(block, NUMSLI, B_DRAWINFO, "Steps:",
+			(xpos+edgespace+medprefbut+midspace),y2,(medprefbut),buth,
+				&(U.undosteps), 1, 64, 0, 0, "Number of undo steps avail. in Editmode.  Smaller conserves memory.");
 
 
 		uiDefBut(block, LABEL,0,"Auto keyframe on:",
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index 5363787af2e..240856328ff 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -1598,7 +1598,7 @@ static TBitem tb_object_edit[]= {
 {	0, "Insert Key...|I", 	'i', NULL},
 {	0, "Object Keys", 	0, tb_object_ipo},
 {	0, "Boolean...|W", 			'w', NULL},
-{	0, "Join Objects|CTRL J", 	TB_CTRL|'j', NULL},
+{	0, "Join Objects|Ctrl J", 	TB_CTRL|'j', NULL},
 {	0, "Convert Object...|Alt C", 'i', NULL},
 {  -1, "", 			0, tb_do_hotkey}};
 
@@ -1722,6 +1722,7 @@ static TBitem tb_add[]= {
 {	0, "MBall", 	3, addmenu_meta},
 {	0, "Text", 		4, NULL},
 {	0, "Empty", 	5, NULL},
+{	0, "SEPR", 		0, NULL},
 {	0, "Camera", 	6, NULL},
 {	0, "Lamp", 		7, NULL},
 {	0, "SEPR", 		0, NULL},