Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
29b434c
adding collection editor and object selector editor
JuditRose Feb 13, 2019
6c3a459
Moving ClientUtils and RTLAwareMessageBox to commons
JuditRose Feb 14, 2019
134e677
fixing PR comments, moving DpiAwernessContext to common, removing unn…
JuditRose Feb 15, 2019
f6c329e
changing namespace and minor fixes requested in PR
JuditRose Feb 15, 2019
a107801
added new classes to ref
JuditRose Feb 15, 2019
e6a1a16
remove ported components from api compat file
JuditRose Feb 15, 2019
dba923a
replaced <devdoc> tags with <summary>, fixed a few minor PR comments
JuditRose Feb 20, 2019
39bc256
changing using statement back
JuditRose Feb 20, 2019
b9bd2d7
adding auto generated resource files
JuditRose Feb 20, 2019
bd8cd59
added unit tests for object selector editor
JuditRose Feb 20, 2019
9b141e4
adding collection editor unit tests
JuditRose Feb 21, 2019
81b9089
add assertion to testcase
JuditRose Feb 22, 2019
84e9c72
fix namespacing
Feb 26, 2019
2a06570
index on WFI177-add-missing-editors: 81b9089 add assertion to testcase
Tanya-Solyanik Feb 26, 2019
378d23e
WIP on WFI177-add-missing-editors: 81b9089 add assertion to testcase
Tanya-Solyanik Feb 26, 2019
d1d8527
added resources for the collectioneditor and an interactive test
Tanya-Solyanik Feb 26, 2019
f9fd3a0
Merge branch 'master' of https://github.com/dotnet/winforms into WFI1…
Tanya-Solyanik Feb 26, 2019
95e46e8
successfully added to ref assembly
Feb 26, 2019
38838cd
Merge branch 'WFI177-add-missing-editors' of https://github.com/dotne…
Feb 26, 2019
d521de6
fix include in RTLAwareMessageBox and alphabetize usings in ClientUtils
Feb 26, 2019
1a3ac03
join all SR in the System namespace
Feb 26, 2019
cd3b6ab
remove comment header from top of SR.resx files for System.Windows.Fo…
Feb 27, 2019
8e9b714
Fix text in the ThreadExceptionDialog (#430)
Tanya-Solyanik Feb 13, 2019
f08cdd0
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 14, 2019
885b181
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 14, 2019
46e88b5
rename binlog (#440)
zsd4yr Feb 14, 2019
2d744c3
Exclude documentation files from NuGet package (#441)
sharwell Feb 14, 2019
ab8daab
enable resource dlls in package (#445)
zsd4yr Feb 15, 2019
4b7514b
Update .NET Core SDK link. (#442)
KexyBiscuit Feb 15, 2019
64c6573
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 15, 2019
51247ab
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 15, 2019
adcba2b
Adding basic tests for AccessibleObjects (#435)
M-Lipin Feb 15, 2019
70889a9
Make tested currentUICulture equal to currentCulture on the Thread (#…
zsd4yr Feb 16, 2019
2a0b04e
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 19, 2019
084067f
[master] Update dependencies from dotnet/corefx (#456)
dotnet-maestro[bot] Feb 19, 2019
a0f5046
Fixed Clipboard.SetDataObject to work with custom formats #415 (#416)
JoeErickson Feb 20, 2019
888da65
Remove dead code from binding (#393)
hughbe Feb 20, 2019
a185403
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 20, 2019
87e8e8a
LOC CHECKIN | dotnet/winforms master | 20190221 (#467)
v-zbsail Feb 21, 2019
9fea91f
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 21, 2019
11070d2
Set copyright and package license (#470)
tmat Feb 21, 2019
bea3384
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 22, 2019
779afa7
[master] Update dependencies from dotnet/arcade (#481)
dotnet-maestro[bot] Feb 25, 2019
98028a2
fix downgrade netcore platforms (#479)
zsd4yr Feb 25, 2019
18fd997
[master] Update dependencies from dotnet/corefx (#483)
dotnet-maestro[bot] Feb 25, 2019
c41b063
Fix InputLanguage null refs and add tests (#380)
hughbe Feb 25, 2019
6b963fe
Save files as utf-8-bom (#487)
sharwell Feb 25, 2019
028bf26
Improve validation of Table arguments (#381)
hughbe Feb 25, 2019
c6ac1f8
Added CheckParentingCycle, that check for any circular reference in t…
manuelvalenzuela Feb 25, 2019
c89d947
Fix typo (#492)
RussKie Feb 26, 2019
ade089f
successfully added to ref assembly
Feb 26, 2019
c05ec82
fix include in RTLAwareMessageBox and alphabetize usings in ClientUtils
Feb 26, 2019
94b1ad1
join all SR in the System namespace
Feb 26, 2019
f88941d
remove comment header from top of SR.resx files for System.Windows.Fo…
Feb 27, 2019
ac0d374
typo
Feb 27, 2019
38f594b
Merge branch 'dev/zadanz/current-WFI177' into WFI177-add-missing-editors
Feb 27, 2019
ffcf649
Merge branch 'master' into WFI177-add-missing-editors
Feb 27, 2019
8e31f04
it is unnecessary to generate source for Resources\CollectionEditor.resx
Feb 27, 2019
03e1339
add comments above public methods
Feb 27, 2019
9976fa9
make internal as well as protected for tests
Feb 28, 2019
eec9539
FIxed interactive test for CollectionEditor
Tanya-Solyanik Feb 28, 2019
756e337
add flimsy functional test:
Feb 28, 2019
a2a3860
proper test helpers
Feb 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ namespace System.Windows.Forms
#endif
{
using System;
using System.Reflection;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Collections;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Reflection;

// Miscellaneous utilities
static internal class ClientUtils {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,19 @@


namespace System.Windows.Forms {
using System;
using System.Windows.Forms;

/// <include file='doc\RTLAwareMessageBox.uex' path='docs/doc[@for="RTLAwareMessageBox"]/*' />
/// <devdoc>
/// <para>
/// The Show method displays a message box that can contain text, buttons, and symbols that
/// inform and instruct the user. This MessageBox will be RTL, if the resources
/// for this dll have been localized to a RTL language.
/// </para>
/// </devdoc>

using System.Resources;

/// <summary>
/// The Show method displays a message box that can contain text, buttons, and symbols that inform and instruct the user.
/// This MessageBox will be RTL, if the resources for this dll have been localized to a RTL language.
/// </summary>
internal sealed class RTLAwareMessageBox {

/// <include file='doc\MessageBox.uex' path='docs/doc[@for="MessageBox.Show6"]/*' />
/// <devdoc>
/// <para>
/// <summary>
/// Displays a message box with specified text, caption, and style.
/// Makes the dialog RTL if the resources for this dll have been localized to a RTL language.
/// </para>
/// </devdoc>
/// </summary>
public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon,
MessageBoxDefaultButton defaultButton, MessageBoxOptions options) {
if (RTLAwareMessageBox.IsRTLResources) {
Expand All @@ -32,10 +25,9 @@ public static DialogResult Show(IWin32Window owner, string text, string caption,
return MessageBox.Show(owner, text, caption, buttons, icon, defaultButton, options);
}

/// <devdoc>
/// Tells whether the current resources for this dll have been
/// localized for a RTL language.
/// </devdoc>
/// <summary>
/// Tells whether the current resources for this dll have been localized for a RTL language.
/// </summary>
public static bool IsRTLResources {
get {
return SR.RTL != "RTL_False";
Expand Down
2 changes: 0 additions & 2 deletions src/System.Design/src/ApiCompatBaseline.netcoreapp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ TypesMustExist : Type 'System.ComponentModel.Design.ActiveDesignSurfaceChangedEv
TypesMustExist : Type 'System.ComponentModel.Design.ArrayEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.BinaryEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.ByteViewer' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.CollectionEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.ComponentActionsType' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.DateTimeEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionHeaderItem' does not exist in the implementation but it does exist in the contract.
Expand Down Expand Up @@ -41,7 +40,6 @@ TypesMustExist : Type 'System.ComponentModel.Design.MenuCommandsChangedEventHand
TypesMustExist : Type 'System.ComponentModel.Design.MenuCommandsChangedType' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.MenuCommandService' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.MultilineStringEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.ObjectSelectorEditor' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.ProjectTargetFrameworkAttribute' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.UndoEngine' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.ComponentModel.Design.Data.DataSourceDescriptor' does not exist in the implementation but it does exist in the contract.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>System.Windows.Forms.Design.Editors</AssemblyName>
<RootNamespace>System.ComponentModel.Design</RootNamespace>
<CLSCompliant>false</CLSCompliant>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
// Changes to this file must follow the http://aka.ms/api-review process.
// ------------------------------------------------------------------------------

using System.Collections;
using System.ComponentModel;
using System.Drawing.Design;

namespace System.Drawing.Design
{
[System.CLSCompliantAttribute(false)]
Expand Down Expand Up @@ -147,3 +151,81 @@ public ShortcutKeysEditor() { }
public override System.Drawing.Design.UITypeEditorEditStyle GetEditStyle(System.ComponentModel.ITypeDescriptorContext context) { throw null; }
}
}
namespace System.ComponentModel.Design
{
[System.CLSCompliantAttribute(false)]
public partial class CollectionEditor : System.Drawing.Design.UITypeEditor
{
public CollectionEditor() { }
public CollectionEditor(Type type) { }
protected Type CollectionItemType { get { throw null; } }
protected Type CollectionType { get { throw null; } }
protected ITypeDescriptorContext Context { get { throw null; } }
protected Type[] NewItemTypes { get { throw null; } }
protected virtual string HelpTopic { get { throw null; } }
protected virtual bool CanRemoveInstance(object value) { throw null; }
protected virtual bool CanSelectMultipleInstances() { throw null; }
protected virtual CollectionForm CreateCollectionForm() { throw null; }
protected virtual object CreateInstance(Type itemType) { throw null; }
protected virtual IList GetObjectsFromInstance(object instance) { throw null; }
protected virtual string GetDisplayText(object value) { throw null; }
protected virtual Type CreateCollectionItemType() { throw null; }
protected virtual Type[] CreateNewItemTypes() { throw null; }
protected virtual void DestroyInstance(object instance) { throw null; }
public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) { throw null; }
public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { throw null; }
protected virtual object[] GetItems(object editValue) { throw null; }
protected object GetService(Type serviceType) { throw null; }
protected virtual object SetItems(object editValue, object[] value) { throw null; }
protected virtual void ShowHelp() { }
protected abstract class CollectionForm : System.Windows.Forms.Form
{
public CollectionForm(CollectionEditor editor) { }
protected Type CollectionItemType { get { throw null; } }
protected Type CollectionType { get { throw null; } }
protected ITypeDescriptorContext Context { get { throw null; } }
public object EditValue { get { throw null; } set { } }
protected object[] Items { get { throw null; } set { } }
protected Type[] NewItemTypes { get { throw null; } }
protected bool CanRemoveInstance(object value) { throw null; }
protected virtual bool CanSelectMultipleInstances() { throw null; }
protected object CreateInstance(Type itemType) { throw null; }
protected void DestroyInstance(object instance) { }
protected virtual void DisplayError(Exception e) { }
protected override object GetService(Type serviceType) { throw null; }
protected internal virtual System.Windows.Forms.DialogResult ShowEditorDialog(System.Windows.Forms.Design.IWindowsFormsEditorService edSvc) { throw null; }
protected abstract void OnEditValueChanged();
}
}

[System.CLSCompliantAttribute(false)]
public partial class ObjectSelectorEditor : System.Drawing.Design.UITypeEditor
{
public ObjectSelectorEditor() { }
public ObjectSelectorEditor(bool subObjectSelector) { }
public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) { throw null; }
public static void ApplyTreeViewThemeStyles(System.Windows.Forms.TreeView treeView) { }
public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { throw null; }
public bool EqualsToValue(object value) { throw null; }
protected virtual void FillTreeWithData(Selector selector, ITypeDescriptorContext context, IServiceProvider provider) { }
public virtual void SetValue(object value) { }
public class Selector : System.Windows.Forms.TreeView
{
public Selector(ObjectSelectorEditor editor) { }
public SelectorNode AddNode(string label, object value, SelectorNode parent) { throw null; }
public void Clear() { }
protected void OnAfterSelect(object sender, System.Windows.Forms.TreeViewEventArgs e) { }
protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e) { }
protected override void OnKeyPress(System.Windows.Forms.KeyPressEventArgs e) { }
protected override void OnNodeMouseClick(System.Windows.Forms.TreeNodeMouseClickEventArgs e) { }
public bool SetSelection(object value, System.Windows.Forms.TreeNodeCollection nodes) { throw null; }
public void Start(System.Windows.Forms.Design.IWindowsFormsEditorService edSvc, object value) { }
public void Stop() { }
protected override void WndProc(ref System.Windows.Forms.Message m) { }
}
public class SelectorNode : System.Windows.Forms.TreeNode
{
public SelectorNode(string label, object value) : base(label) { }
}
}
}
Loading