[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1401
Date       : Mon Jul  3 12:17:54 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/blndtool.cpp
   M /Trunk/XaraLX/tools/shadinfo.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc

Profile dialog bugfixes from mtatarnikov@xxxxxxxxx


Diff:
Index: Trunk/XaraLX/tools/shadinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/shadinfo.cpp	(revision 1400)
+++ Trunk/XaraLX/tools/shadinfo.cpp	(revision 1401)
@@ -231,6 +231,8 @@
 //	BiasGainGadget_m.LinkControlButton( this, _R(IDC_BIASGAIN), _R(IDBBL_BIASGAIN),  _R(IDS_BIASGAINDLG) );
 	BiasGainGadget_m.Init(this, _R(IDC_BIASGAIN), _R(IDBBL_BIASGAIN),  _R(IDS_BIASGAINDLG) );
 	BiasGainGadget_m.ToggleFillProfile ();
+	
+	UpdateInfoBar();
 }
 
 
@@ -577,6 +579,7 @@
 			pSoftShadowInfoBar->EnableGadget(_R(IDC_SOFTSHADOWCENTRE_X_MORE) ,FALSE);
 			pSoftShadowInfoBar->EnableGadget(_R(IDC_SOFTSHADOWCENTRE_Y_LESS) ,FALSE);
 			pSoftShadowInfoBar->EnableGadget(_R(IDC_SOFTSHADOWCENTRE_Y_MORE) ,FALSE);
+			pSoftShadowInfoBar->EnableGadget(_R(IDC_BIASGAIN) ,FALSE);
 			
 			// the following are enabled anyway to enable users to set a blur &
 			// create a shadow
@@ -878,6 +881,10 @@
 
 void SoftShadowInfoBarOp::HandleProfileSelChangingMsg(CBiasGainGadget& Gadget, CGadgetID GadgetID)
 {
+
+	InformationBarOp::HandleProfileSelChangingMsg(Gadget, GadgetID);
+	return;
+
 //	BOOL ok = (GadgetID == _R(IDC_BIASGAIN));
 
 //	ERROR2IF(ok==FALSE, FALSE, "Invalid gadgetID passed");
@@ -942,8 +949,8 @@
 	NodeShadowController* pMasterProfile = pSoftShadowTool->GetShadowEditField(smBIASGAIN, &bProfileNone, &bProfileConsistent, &bProfileMany);
 //	NodeShadowController* pMasterType = pSoftShadowTool->GetShadowEditField(smTYPE);
 
-	*bMany = bProfileMany || bProfileNone;
-	*bAllSameType = bProfileConsistent || bProfileNone;
+	*bMany = bProfileMany ;
+	*bAllSameType = bProfileConsistent && !bProfileNone;
 
 	if (pMasterProfile)
 	{
Index: Trunk/XaraLX/tools/blndtool.cpp
===================================================================
--- Trunk/XaraLX/tools/blndtool.cpp	(revision 1400)
+++ Trunk/XaraLX/tools/blndtool.cpp	(revision 1401)
@@ -1642,7 +1642,7 @@
 		}
 
 
-		if (( Msg->GadgetID == _R(IDC_BLENDOBJECTBIASGAIN)) || (Msg->GadgetID == _R(IDC_BLENDOBJECTBIASGAIN)))
+		if (( Msg->GadgetID == _R(IDC_BLENDOBJECTBIASGAIN)) || (Msg->GadgetID == _R(IDC_BLENDATTRBIASGAIN)))
 		{  
 			ProfileSelectionChange( Msg, Msg->GadgetID );
 		}
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc	(revision 1400)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc	(revision 1401)
@@ -2,6 +2,14 @@
 <resource>
 	<object class="wxDialog" name="IDD_BIASGAIN">
 			 <pos>0,0d</pos> <size>124,149d</size>
+		<object class="wxStaticBox" name="IDC_BIASGAIN_CURVEDISPLAYGROUP">
+			 <pos>3,3d</pos> <size>118,88d</size>
+			<label></label>
+		</object>
+		<object class="wxStaticBox" name="IDC_BIASGAIN_CURVECONTROLGROUP">
+			 <pos>3,92d</pos> <size>118,54d</size>
+			<label></label>
+		</object>
 		<object class="wxStaticText" name="IDC_STATIC1">
 			 <pos>4,98d</pos> <size>7,9d</size>
 			<label>-1</label>
@@ -60,14 +68,6 @@
 		<object class="wxCamDrawControl" name="IDC_CURVEINTERPOLATE">
 			 <pos>7,69d</pos> <size>110,15d</size>
 		</object>
-		<object class="wxStaticText" name="IDC_STATIC10">
-			 <pos>3,90d</pos> <size>118,57d</size>
-			<label></label>
-		</object>
-		<object class="wxStaticText" name="IDC_STATIC9">
-			 <pos>3,3d</pos> <size>118,85d</size>
-			<label></label>
-		</object>
 		<title>Profile</title>
 		<label>Profile</label>
 	</object>


Xara