Skip to content

Commit 7e1b520

Browse files
committed
Merge branch 'next'
2 parents e18fc63 + 92874f0 commit 7e1b520

21 files changed

+737
-112
lines changed

RetailCoder.VBE/Properties/Resources.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/Properties/Resources.resx

Lines changed: 56 additions & 53 deletions
Large diffs are not rendered by default.
28 KB
Loading

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<DependentUpon>ExtractMethodDialog.cs</DependentUpon>
286286
</Compile>
287287
<Compile Include="UI\Refactorings\ExtractMethod\IExtractMethodDialog.cs" />
288-
<Compile Include="UI\Refactorings\IDialogView.cs" />
288+
<Compile Include="UI\IDialogView.cs" />
289289
<Compile Include="UI\Refactorings\ExtractMethod\ValueChangedEventArgs.cs" />
290290
<Compile Include="UI\Refactorings\Rename\IRenameView.cs" />
291291
<Compile Include="UI\Refactorings\Rename\RenameDialog.cs">
@@ -300,6 +300,12 @@
300300
<DesignTime>True</DesignTime>
301301
<DependentUpon>RubberduckUI.resx</DependentUpon>
302302
</Compile>
303+
<Compile Include="UI\Settings\GeneralSettingsControl.cs">
304+
<SubType>UserControl</SubType>
305+
</Compile>
306+
<Compile Include="UI\Settings\GeneralSettingsControl.Designer.cs">
307+
<DependentUpon>GeneralSettingsControl.cs</DependentUpon>
308+
</Compile>
303309
<Compile Include="UI\SourceControl\SourceControlPanel.cs">
304310
<SubType>UserControl</SubType>
305311
</Compile>
@@ -588,6 +594,9 @@
588594
<EmbeddedResource Include="UI\Settings\ConfigurationTreeView.resx">
589595
<DependentUpon>ConfigurationTreeView.cs</DependentUpon>
590596
</EmbeddedResource>
597+
<EmbeddedResource Include="UI\Settings\GeneralSettingsControl.resx">
598+
<DependentUpon>GeneralSettingsControl.cs</DependentUpon>
599+
</EmbeddedResource>
591600
<EmbeddedResource Include="UI\Settings\SettingsDialog.resx">
592601
<DependentUpon>SettingsDialog.cs</DependentUpon>
593602
</EmbeddedResource>
@@ -646,6 +655,7 @@
646655
<None Include="Resources\plus-circle.png" />
647656
</ItemGroup>
648657
<ItemGroup>
658+
<None Include="Resources\Rubberduck.png" />
649659
<Content Include="Resources\Rubberduck\RD-AboutWindow.png" />
650660
<Content Include="Resources\Rubberduck\RD-InstallBanner.bmp" />
651661
<Content Include="Resources\Rubberduck\RD-InstallWindow.bmp" />

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private async Task<IEnumerable<TreeNode>> CreateModuleNodesAsync(VBProject proje
304304
var node = new TreeNode(component.Name);
305305
node.ImageKey = ComponentTypeIcons[component.Type];
306306
node.SelectedImageKey = node.ImageKey;
307-
node.Tag = parseResult.Declarations.Items.SingleOrDefault(item => item.IdentifierName == component.Name && item.Project == project);
307+
node.Tag = parseResult.Declarations.Items.FirstOrDefault(item => item.IdentifierName == component.Name && item.Project == project);
308308

309309
foreach (var declaration in members)
310310
{

RetailCoder.VBE/UI/Refactorings/IDialogView.cs renamed to RetailCoder.VBE/UI/IDialogView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Windows.Forms;
33

4-
namespace Rubberduck.UI.Refactorings
4+
namespace Rubberduck.UI
55
{
66
public interface IDialogView
77
{

RetailCoder.VBE/UI/Refactorings/Rename/RenamePresenter.cs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq;
43
using System.Runtime.InteropServices;
54
using System.Text.RegularExpressions;
@@ -80,12 +79,41 @@ private void RenameModule()
8079

8180
private void RenameDeclaration()
8281
{
82+
if (_view.Target.DeclarationType == DeclarationType.Control)
83+
{
84+
RenameControl();
85+
return;
86+
}
87+
8388
var module = _vbe.FindCodeModules(_view.Target.QualifiedName.QualifiedModuleName).First();
8489
var content = module.get_Lines(_view.Target.Selection.StartLine, 1);
8590
var newContent = GetReplacementLine(content, _view.Target.IdentifierName, _view.NewName);
8691
module.ReplaceLine(_view.Target.Selection.StartLine, newContent);
8792
}
8893

94+
private void RenameControl()
95+
{
96+
try
97+
{
98+
var form = _vbe.FindCodeModules(_view.Target.QualifiedName.QualifiedModuleName).First();
99+
var control = form.Parent.Designer.Controls(_view.Target.IdentifierName);
100+
control.Name = _view.NewName;
101+
102+
foreach (var handler in _declarations.FindEventHandlers(_view.Target))
103+
{
104+
var newMemberName = _view.Target.ComponentName + '_' + _view.NewName;
105+
var module = handler.Project.VBComponents.Item(handler.ComponentName).CodeModule;
106+
107+
var content = module.get_Lines(handler.Selection.StartLine, 1);
108+
var newContent = GetReplacementLine(content, handler.IdentifierName, newMemberName);
109+
module.ReplaceLine(handler.Selection.StartLine, newContent);
110+
}
111+
}
112+
catch (COMException)
113+
{
114+
}
115+
}
116+
89117
private void RenameUsages()
90118
{
91119
// todo: refactor

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 54 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,22 @@
195195
<value>Method '{0}' implements '{1}.{2}'. Rename the interface member?</value>
196196
<comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
197197
</data>
198+
<data name="SettingsCaption_GeneralSettings" xml:space="preserve">
199+
<value>General Settings</value>
200+
</data>
201+
<data name="SettingsCaption_CodeInspections" xml:space="preserve">
202+
<value>Code Inspection Settings</value>
203+
</data>
204+
<data name="SettingsCaption_ToDoSettings" xml:space="preserve">
205+
<value>ToDo Settings</value>
206+
</data>
207+
<data name="SettingsInstructions_CodeInspections" xml:space="preserve">
208+
<value>Configure inspection severity. Use "DoNotShow" to disable an inspection.</value>
209+
</data>
210+
<data name="SettingsInstructions_GeneralSettings" xml:space="preserve">
211+
<value>Changes will be applied after Rubberduck is reloaded.</value>
212+
</data>
213+
<data name="SettingsInstructions_ToDoSettings" xml:space="preserve">
214+
<value>Configure markers to be recognized in comments.</value>
215+
</data>
198216
</root>

RetailCoder.VBE/UI/Settings/CodeInspectionControl.Designer.cs

Lines changed: 22 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)