[mono/monodevelop] 7e9332d3: Add stuff to pushing

   Branch: refs/heads/bpDialog2
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/3b036b876592...7e9332d371ca

   Commit: 7e9332d371ca8b7762215625e963bc43e9b0532e
   Author: Ungureanu Marius <[email protected]> (Therzok)
     Date: 2013-10-21 13:19:48 GMT
      URL: https://github.com/mono/monodevelop/commit/7e9332d371ca8b7762215625e963bc43e9b0532e

Add stuff to pushing

Changed paths:
  M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog2.cs
  M main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj

Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog2.cs
===================================================================
@@ -31,15 +31,17 @@
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
 
 namespace MonoDevelop.Debugger
 {
-	enum ConditionalHitWhen {
+	enum ConditionalHitWhen
+	{
 		ConditionIsTrue,
 		ExpressionChanges
 	}
 
-	class BreakpointPropertiesDialog2 : Xwt.Dialog
+	sealed class BreakpointPropertiesDialog2 : Xwt.Dialog
 	{
 		// For button sensitivity.
 		Xwt.DialogButton buttonOk;
@@ -189,6 +191,10 @@ void SetInitialCatchpointData (Catchpoint cp)
 
 		void SetInitialData ()
 		{
+			// FIXME: Add support for not doing base add
+			checkIncludeSubclass.Active = true;
+			checkIncludeSubclass.Sensitive = false;
+
 			if (be != null) {
 				stopOnException.Sensitive = false;
 				stopOnFunction.Sensitive = false;
@@ -250,15 +256,6 @@ void SaveBreakpoint (Breakpoint bp, bool isNew)
 				bp.ConditionExpression = null;
 		}
 
-		void SaveCatchpoint (Catchpoint cp)
-		{
-			if (checkIncludeSubclass.Active) {
-				// add stuff
-			} else {
-				// remove stuff
-			}
-		}
-
 		void OnSave (object sender, EventArgs e)
 		{
 			bool isNew = false;
@@ -283,10 +280,6 @@ void OnSave (object sender, EventArgs e)
 			if (bp != null)
 				SaveBreakpoint (bp, isNew);
 
-			var cp = be as Catchpoint;
-			if (cp != null)
-				SaveCatchpoint (cp);
-
 			be.HitCountMode = (HitCountMode)ignoreHitType.SelectedItem;
 			be.HitCount = be.HitCountMode != HitCountMode.None ? (int)ignoreHitCount.Value : 0;
 
@@ -308,7 +301,8 @@ void OnUpdateControls (object sender, EventArgs e)
 			hboxLineColumn.Sensitive = stopOnLocation.Active;
 			hboxLocation.Sensitive = stopOnLocation.Active;
 			hboxException.Sensitive = stopOnException.Active;
-			checkIncludeSubclass.Sensitive = stopOnException.Active;
+			// FIXME: Add support for not doing base add
+			//checkIncludeSubclass.Sensitive = stopOnException.Active;
 			hboxCondition.Sensitive = !stopOnException.Active;
 
 			// Check conditional
@@ -334,8 +328,6 @@ void OnUpdateControls (object sender, EventArgs e)
 
 		void OnUpdateText (object sender, EventArgs e)
 		{
-
-
 			buttonOk.Sensitive = CheckValidity ();
 		}
 


Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
===================================================================
@@ -13,7 +13,7 @@
     <VcRevision>..\..\..\vcrevision</VcRevision>
   </PropertyGroup>
   <PropertyGroup Condition="'$(BUILD_REVISION)' != ''">
-      <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
+    <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
   </PropertyGroup>
   <Choose>
     <When Condition=" Exists('c:\Program Files\Git\bin\git.exe') ">
@@ -54,8 +54,8 @@
     </Execution>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>DEBUG</DefineConstants>
-    <GenerateDocumentation>true</GenerateDocumentation>
     <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\build\bin\MonoDevelop.Core.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -68,8 +68,10 @@
     </Execution>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DebugSymbols>true</DebugSymbols>
-    <GenerateDocumentation>true</GenerateDocumentation>
     <NoWarn>1591;1573</NoWarn>
+    <DefineConstants>
+    </DefineConstants>
+    <DocumentationFile>..\..\..\build\bin\MonoDevelop.Core.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches