Skip to content

Commit 0a780f3

Browse files
mansellanmansellan
committed
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into 1505
2 parents dc49ba0 + 67c7657 commit 0a780f3

File tree

636 files changed

+20454
-13588
lines changed

Some content is hidden

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

636 files changed

+20454
-13588
lines changed

‎Rubberduck.Core/App.cs‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using System.Diagnostics;
1111
using System.Globalization;
1212
using System.Windows.Forms;
13-
using Rubberduck.Parsing.Inspections.Resources;
1413
using Rubberduck.Parsing.UIContext;
1514
using Rubberduck.UI.Command;
1615
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -145,12 +144,12 @@ private void LoadConfig()
145144
{
146145
_config = _configService.LoadConfiguration();
147146

148-
var currentCulture = RubberduckUI.Culture;
147+
var currentCulture = Resources.RubberduckUI.Culture;
149148
try
150149
{
151150
CultureManager.UICulture = CultureInfo.GetCultureInfo(_config.UserSettings.GeneralSettings.Language.Code);
152-
RubberduckUI.Culture = CultureInfo.CurrentUICulture;
153-
InspectionsUI.Culture = CultureInfo.CurrentUICulture;
151+
LocalizeResources(CultureManager.UICulture);
152+
154153
_appMenus.Localize();
155154
}
156155
catch (CultureNotFoundException exception)
@@ -162,6 +161,21 @@ private void LoadConfig()
162161
}
163162
}
164163

164+
private static void LocalizeResources(CultureInfo culture)
165+
{
166+
Resources.RubberduckUI.Culture = culture;
167+
Resources.About.AboutUI.Culture = culture;
168+
Resources.Inspections.InspectionInfo.Culture = culture;
169+
Resources.Inspections.InspectionNames.Culture = culture;
170+
Resources.Inspections.InspectionResults.Culture = culture;
171+
Resources.Inspections.InspectionsUI.Culture = culture;
172+
Resources.Inspections.QuickFixes.Culture = culture;
173+
Resources.RegexAssistant.RegexAssistantUI.Culture = culture;
174+
Resources.Settings.UnitTestingPage.Culture = culture;
175+
Resources.UnitTesting.AssertMessages.Culture = culture;
176+
Resources.UnitTesting.TestExplorer.Culture = culture;
177+
}
178+
165179
private void CheckForLegacyIndenterSettings()
166180
{
167181
try
@@ -173,7 +187,7 @@ private void CheckForLegacyIndenterSettings()
173187
return;
174188
}
175189
var response =
176-
_messageBox.Show(RubberduckUI.SmartIndenter_LegacySettingPrompt, "Rubberduck", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
190+
_messageBox.Show(Resources.RubberduckUI.SmartIndenter_LegacySettingPrompt, "Rubberduck", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
177191
if (response == DialogResult.Yes)
178192
{
179193
Logger.Trace("Attempting to load legacy Smart Indenter settings.");

‎Rubberduck.Core/Common/DeclarationExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Rubberduck.Parsing.Symbols;
1111
using Rubberduck.Parsing.VBA;
1212
using Rubberduck.Properties;
13-
using Rubberduck.UI;
13+
using Rubberduck.Resources;
1414
using Rubberduck.VBEditor;
1515
using Rubberduck.VBEditor.SafeComWrappers;
1616

‎Rubberduck.Core/Common/DeclarationIconCache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public BitmapImage this[Declaration declaration]
3030

3131
private static Uri GetIconUri(DeclarationType declarationType, Accessibility accessibility)
3232
{
33-
const string baseUri = @"../../Resources/Custom/PNG/";
33+
const string baseUri = @"../Rubberduck.Resources/Icons/Fugue/";
3434

3535
string path;
3636
switch (declarationType)

‎Rubberduck.Core/Common/Hotkeys/Hotkey.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Windows.Forms;
55
using Rubberduck.Common.WinAPI;
66
using NLog;
7-
using Rubberduck.UI;
7+
using Rubberduck.Resources;
88
using Rubberduck.UI.Command;
99

1010
namespace Rubberduck.Common.Hotkeys

‎Rubberduck.Core/Common/Hotkeys/HotkeyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Text;
33
using System.Windows.Forms;
4-
using Rubberduck.UI;
4+
using Rubberduck.Resources;
55

66
namespace Rubberduck.Common.Hotkeys
77
{
@@ -37,7 +37,7 @@ public override string ToString()
3737
builder.Append('+');
3838
}
3939

40-
builder.Append(HotkeyDisplayConverter.Convert(Keys & ~Modifiers));
40+
builder.Append(Rubberduck.UI.HotkeyDisplayConverter.Convert(Keys & ~Modifiers));
4141
return builder.ToString();
4242
}
4343
}

‎Rubberduck.Core/NLog.xsd‎

Lines changed: 385 additions & 326 deletions
Large diffs are not rendered by default.

‎Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System.Windows.Media.Imaging;
66
using Rubberduck.Parsing.Symbols;
77
using Rubberduck.VBEditor;
8-
using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
98
using Rubberduck.Parsing.Annotations;
109
using Rubberduck.VBEditor.ComManagement;
1110
using Rubberduck.VBEditor.SafeComWrappers;
11+
using resx = Rubberduck.Resources.CodeExplorer.CodeExplorerUI;
1212

1313
namespace Rubberduck.Navigation.CodeExplorer
1414
{
@@ -55,7 +55,7 @@ public CodeExplorerComponentViewModel(CodeExplorerItemViewModel parent, Declarat
5555
.ToList<CodeExplorerItemViewModel>();
5656

5757
_name = DeclarationType == DeclarationType.ResFile && string.IsNullOrEmpty(Declaration.IdentifierName)
58-
? UI.RubberduckUI.CodeExplorer_ResourceFileText
58+
? Resources.RubberduckUI.CodeExplorer_ResourceFileText
5959
: Declaration.IdentifierName;
6060

6161
var qualifiedModuleName = declaration.QualifiedName.QualifiedModuleName;
@@ -107,7 +107,7 @@ public bool IsErrorState
107107
set
108108
{
109109
_isErrorState = value;
110-
_icon = GetImageSource(resx.Error);
110+
_icon = GetImageSource(resx.cross_circle);
111111

112112

113113
foreach (var item in Items)

‎Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerCustomFolderViewModel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Rubberduck.Parsing.Symbols;
66
using Rubberduck.VBEditor;
77
using Rubberduck.VBEditor.ComManagement;
8-
using resx = Rubberduck.Properties.Resources;
98

109
namespace Rubberduck.Navigation.CodeExplorer
1110
{
@@ -29,8 +28,8 @@ public CodeExplorerCustomFolderViewModel(CodeExplorerItemViewModel parent, strin
2928
Name = name.Replace("\"", string.Empty);
3029
FolderAttribute = string.Format("@Folder(\"{0}\")", fullPath.Replace("\"", string.Empty));
3130

32-
CollapsedIcon = GetImageSource(resx.folder_horizontal);
33-
ExpandedIcon = GetImageSource(resx.folder_horizontal_open);
31+
CollapsedIcon = GetImageSource(Resources.CodeExplorer.CodeExplorerUI.FolderClosed);
32+
ExpandedIcon = GetImageSource(Resources.CodeExplorer.CodeExplorerUI.FolderOpen);
3433
}
3534

3635
public void AddNodes(List<Declaration> declarations)

‎Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Rubberduck.Parsing.Grammar;
77
using Rubberduck.Parsing.Symbols;
88
using Rubberduck.VBEditor;
9-
using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
9+
using resx = Rubberduck.Resources.CodeExplorer.CodeExplorerUI;
1010

1111
namespace Rubberduck.Navigation.CodeExplorer
1212
{
@@ -165,7 +165,7 @@ private static string DetermineMemberName(Declaration declaration)
165165

166166
public void ParentComponentHasError()
167167
{
168-
_icon = GetImageSource(resx.Warning);
168+
_icon = GetImageSource(resx.exclamation);
169169
OnPropertyChanged("CollapsedIcon");
170170
OnPropertyChanged("ExpandedIcon");
171171
}

‎Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Rubberduck.Parsing.Symbols;
77
using Rubberduck.VBEditor;
88
using Rubberduck.VBEditor.SafeComWrappers;
9-
using resx = Rubberduck.UI.CodeExplorer.CodeExplorer;
9+
using resx = Rubberduck.Resources.CodeExplorer.CodeExplorerUI;
1010

1111
namespace Rubberduck.Navigation.CodeExplorer
1212
{

0 commit comments

Comments
 (0)