Browse Source

Fixed the Python designer unit tests.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3275 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Christian Hornung 17 years ago
parent
commit
3d58ec399d
  1. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDesignerGenerator.cs
  2. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/AbstractCodeDomDesignerLoader.cs
  3. 16
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/LocalizationModelOptionsPanel.cs

2
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockDesignerGenerator.cs

@ -36,7 +36,7 @@ namespace PythonBinding.Tests.Utils @@ -36,7 +36,7 @@ namespace PythonBinding.Tests.Utils
public CodeDomProvider CodeDomProvider {
get {
throw new NotImplementedException();
return new IronPython.CodeDom.PythonProvider();
}
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/AbstractCodeDomDesignerLoader.cs

@ -20,7 +20,7 @@ namespace ICSharpCode.FormsDesigner @@ -20,7 +20,7 @@ namespace ICSharpCode.FormsDesigner
/// </summary>
public abstract class AbstractCodeDomDesignerLoader : CodeDomDesignerLoader
{
bool loading = true;
bool loading;
IDesignerLoaderHost designerLoaderHost = null;
ITypeResolutionService typeResolutionService = null;
readonly IDesignerGenerator generator;

16
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/LocalizationModelOptionsPanel.cs

@ -148,11 +148,14 @@ namespace ICSharpCode.FormsDesigner.Gui.OptionPanels @@ -148,11 +148,14 @@ namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
public const string DefaultLocalizationModelPropertyName = "FormsDesigner.DesignerOptions.DefaultLocalizationModel";
public const string KeepLocalizationModelPropertyName = "FormsDesigner.DesignerOptions.KeepLocalizationModel";
const CodeDomLocalizationModel DefaultLocalizationModelDefaultValue = CodeDomLocalizationModel.PropertyReflection;
const bool KeepLocalizationModelDefaultValue = false;
/// <summary>
/// Gets or sets the default localization model to be used by the Windows Forms designer.
/// </summary>
public static CodeDomLocalizationModel DefaultLocalizationModel {
get { return PropertyService.Get<CodeDomLocalizationModel>(DefaultLocalizationModelPropertyName, CodeDomLocalizationModel.PropertyReflection); }
get { return GetPropertySafe(DefaultLocalizationModelPropertyName, DefaultLocalizationModelDefaultValue); }
set { PropertyService.Set(DefaultLocalizationModelPropertyName, value); }
}
@ -160,8 +163,17 @@ namespace ICSharpCode.FormsDesigner.Gui.OptionPanels @@ -160,8 +163,17 @@ namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
/// Gets or sets whether the Windows Forms designer should keep the localization model of existing files.
/// </summary>
public static bool KeepLocalizationModel {
get { return PropertyService.Get<bool>(KeepLocalizationModelPropertyName, false); }
get { return GetPropertySafe(KeepLocalizationModelPropertyName, KeepLocalizationModelDefaultValue); }
set { PropertyService.Set(KeepLocalizationModelPropertyName, value); }
}
static T GetPropertySafe<T>(string name, T defaultValue)
{
if (PropertyService.Initialized) {
return PropertyService.Get<T>(name, defaultValue);
} else {
return defaultValue;
}
}
}
}

Loading…
Cancel
Save