Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b6976ab

Browse files
eusebiueusebiu
committed
Merge branch 'master' of git://github.com/icsharpcode/SharpDevelop into Edit_PinControl
Conflicts: src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs src/Main/StartUp/Project/Resources/BitmapResources.resources
2 parents 5d86261 + 408ccb4 commit b6976ab

63 files changed

Lines changed: 2527 additions & 684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎SharpDevelop.Tests.sln‎

Lines changed: 292 additions & 270 deletions
Large diffs are not rendered by default.

‎data/resources/StringResources.resx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5645,6 +5645,14 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
56455645
<data name="MainWindow.Windows.BookmarkPad.GotoPrev.ToolTip" xml:space="preserve">
56465646
<value>Goto previous bookmark</value>
56475647
</data>
5648+
<data name="MainWindow.Windows.BookmarkPad.LineText" xml:space="preserve">
5649+
<value>{0} @line {1}</value>
5650+
<comment>format string for displaying "filename @line #" in the bookmarks pad</comment>
5651+
</data>
5652+
<data name="MainWindow.Windows.BookmarkPad.LocationText" xml:space="preserve">
5653+
<value>Location</value>
5654+
<comment>Column title for the bookmark location</comment>
5655+
</data>
56485656
<data name="MainWindow.Windows.BookmarksLabel" xml:space="preserve">
56495657
<value>Bookmarks</value>
56505658
</data>
@@ -5754,6 +5762,10 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
57545762
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Condition" xml:space="preserve">
57555763
<value>Conditional</value>
57565764
</data>
5765+
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.ConditionalColumnHeader" xml:space="preserve">
5766+
<value>Condition</value>
5767+
<comment>column title for a conditional breakpoint's condition</comment>
5768+
</data>
57575769
<data name="MainWindow.Windows.Debug.Conditional.Breakpoints.Continue" xml:space="preserve">
57585770
<value>Continue</value>
57595771
</data>
@@ -6384,6 +6396,17 @@ Removed the end part of the original message ", reason '${Message}'" since this
63846396
<value>Delete all web references</value>
63856397
<comment>Title of the dialog box when the user tries to remove all web references.</comment>
63866398
</data>
6399+
<data name="ReflectorAddIn.IdeOptions.FindReflectorPath" xml:space="preserve">
6400+
<value>Select Reflector path</value>
6401+
<comment>Button to select the Reflector path</comment>
6402+
</data>
6403+
<data name="ReflectorAddIn.IdeOptions.ReflectorFoundInPath" xml:space="preserve">
6404+
<value>Reflector was found in the following directory:</value>
6405+
</data>
6406+
<data name="ReflectorAddIn.IdeOptions.ReflectorTitle" xml:space="preserve">
6407+
<value>Reflector</value>
6408+
<comment>Title of Reflector path option panel</comment>
6409+
</data>
63876410
<data name="ReflectorAddIn.OpenReflectorCommand" xml:space="preserve">
63886411
<value>Open .NET Reflector</value>
63896412
</data>
@@ -7835,6 +7858,10 @@ The resources files have been renamed/moved accordingly.</value>
78357858
<data name="XML.MainMenu.DebugMenu.Error.ProcessRunning" xml:space="preserve">
78367859
<value>Can not perform action because process is running.</value>
78377860
</data>
7861+
<data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
7862+
<value>Remove all breakpoints</value>
7863+
<comment>Main menu command for removing all breakpoints + tooltip for the corresponding toolbar button (in the breakpoints pad)</comment>
7864+
</data>
78387865
<data name="XML.MainMenu.DebugMenu.RunWithoutDebug" xml:space="preserve">
78397866
<value>Run &amp;without debugger</value>
78407867
</data>

‎data/resources/image/BitmapResources/BitmapResources.res‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,10 @@ Bookmarks.DisabledBreakpoint = Bookmarks\DisabledBreakpoint
342342
Bookmarks.UnhealthyBreakpoint = Bookmarks\UnhealthyBreakpoint.png
343343
Bookmarks.UnhealthyBreakpointConditional = Bookmarks\UnhealthyBreakpointConditional.png
344344
Bookmarks.CurrentLine = Bookmarks\CurrentLine.png
345+
Bookmarks.DeleteAllBreakpoints = Bookmarks\DeleteAllBreakpoints.png
346+
Bookmarks.DisableAllBreakpoints = Bookmarks\DisableAllBreakpoints.png
347+
Bookmarks.NextBreakpoint = Bookmarks\NextBreakpoint.png
348+
Bookmarks.PrevBreakpoint = Bookmarks\PrevBreakpoint.png
345349

346350
Bookmarks.Pin = Bookmarks\Pin.png
347351

‎data/resources/image/BitmapResources/Bookmarks/DeleteAllBreakpoints.PNG‎

924 Bytes
Loading

‎data/resources/image/BitmapResources/Bookmarks/DisableAllBreakpoints.PNG‎

706 Bytes
Loading

‎data/resources/image/BitmapResources/Bookmarks/NextBreakpoint.png‎

791 Bytes
Loading

‎data/resources/image/BitmapResources/Bookmarks/PrevBreakpoint.png‎

801 Bytes
Loading

‎data/templates/project/VBNet/FormsProject.xpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Namespace My
105105
MyBase.New(AuthenticationMode.Windows)
106106
Me.IsSingleInstance = False
107107
Me.EnableVisualStyles = True
108-
Me.SaveMySettingsOnExit = False ' MySettings are not supported in SharpDevelop.
108+
Me.SaveMySettingsOnExit = True
109109
Me.ShutDownStyle = ShutdownMode.AfterMainFormCloses
110110
End Sub
111111
@@ -116,6 +116,7 @@ Namespace My
116116
End Namespace
117117
]]></File>
118118
<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
119+
<File name="Properties\Settings.settings" src="MySettings.settings" Generator="SettingsSingleFileGenerator"/>
119120
</Files>
120121
</Project>
121122
</Template>

‎data/templates/project/VBNet/MySettings.settings‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="True">
2+
<Profiles />
3+
<Settings />
4+
</SettingsFile>

‎doc/ChangeLog.template.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<p>
77
SharpDevelop $INSERTVERSION$ ($INSERTDATE$)
88
<ul>
9+
<li>Added settings editor</li>
910
<li>Bug fixes</li>
1011
</ul>
1112
</p>

0 commit comments

Comments
 (0)