Skip to content

Commit 9fb8d24

Browse files
retailcoderretailcoder
committed
moved resources to SettingsUI.xaml; fixes #4333 
1 parent 722c626 commit 9fb8d24

18 files changed

+356
-305
lines changed

‎Rubberduck.Core/UI/Settings/AutoCompleteSettingsViewModel.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using NLog;
22
using Rubberduck.Resources;
3+
using Rubberduck.Resources.Settings;
34
using Rubberduck.Settings;
45
using Rubberduck.SettingsProvider;
56
using Rubberduck.UI.Command;
@@ -183,8 +184,8 @@ private void ImportSettings()
183184
{
184185
using (var dialog = new OpenFileDialog
185186
{
186-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
187-
Title = RubberduckUI.DialogCaption_LoadInspectionSettings
187+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
188+
Title = SettingsUI.DialogCaption_LoadInspectionSettings
188189
})
189190
{
190191
dialog.ShowDialog();
@@ -199,8 +200,8 @@ private void ExportSettings()
199200
{
200201
using (var dialog = new SaveFileDialog
201202
{
202-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
203-
Title = RubberduckUI.DialogCaption_SaveInspectionSettings
203+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
204+
Title = SettingsUI.DialogCaption_SaveAutocompletionSettings
204205
})
205206
{
206207
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Rubberduck.UI.Command;
1111
using Rubberduck.VBEditor.VbeRuntime.Settings;
1212
using Rubberduck.Resources;
13+
using Rubberduck.Resources.Settings;
1314

1415
namespace Rubberduck.UI.Settings
1516
{
@@ -275,8 +276,8 @@ private void ImportSettings()
275276
{
276277
using (var dialog = new OpenFileDialog
277278
{
278-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
279-
Title = RubberduckUI.DialogCaption_LoadGeneralSettings
279+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
280+
Title = SettingsUI.DialogCaption_LoadGeneralSettings
280281
})
281282
{
282283
dialog.ShowDialog();
@@ -295,8 +296,8 @@ private void ExportSettings()
295296
{
296297
using (var dialog = new SaveFileDialog
297298
{
298-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
299-
Title = RubberduckUI.DialogCaption_SaveGeneralSettings
299+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
300+
Title = SettingsUI.DialogCaption_SaveGeneralSettings
300301
})
301302
{
302303
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/IndenterSettingsViewModel.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Rubberduck.SmartIndenter;
77
using Rubberduck.UI.Command;
88
using Rubberduck.Resources;
9+
using Rubberduck.Resources.Settings;
910

1011
namespace Rubberduck.UI.Settings
1112
{
@@ -497,8 +498,8 @@ private void ImportSettings()
497498
{
498499
using (var dialog = new OpenFileDialog
499500
{
500-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
501-
Title = RubberduckUI.DialogCaption_LoadIndenterSettings
501+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
502+
Title = SettingsUI.DialogCaption_LoadIndenterSettings
502503
})
503504
{
504505
dialog.ShowDialog();
@@ -513,8 +514,8 @@ private void ExportSettings()
513514
{
514515
using (var dialog = new SaveFileDialog
515516
{
516-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
517-
Title = RubberduckUI.DialogCaption_SaveIndenterSettings
517+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
518+
Title = SettingsUI.DialogCaption_SaveIndenterSettings
518519
})
519520
{
520521
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/InspectionSettingsViewModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Rubberduck.Resources.Inspections;
1111
using System.Globalization;
1212
using System;
13-
using Rubberduck.Resources;
13+
using Rubberduck.Resources.Settings;
1414

1515
namespace Rubberduck.UI.Settings
1616
{
@@ -195,8 +195,8 @@ private void ImportSettings()
195195
{
196196
using (var dialog = new OpenFileDialog
197197
{
198-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
199-
Title = RubberduckUI.DialogCaption_LoadInspectionSettings
198+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
199+
Title = SettingsUI.DialogCaption_LoadInspectionSettings
200200
})
201201
{
202202
dialog.ShowDialog();
@@ -211,8 +211,8 @@ private void ExportSettings()
211211
{
212212
using (var dialog = new SaveFileDialog
213213
{
214-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
215-
Title = RubberduckUI.DialogCaption_SaveInspectionSettings
214+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
215+
Title = SettingsUI.DialogCaption_SaveInspectionSettings
216216
})
217217
{
218218
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/TodoSettingsViewModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Rubberduck.Settings;
66
using Rubberduck.SettingsProvider;
77
using Rubberduck.UI.Command;
8-
using Rubberduck.Resources;
8+
using Rubberduck.Resources.Settings;
99

1010
namespace Rubberduck.UI.Settings
1111
{
@@ -79,8 +79,8 @@ private void ImportSettings()
7979
{
8080
using (var dialog = new OpenFileDialog
8181
{
82-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
83-
Title = RubberduckUI.DialogCaption_LoadToDoSettings
82+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
83+
Title = SettingsUI.DialogCaption_LoadToDoSettings
8484
})
8585
{
8686
dialog.ShowDialog();
@@ -95,8 +95,8 @@ private void ExportSettings()
9595
{
9696
using (var dialog = new SaveFileDialog
9797
{
98-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
99-
Title = RubberduckUI.DialogCaption_SaveToDoSettings
98+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
99+
Title = SettingsUI.DialogCaption_SaveToDoSettings
100100
})
101101
{
102102
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/UnitTestSettingsViewModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Rubberduck.Settings;
33
using Rubberduck.SettingsProvider;
44
using Rubberduck.UI.Command;
5-
using Rubberduck.Resources;
5+
using Rubberduck.Resources.Settings;
66

77
namespace Rubberduck.UI.Settings
88
{
@@ -120,8 +120,8 @@ private void ImportSettings()
120120
{
121121
using (var dialog = new OpenFileDialog
122122
{
123-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
124-
Title = RubberduckUI.DialogCaption_LoadUnitTestSettings
123+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
124+
Title = SettingsUI.DialogCaption_LoadUnitTestSettings
125125
})
126126
{
127127
dialog.ShowDialog();
@@ -136,8 +136,8 @@ private void ExportSettings()
136136
{
137137
using (var dialog = new SaveFileDialog
138138
{
139-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
140-
Title = RubberduckUI.DialogCaption_SaveUnitTestSettings
139+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
140+
Title = SettingsUI.DialogCaption_SaveUnitTestSettings
141141
})
142142
{
143143
dialog.ShowDialog();

‎Rubberduck.Core/UI/Settings/WindowSettingsViewModel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Rubberduck.Settings;
33
using Rubberduck.SettingsProvider;
44
using Rubberduck.UI.Command;
5-
using Rubberduck.Resources;
5+
using Rubberduck.Resources.Settings;
66

77
namespace Rubberduck.UI.Settings
88
{
@@ -104,8 +104,8 @@ private void ImportSettings()
104104
{
105105
using (var dialog = new OpenFileDialog
106106
{
107-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
108-
Title = RubberduckUI.DialogCaption_LoadWindowSettings
107+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
108+
Title = SettingsUI.DialogCaption_LoadWindowSettings
109109
})
110110
{
111111
dialog.ShowDialog();
@@ -120,8 +120,8 @@ private void ExportSettings()
120120
{
121121
using (var dialog = new SaveFileDialog
122122
{
123-
Filter = RubberduckUI.DialogMask_XmlFilesOnly,
124-
Title = RubberduckUI.DialogCaption_SaveWindowSettings
123+
Filter = SettingsUI.DialogMask_XmlFilesOnly,
124+
Title = SettingsUI.DialogCaption_SaveWindowSettings
125125
})
126126
{
127127
dialog.ShowDialog();

‎Rubberduck.Resources/Rubberduck.Resources.csproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,28 @@
2828
<LastGenOutput>$([System.String]::Copy('%(FileName)')).Designer.cs</LastGenOutput>
2929
</EmbeddedResource>
3030
</ItemGroup>
31+
32+
<ItemGroup>
33+
<Compile Update="RubberduckUI.Designer.cs">
34+
<DesignTime>True</DesignTime>
35+
<AutoGen>True</AutoGen>
36+
<DependentUpon>RubberduckUI.resx</DependentUpon>
37+
</Compile>
38+
<Compile Update="Settings\SettingsUI.Designer.cs">
39+
<DesignTime>True</DesignTime>
40+
<AutoGen>True</AutoGen>
41+
<DependentUpon>SettingsUI.resx</DependentUpon>
42+
</Compile>
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<EmbeddedResource Update="RubberduckUI.resx">
47+
<Generator>PublicResXFileCodeGenerator</Generator>
48+
<LastGenOutput>RubberduckUI.Designer.cs</LastGenOutput>
49+
</EmbeddedResource>
50+
<EmbeddedResource Update="Settings\SettingsUI.resx">
51+
<Generator>PublicResXFileCodeGenerator</Generator>
52+
<LastGenOutput>SettingsUI.Designer.cs</LastGenOutput>
53+
</EmbeddedResource>
54+
</ItemGroup>
3155
</Project>

‎Rubberduck.Resources/RubberduckUI.Designer.cs

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

0 commit comments

Comments
 (0)