Skip to content

Commit 10ba4fc

Browse files
Hosch250Hosch250
committed
UI done
1 parent 648a52a commit 10ba4fc

15 files changed

+287
-307
lines changed

‎RetailCoder.VBE/Inspections/QuickFixes/RenameDeclarationQuickFix.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Rubberduck.Refactorings.Rename;
88
using Rubberduck.UI;
99
using Rubberduck.UI.Refactorings;
10+
using Rubberduck.UI.Refactorings.Rename;
1011
using Rubberduck.VBEditor;
1112

1213
namespace Rubberduck.Inspections.QuickFixes
@@ -32,12 +33,12 @@ public override void Fix()
3233
{
3334
var vbe = _target.Project.VBE;
3435

35-
using (var view = new RenameDialog())
36+
using (var view = new RenameDialog(new RenameViewModel(_state, null)))
3637
{
37-
var factory = new RenamePresenterFactory(vbe, view, _state, _messageBox);
38+
/*var factory = new RenamePresenterFactory(vbe, view, _state, _messageBox);
3839
var refactoring = new RenameRefactoring(vbe, factory, _messageBox, _state);
3940
refactoring.Refactor(_target);
40-
IsCancelled = view.DialogResult == DialogResult.Cancel;
41+
IsCancelled = view.DialogResult == DialogResult.Cancel;*/
4142
}
4243
}
4344

‎RetailCoder.VBE/Inspections/QuickFixes/RenameProjectQuickFix.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Rubberduck.Refactorings.Rename;
88
using Rubberduck.UI;
99
using Rubberduck.UI.Refactorings;
10+
using Rubberduck.UI.Refactorings.Rename;
1011
using Rubberduck.VBEditor;
1112
using MessageBox = Rubberduck.UI.MessageBox;
1213

@@ -31,12 +32,12 @@ public override void Fix()
3132
{
3233
var vbe = _target.Project.VBE;
3334

34-
using (var view = new RenameDialog())
35+
using (var view = new RenameDialog(new RenameViewModel(_state, null)))
3536
{
36-
var factory = new RenamePresenterFactory(vbe, view, _state, new MessageBox());
37+
/*var factory = new RenamePresenterFactory(vbe, view, _state, new MessageBox());
3738
var refactoring = new RenameRefactoring(vbe, factory, new MessageBox(), _state);
3839
refactoring.Refactor(_target);
39-
IsCancelled = view.DialogResult == DialogResult.Cancel;
40+
IsCancelled = view.DialogResult == DialogResult.Cancel;*/
4041
}
4142
}
4243

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,10 @@
482482
<DependentUpon>RemoveParametersView.xaml</DependentUpon>
483483
</Compile>
484484
<Compile Include="UI\Refactorings\RemoveParameters\RemoveParametersViewModel.cs" />
485+
<Compile Include="UI\Refactorings\Rename\RenameViewModel.cs" />
486+
<Compile Include="UI\Refactorings\Rename\RenameView.xaml.cs">
487+
<DependentUpon>RenameView.xaml</DependentUpon>
488+
</Compile>
485489
<Compile Include="UI\Refactorings\ReorderParameters\DragAdorner.cs" />
486490
<Compile Include="UI\Refactorings\ReorderParameters\IndexIsNotLastConverter.cs" />
487491
<Compile Include="UI\Refactorings\ReorderParameters\IndexIsNotZeroConverter.cs" />
@@ -917,10 +921,10 @@
917921
<Compile Include="UI\SourceControl\IControlView.cs" />
918922
<Compile Include="UI\SourceControl\IControlViewModel.cs" />
919923
<Compile Include="Refactorings\Rename\IRenameDialog.cs" />
920-
<Compile Include="UI\Refactorings\RenameDialog.cs">
924+
<Compile Include="UI\Refactorings\Rename\RenameDialog.cs">
921925
<SubType>Form</SubType>
922926
</Compile>
923-
<Compile Include="UI\Refactorings\RenameDialog.Designer.cs">
927+
<Compile Include="UI\Refactorings\Rename\RenameDialog.Designer.cs">
924928
<DependentUpon>RenameDialog.cs</DependentUpon>
925929
</Compile>
926930
<Compile Include="Refactorings\Rename\RenamePresenter.cs" />
@@ -1123,7 +1127,7 @@
11231127
<EmbeddedResource Include="UI\Refactorings\RemoveParameters\RemoveParametersDialog.resx">
11241128
<DependentUpon>RemoveParametersDialog.cs</DependentUpon>
11251129
</EmbeddedResource>
1126-
<EmbeddedResource Include="UI\Refactorings\RenameDialog.resx">
1130+
<EmbeddedResource Include="UI\Refactorings\Rename\RenameDialog.resx">
11271131
<DependentUpon>RenameDialog.cs</DependentUpon>
11281132
</EmbeddedResource>
11291133
<EmbeddedResource Include="UI\Refactorings\ReorderParameters\ReorderParametersDialog.resx">
@@ -1487,6 +1491,10 @@
14871491
<Generator>MSBuild:Compile</Generator>
14881492
<SubType>Designer</SubType>
14891493
</Page>
1494+
<Page Include="UI\Refactorings\Rename\RenameView.xaml">
1495+
<SubType>Designer</SubType>
1496+
<Generator>MSBuild:Compile</Generator>
1497+
</Page>
14901498
<Page Include="UI\Refactorings\ReorderParameters\ReorderParametersView.xaml">
14911499
<SubType>Designer</SubType>
14921500
<Generator>MSBuild:Compile</Generator>

‎RetailCoder.VBE/UI/CodeExplorer/Commands/RenameCommand.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.VBA;
55
using Rubberduck.Refactorings.Rename;
66
using Rubberduck.UI.Command;
7+
using Rubberduck.UI.Refactorings.Rename;
78
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
89

910
namespace Rubberduck.UI.CodeExplorer.Commands
@@ -13,14 +14,14 @@ public class RenameCommand : CommandBase, IDisposable
1314
{
1415
private readonly IVBE _vbe;
1516
private readonly RubberduckParserState _state;
16-
private readonly IRenameDialog _view;
17+
private readonly RenameDialog _view;
1718
private readonly IMessageBox _msgBox;
1819

19-
public RenameCommand(IVBE vbe, RubberduckParserState state, IRenameDialog view, IMessageBox msgBox) : base(LogManager.GetCurrentClassLogger())
20+
public RenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox msgBox) : base(LogManager.GetCurrentClassLogger())
2021
{
2122
_vbe = vbe;
2223
_state = state;
23-
_view = view;
24+
//_view = view;
2425
_msgBox = msgBox;
2526
}
2627

@@ -31,18 +32,15 @@ protected override bool CanExecuteImpl(object parameter)
3132

3233
protected override void ExecuteImpl(object parameter)
3334
{
34-
var factory = new RenamePresenterFactory(_vbe, _view, _state, _msgBox);
35+
/*var factory = new RenamePresenterFactory(_vbe, _view, _state, _msgBox);
3536
var refactoring = new RenameRefactoring(_vbe, factory, _msgBox, _state);
3637
37-
refactoring.Refactor(((ICodeExplorerDeclarationViewModel)parameter).Declaration);
38+
refactoring.Refactor(((ICodeExplorerDeclarationViewModel)parameter).Declaration);*/
3839
}
3940

4041
public void Dispose()
4142
{
42-
if (_view != null)
43-
{
44-
_view.Dispose();
45-
}
43+
_view?.Dispose();
4644
}
4745
}
4846
}

‎RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Refactorings.Rename;
55
using Rubberduck.Settings;
66
using Rubberduck.UI.Refactorings;
7+
using Rubberduck.UI.Refactorings.Rename;
78
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
89

910
namespace Rubberduck.UI.Command.Refactorings
@@ -56,12 +57,13 @@ protected override void ExecuteImpl(object parameter)
5657
return;
5758
}
5859

59-
using (var view = new RenameDialog())
60+
using (var view = new RenameDialog(new RenameViewModel(_state, target)))
6061
{
61-
var factory = new RenamePresenterFactory(Vbe, view, _state, _messageBox);
62+
/*var factory = new RenamePresenterFactory(Vbe, view, _state, _messageBox);
6263
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state);
6364
64-
refactoring.Refactor(target);
65+
refactoring.Refactor(target);*/
66+
view.ShowDialog();
6567
}
6668
}
6769
}

‎RetailCoder.VBE/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.Refactorings.Rename;
77
using Rubberduck.UI.Refactorings;
8+
using Rubberduck.UI.Refactorings.Rename;
89
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
910

1011
namespace Rubberduck.UI.Command.Refactorings
@@ -31,7 +32,7 @@ protected override bool CanExecuteImpl(object parameter)
3132

3233
protected override void ExecuteImpl(object parameter)
3334
{
34-
using (var view = new RenameDialog())
35+
/*using (var view = new RenameDialog())
3536
{
3637
var factory = new RenamePresenterFactory(Vbe, view, _state, _messageBox);
3738
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state);
@@ -42,7 +43,7 @@ protected override void ExecuteImpl(object parameter)
4243
{
4344
refactoring.Refactor(target);
4445
}
45-
}
46+
}*/
4647
}
4748

4849
private Declaration GetTarget()

‎RetailCoder.VBE/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.VBA;
55
using Rubberduck.Refactorings.Rename;
66
using Rubberduck.UI.Refactorings;
7+
using Rubberduck.UI.Refactorings.Rename;
78
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
89

910
namespace Rubberduck.UI.Command.Refactorings
@@ -28,7 +29,7 @@ protected override bool CanExecuteImpl(object parameter)
2829

2930
protected override void ExecuteImpl(object parameter)
3031
{
31-
using (var view = new RenameDialog())
32+
/*using (var view = new RenameDialog())
3233
{
3334
var factory = new RenamePresenterFactory(Vbe, view, _state, _msgBox);
3435
var refactoring = new RenameRefactoring(Vbe, factory, _msgBox, _state);
@@ -39,7 +40,7 @@ protected override void ExecuteImpl(object parameter)
3940
{
4041
refactoring.Refactor(target);
4142
}
42-
}
43+
}*/
4344
}
4445

4546
private Declaration GetTarget()

‎RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.Designer.cs

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

‎RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System.Windows.Forms;
2+
3+
namespace Rubberduck.UI.Refactorings.Rename
4+
{
5+
public partial class RenameDialog : Form
6+
{
7+
public RenameViewModel ViewModel { get; }
8+
9+
private RenameDialog()
10+
{
11+
InitializeComponent();
12+
Text = RubberduckUI.RenameDialog_Caption;
13+
}
14+
15+
public RenameDialog(RenameViewModel vm) : this()
16+
{
17+
ViewModel = vm;
18+
RenameViewElement.DataContext = vm;
19+
vm.OnWindowClosed += ViewModel_OnWindowClosed;
20+
}
21+
22+
void ViewModel_OnWindowClosed(object sender, DialogResult result)
23+
{
24+
DialogResult = result;
25+
Close();
26+
}
27+
}
28+
}

‎RetailCoder.VBE/UI/Refactorings/RenameDialog.resx renamed to ‎RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.resx

File renamed without changes.

0 commit comments

Comments
 (0)