53532 bug fixed Empty "Label" for edit fields in "Solution Options" window

8 files changed, 19 insertions, 43 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs
index ac0c2820a2..e7e33028f1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs
@@ -125,9 +125,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			
 			return vbox;
 		}
-
-
-
 		
 		void LoadPolicy (T policy)
 		{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/BaseDirectoryPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/BaseDirectoryPanelWidget.cs
index 1d4e1db84e..1eeed9934a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/BaseDirectoryPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/BaseDirectoryPanelWidget.cs
@@ -44,17 +44,19 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 			var a = folderentry.EntryAccessible;
 			a.SetTitleUIElement (label3.Accessible);
 			label3.Accessible.SetTitleFor (a);
+<<<<<<< HEAD
 			SetupAccessibility ();
 		}
 
 		private void SetupAccessibility ()
 		{
+=======
+>>>>>>> parent of c4787d2... Bug 53532 "Solution Options" empty "Label" for edit fields
 			folderentry.SetEntryAccessibilityAttributes ("BaseDirectory.FolderEntry",
-														 GettextCatalog.GetString ("Root Directory"),
-														 GettextCatalog.GetString ("Entry the root directory for the project"));
-			folderentry.SetAccessibilityLabelRelationship (label3);
+			                                             GettextCatalog.GetString ("Root Directory"),
+			                                             GettextCatalog.GetString ("Entry the root directory for the project"));
 		}
-
+		
 		public string BaseDirectory {
 			get {
 				return folderentry.Path;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineBuildOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineBuildOptions.cs
index ec01de7ad3..861b67de65 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineBuildOptions.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineBuildOptions.cs
@@ -27,9 +27,6 @@ using System;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Components.AtkCocoaHelper;
-
 
 namespace MonoDevelop.Ide.Projects.OptionPanels
 {
@@ -57,6 +54,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 			Build ();
 			this.solution = solution;
 			folderEntry.Path = solution.OutputDirectory;
+<<<<<<< HEAD
 			SetupAccessibility ();
 		}
 
@@ -67,13 +65,13 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 			                                              "", 
 			                                              GettextCatalog.GetString ("Enter the output directory"));
 			folderEntry.SetAccessibilityLabelRelationship (this.label73);
+=======
+>>>>>>> parent of c4787d2... Bug 53532 "Solution Options" empty "Label" for edit fields
 		}
 		
 		public void Store()
 		{
 			solution.OutputDirectory = folderEntry.Path;
 		}
-
-
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineInformationPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineInformationPanel.cs
index e37bb91877..766f937ea7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineInformationPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CombineInformationPanel.cs
@@ -34,8 +34,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
 using MonoDevelop.Components;
-using MonoDevelop.Components.AtkCocoaHelper;
-
 
 namespace MonoDevelop.Ide.Projects.OptionPanels
 {
@@ -65,17 +63,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 
 			versEntry.Text = solution.Version;
 			descView.Buffer.Text = solution.Description;
-
-			SetupAccessibility ();
-		}
-
-		private void SetupAccessibility ()
-		{
-			versEntry.SetCommonAccessibilityAttributes ("CombineInformationPanel.versEntry", "",
-			                                             GettextCatalog.GetString ("Enter the version"));
-			versEntry.SetAccessibilityLabelRelationship (versLabel);
-		}
-
+		}			
+		
 		public void Store (Solution solution)
 		{
 			solution.Version = versEntry.Text;
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget.cs
index 46190b47b3..a0382a7bc7 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget.cs
@@ -5,15 +5,10 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 	public partial class BaseDirectoryPanelWidget
 	{
 		private global::Gtk.VBox vbox2;
-
 		private global::Gtk.Label label1;
-
 		private global::Gtk.HBox hbox1;
-
 		private global::Gtk.Label label2;
-
 		private global::Gtk.Label label3;
-
 		private global::MonoDevelop.Components.FolderEntry folderentry;
 
 		protected virtual void Build ()
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineBuildOptionsWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineBuildOptionsWidget.cs
index 8026f2b538..642f591582 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineBuildOptionsWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineBuildOptionsWidget.cs
@@ -2,16 +2,12 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.Ide.Projects.OptionPanels
 {
-	public partial class CombineBuildOptionsWidget
+	internal partial class CombineBuildOptionsWidget
 	{
 		private global::Gtk.VBox vbox68;
-
 		private global::Gtk.Label label73;
-
 		private global::Gtk.HBox hbox46;
-
 		private global::Gtk.Label label74;
-
 		private global::MonoDevelop.Components.FolderEntry folderEntry;
 
 		protected virtual void Build ()
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget.cs
index c2dd07a175..ffa2330bc2 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget.cs
@@ -2,20 +2,14 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.Ide.Projects.OptionPanels
 {
-	public partial class CombineInformationWidget
+	internal partial class CombineInformationWidget
 	{
 		private global::Gtk.VBox vbox86;
-
 		private global::Gtk.Table table14;
-
 		private global::Gtk.Label descLabel;
-
 		private global::Gtk.ScrolledWindow scrolledwindow14;
-
 		private global::Gtk.TextView descView;
-
 		private global::Gtk.Entry versEntry;
-
 		private global::Gtk.Label versLabel;
 
 		protected virtual void Build ()
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index 3e7275a72b..05a4df7e28 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -1871,6 +1871,7 @@ Diagnostic</property>
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
                     <property name="Label" translatable="yes">Every hour</property>
+                    <property name="Active">True</property>
                     <property name="DrawIndicator">True</property>
                     <property name="HasLabel">True</property>
                     <property name="UseUnderline">True</property>
@@ -1978,6 +1979,7 @@ Diagnostic</property>
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">Beta updates (weekly)</property>
+                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -7492,6 +7494,7 @@ All solutions</property>
   </widget>
   <widget class="Gtk.Bin" id="MonoDevelop.Ide.Projects.OptionPanels.CombineBuildOptionsWidget" design-size="249 74">
     <property name="MemberName" />
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox68">
         <property name="MemberName" />
@@ -8203,6 +8206,7 @@ All solutions</property>
   </widget>
   <widget class="Gtk.Bin" id="MonoDevelop.Ide.Projects.OptionPanels.CombineInformationWidget" design-size="434 143">
     <property name="MemberName" />
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox86">
         <property name="MemberName" />
@@ -8619,6 +8623,7 @@ All solutions</property>
   <widget class="Gtk.Bin" id="MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget" design-size="463 44">
     <property name="MemberName" />
     <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox2">
         <property name="MemberName" />
@@ -12033,4 +12038,4 @@ Visual Studio generates a default ID for embedded resources, instead of simply u
       </widget>
     </child>
   </widget>
-</stetic-interface>
\ No newline at end of file
+</stetic-interface>