diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index f6d455093e..52db5a15a7 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1257,7 +1257,7 @@
+ class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.old_OutputWindowOptionsPanel"/>
-
+
UserControl
-
+
UserControl
@@ -736,7 +736,7 @@
-
+
diff --git a/src/Main/Base/Project/Resources/OutputWindowOptionsPanel.xfrm b/src/Main/Base/Project/Resources/old_OutputWindowOptionsPanel.xfrm
similarity index 100%
rename from src/Main/Base/Project/Resources/OutputWindowOptionsPanel.xfrm
rename to src/Main/Base/Project/Resources/old_OutputWindowOptionsPanel.xfrm
diff --git a/src/Main/Base/Project/Src/Gui/Components/FontSelectionPanel.cs b/src/Main/Base/Project/Src/Gui/Components/old_FontSelectionPanel.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/Components/FontSelectionPanel.cs
rename to src/Main/Base/Project/Src/Gui/Components/old_FontSelectionPanel.cs
index 9083fd95cd..5904d34d40 100644
--- a/src/Main/Base/Project/Src/Gui/Components/FontSelectionPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/old_FontSelectionPanel.cs
@@ -17,7 +17,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// Description of FontSelectionPanel.
///
[Obsolete("XMLForms-based FontSelectionPanel is obsolete, use FontSelector instead!")]
- public class FontSelectionPanel : BaseSharpDevelopUserControl
+ public class old_FontSelectionPanel : BaseSharpDevelopUserControl
{
public string CurrentFontString {
get {
@@ -28,7 +28,7 @@ namespace ICSharpCode.SharpDevelop.Gui
return null;
}
set {
- CurrentFont = FontSelectionPanel.ParseFont(value);
+ CurrentFont = old_FontSelectionPanel.ParseFont(value);
}
}
@@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
- public FontSelectionPanel()
+ public old_FontSelectionPanel()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.SharpDevelop.Resources.FontSelectionPanel.xfrm"));
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs
index 3074657998..9a37aa2628 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs
@@ -17,7 +17,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
///
public partial class OutputWindowOptionsPanelXaml : OptionPanel
{
- private static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions";
+ public static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions";
public OutputWindowOptionsPanelXaml()
{
@@ -58,7 +58,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
var font = new Font(new System.Drawing.FontFamily(fontSelectionPanel.SelectedFontName),
(float)fontSelectionPanel.SelectedFontSize);
- Console.WriteLine(font.ToString());
+ if (font != null) {
+ properties.Set("DefaultFont", font.ToString());
+ }
font.Dispose();
return base.SaveOptions();
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/old_OutputWindowOptionsPanel.cs
similarity index 83%
rename from src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/old_OutputWindowOptionsPanel.cs
index 4bb288d55a..047f4898e8 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/old_OutputWindowOptionsPanel.cs
@@ -9,22 +9,22 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
///
/// The Output Window options panel.
///
- public class OutputWindowOptionsPanel : XmlFormsOptionPanel
+ public class old_OutputWindowOptionsPanel : XmlFormsOptionPanel
{
public static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions";
- FontSelectionPanel fontSelectionPanel;
+ old_FontSelectionPanel fontSelectionPanel;
- public OutputWindowOptionsPanel()
+ public old_OutputWindowOptionsPanel()
{
}
public override void LoadPanelContents()
{
- SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.SharpDevelop.Resources.OutputWindowOptionsPanel.xfrm"));
+ SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.SharpDevelop.Resources.old_OutputWindowOptionsPanel.xfrm"));
Properties properties = PropertyService.NestedProperties(OutputWindowsProperty);
- fontSelectionPanel = new FontSelectionPanel();
+ fontSelectionPanel = new old_FontSelectionPanel();
fontSelectionPanel.Dock = DockStyle.Fill;
ControlDictionary["FontGroupBox"].Controls.Add(fontSelectionPanel);
((CheckBox)ControlDictionary["wordWrapCheckBox"]).Checked = properties.Get("WordWrap", true);
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index f156b915db..871a058083 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -207,12 +207,11 @@ namespace ICSharpCode.SharpDevelop.Gui
textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
- properties = PropertyService.NestedProperties(OutputWindowOptionsPanel.OutputWindowsProperty);
+ properties = PropertyService.NestedProperties(OutputWindowOptionsPanelXaml.OutputWindowsProperty);
-// var font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", SD.WinForms.DefaultMonospacedFont.ToString()).ToString());
- var font = OutputWindowOptionsPanelXaml.ParseFont(properties.Get("DefaultFont", SD.WinForms.DefaultMonospacedFont.ToString()).ToString());
- textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
- textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
+ SetTextEditorFont();
+// textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
+// textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
properties.PropertyChanged += new PropertyChangedEventHandler(PropertyChanged);
MessageViewLinkElementGenerator.RegisterGenerators(textEditor.TextArea.TextView);
@@ -238,12 +237,22 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
- void SetWordWrap()
+
+ private void SetWordWrap()
{
bool wordWrap = this.WordWrap;
textEditor.WordWrap = wordWrap;
}
+
+ private void SetTextEditorFont()
+ {
+ var font = OutputWindowOptionsPanelXaml.ParseFont(properties.Get("DefaultFont",
+ SD.WinForms.DefaultMonospacedFont.ToString()).ToString());
+ textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
+ textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
+ }
+
#region Category handling
///
/// Adds a category to the compiler message view. This method is thread-safe.
@@ -404,10 +413,9 @@ namespace ICSharpCode.SharpDevelop.Gui
ToolBarService.UpdateStatus(toolStrip.Items);
}
if (e.PropertyName == "DefaultFont") {
- var font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", SD.WinForms.DefaultMonospacedFont.ToString()).ToString());
-
- textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
- textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
+ SetTextEditorFont();
+// textEditor.FontFamily = new FontFamily(font.FontFamily.Name);
+// textEditor.FontSize = Math.Round(font.Size * 96.0 / 72.0);
}
}