Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
5 changes: 0 additions & 5 deletions docs/repo/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ This repository contains the following broad features:
## Property Pages
[Source](/src/Microsoft.VisualStudio.Editors/PropPages)

## Resources Editor
[Source](/src/Microsoft.VisualStudio.Editors/ResourceEditor)

![Resources Editor](/docs/repo/images/resourceseditor.png?raw=true)

## Settings Designer
[Source](/src/Microsoft.VisualStudio.Editors/SettingsDesigner)

Expand Down
2 changes: 1 addition & 1 deletion docs/repo/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ While the long term goal is to have all C#, F# and Visual Basic projects use thi
4. In __File Explorer__, rename project from _[project].csproj_ -> _[project].msbuildproj_
5. __File__ -> __Open__ -> __Project/Solution__ and browse to the project you just renamed and choose __Open__

### AppDesigner, Settings, Resource Editors and Property Pages
### AppDesigner, Settings and Property Pages
Both the new project system and the existing project system use the features built from this repository.

## Code Coverage
Expand Down
Binary file removed docs/repo/images/resourceseditor.png
Binary file not shown.
55 changes: 0 additions & 55 deletions src/Microsoft.VisualStudio.AppDesigner/Common/Utils.vb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon

Friend Module Utils

'The transparent color used for all bitmaps in the resource editor is lime (R=0, G=255, B=0).
' Any pixels of this color will be converted to transparent if StandardTransparentColor
' is passed to GetManifestBitmap
Public ReadOnly StandardTransparentColor As Color = Color.Lime

Public VBPackageInstance As IVBPackage

' The maximal amount of files that can be added at one shot. (copied from other VS features)
Expand Down Expand Up @@ -109,17 +104,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
End If
End Function

''' <summary>
''' Retrieves a transparent copy of a given bitmap from the manifest resources.
''' </summary>
''' <param name="BitmapID">Name of the bitmap resource (not including the assembly name, e.g. "Link.bmp")</param>
''' <param name="assembly">Name of assembly containing the manifest resource</param>
''' <returns>The retrieved transparent bitmap</returns>
''' <remarks>Throws an internal exception if the bitmap cannot be found or loaded.</remarks>
Public Function GetManifestBitmapTransparent(BitmapID As String, Optional ByRef assembly As Assembly = Nothing) As Bitmap
Return GetManifestBitmapTransparent(BitmapID, StandardTransparentColor, assembly)
End Function

''' <summary>
''' Retrieves a given image from the manifest resources.
''' </summary>
Expand Down Expand Up @@ -299,22 +283,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
End If
End Sub

''' <summary>
''' Set the drop-down width of a datagridviewcomboboxcolumn wide enough to show the text of all entries in it
''' </summary>
''' <param name="column">The column to change the width for</param>
''' <remarks>
''' This does not take the current cell style into account - it uses the font from the parent datagridview (if any)
''' It also makes room for the scrollbar even though it may not be visible...
''' </remarks>
Public Sub SetComboBoxColumnDropdownWidth(column As DataGridViewComboBoxColumn)
If column IsNot Nothing AndAlso column.DataGridView IsNot Nothing Then
column.DropDownWidth = Math.Max(MeasureMaxTextWidth(column.DataGridView, column.Items) + SystemInformation.VerticalScrollBarWidth, column.Width)
Else
Debug.Fail("SetComboBoxColumnDropdownWidth: No combobox column specified, or the column didn't have a parent datagridview!")
End If
End Sub

''' <summary>
''' Check whether the screen reader is running
''' </summary>
Expand All @@ -331,29 +299,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
Return False
End Function

''' <summary>
''' Sets error code and error message through IVsUIShell interface
''' </summary>
''' <param name="hr">error code</param>
''' <param name="errorMessage">error message</param>
Public Sub SetErrorInfo(sp As ServiceProvider, hr As Integer, errorMessage As String)
Dim vsUIShell As IVsUIShell = Nothing

If sp IsNot Nothing Then
vsUIShell = CType(sp.GetService(GetType(IVsUIShell)), IVsUIShell)
End If

If vsUIShell Is Nothing AndAlso Not VBPackageInstance IsNot Nothing Then
vsUIShell = CType(VBPackageInstance.GetService(GetType(IVsUIShell)), IVsUIShell)
End If

If vsUIShell IsNot Nothing Then
vsUIShell.SetErrorInfo(hr, errorMessage, 0, Nothing, Nothing)
Else
Debug.Fail("Could not get IVsUIShell from service provider. Can't set specific error message.")
End If
End Sub

''' <summary>
''' Sets focus to the first (or last) control inside of a parent HWND.
''' </summary>
Expand Down
115 changes: 0 additions & 115 deletions src/Microsoft.VisualStudio.AppDesigner/Common/switches.vb
Original file line number Diff line number Diff line change
Expand Up @@ -145,48 +145,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
''' </summary>
Friend NotInheritable Class Switches

'------------- Resource Editor -------------

''' <summary>
''' Trace for the ResourceEditor.FileWatcher class
''' </summary>
Public Shared RSEFileWatcher As New TraceSwitch("RSEFileWatcher", "Trace the resource editor FileWatcher class.")

''' <summary>
''' Tracing for the ResourceEditor.ResourceSerializationService class
''' </summary>
Public Shared RSEResourceSerializationService As New TraceSwitch("RSEResourceSerializationService", "Trace the resource editor ResourceSerializationService class.")

''' <summary>
''' Track adding and removing resources in the resource editor
''' </summary>
Public Shared RSEAddRemoveResources As New TraceSwitch("RSEAddRemoveResources", "Trace adding/removing resources in the resource editor")

''' <summary>
''' Trace virtual mode methods in the resource editor's string table
''' </summary>
Public Shared RSEVirtualStringTable As New TraceSwitch("RSEVirtualStringTable", "Trace virtual mode methods in the resource editor's string table")

''' <summary>
''' Trace virtual mode methods in the resource editor's listview
''' </summary>
Public Shared RSEVirtualListView As New TraceSwitch("RSEVirtualListView", "Trace virtual mode methods in the resource editor's listview")

''' <summary>
''' Trace the delayed checking of errors in resources
''' </summary>
Public Shared RSEDelayCheckErrors As New TraceSwitch("RSEDelayCheckErrors", "Trace the delayed checking of errors in resources")

''' <summary>
''' Disable high-quality options on the Graphics object when creating thumbnails in the resource editor
''' </summary>
Public Shared RSEDisableHighQualityThumbnails As New BooleanSwitch("RSEDisableHighQualityThumbnails", "Disable high-quality options on the Graphics object when creating thumbnails in the resource editor")

''' <summary>
''' Trace find/replace in the resource editor
''' </summary>
Public Shared RSEFindReplace As New TraceSwitch("RSEFindReplace", "Trace find/replace in the resource editor")

'------------- Designer Framework -------------

''' <summary>
Expand Down Expand Up @@ -614,71 +572,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
#End If
End Sub

''' <summary>
''' Traces the access modifier combobox functionality
''' </summary>
<Conditional("DEBUG")>
Public Shared Sub TracePDAccessModifierCombobox(traceLevel As TraceLevel, message As String)
#If DEBUG Then
Trace.WriteLineIf(PDAccessModifierCombobox.Level >= traceLevel, "PDAccessModifierCombobox: " & message)
#End If
End Sub

''' <summary>
''' Trace serialization of settings
''' </summary>
''' <param name="tracelevel"></param>
''' <param name="message"></param>
<Conditional("DEBUG")>
Public Overloads Shared Sub TraceSDSerializeSettings(tracelevel As TraceLevel, message As String)
#If DEBUG Then
Trace.WriteLineIf(SDSerializeSettings.Level >= tracelevel, message)
#End If
End Sub

''' <summary>
''' Trace serialization of settings
''' </summary>
''' <param name="tracelevel"></param>
''' <param name="formatString"></param>
''' <param name="parameters"></param>
<Conditional("DEBUG")>
Public Overloads Shared Sub TraceSDSerializeSettings(tracelevel As TraceLevel, formatString As String, ParamArray parameters() As Object)
#If DEBUG Then
Trace.WriteLineIf(SDSerializeSettings.Level >= tracelevel, String.Format(formatString, parameters))
#End If
End Sub

<Conditional("DEBUG")>
Public Overloads Shared Sub TracePDLinqImports(tracelevel As TraceLevel, formatString As String, ParamArray parameters() As Object)
#If DEBUG Then
Trace.WriteLineIf(PDLinqImports.Level >= tracelevel, Format(formatString, parameters))
#End If
End Sub

''' <summary>
''' Trace changes to one of the monitored configuration files
''' </summary>
''' <param name="tracelevel"></param>
<Conditional("DEBUG")>
Public Overloads Shared Sub TraceWCFConfigFileChangeWatch(tracelevel As TraceLevel, formatString As String, ParamArray parameters() As Object)
#If DEBUG Then
Trace.WriteLineIf(WCF_Config_FileChangeWatch.Level >= tracelevel, String.Format(formatString, parameters))
#End If
End Sub

''' <summary>
''' Trace changes to one of the monitored configuration files
''' </summary>
''' <param name="tracelevel"></param>
''' <param name="message"></param>
<Conditional("DEBUG")>
Public Overloads Shared Sub TraceWCFConfigFileChangeWatch(tracelevel As TraceLevel, message As String)
#If DEBUG Then
Trace.WriteLineIf(WCF_Config_FileChangeWatch.Level >= tracelevel, message)
#End If
End Sub

<Conditional("DEBUG")>
Public Shared Sub TracePDPerfBegin(e As System.Windows.Forms.LayoutEventArgs, Message As String, ParamArray FormatArguments() As Object)
#If DEBUG Then
Expand All @@ -687,14 +580,6 @@ Namespace Microsoft.VisualStudio.Editors.AppDesCommon
#End If
End Sub

<Conditional("DEBUG")>
Public Shared Sub TraceMyExtensibility(traceLevel As TraceLevel, message As String)
#If DEBUG Then
Trace.WriteLineIf(MyExtensibilityTraceSwitch.Level >= traceLevel, String.Format("MyExtensibility {0} {1}: ", Date.Now.ToLongDateString(), Date.Now.ToLongTimeString()))
Trace.WriteLineIf(MyExtensibilityTraceSwitch.Level >= traceLevel, message)
#End If
End Sub

End Class

End Namespace

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
<value>Change property: {0}</value>
</data>
<data name="ResourceEditorFactory_GUID" xml:space="preserve">
<value>ff4d6aca-9352-4a5f-821e-f4d6ebdcab11</value>
<value>81828910-b8b3-4d2b-99a3-067027c180c1</value>
<comment>{Locked}</comment>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may wish to revert this, and instead use the same (legacy) GUID for Resource Explorer. In that way, existing code across the tree and extensions will continue to work, just with the new editor.

https://dev.azure.com/devdiv/DevDiv/_search?action=contents&text=ff4d6aca-9352-4a5f-821e-f4d6ebdcab11&type=code

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

</data>
<data name="SettingsDesignerEditorFactory_GUID" xml:space="preserve">
Expand Down
Loading