Skip to content

Commit 83fed1d

Browse files
retailcoderretailcoder
authored
Merge pull request #1958 from comintern/next
Remove non-GPL compatible Microsoft icons.
2 parents 641a09d + 4d596f5 commit 83fed1d

File tree

410 files changed

+743
-971
lines changed

Some content is hidden

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

410 files changed

+743
-971
lines changed

‎README.md‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ This beautiful suite of professional-grade icons packs over 3,570 icons (16x16).
105105
These icons are licensed under a [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/).
106106
If you can't or don't want to provide attribution, please [purchase a royalty-free license](http://p.yusukekamiyamane.com/).
107107

108-
###[Microsoft Visual Studio Image Library](http://www.microsoft.com/en-ca/download/details.aspx?id=35825)
108+
###[SharpDevelop](https://github.com/icsharpcode/SharpDevelop.git)
109109

110-
Icons in the `./Resources/Microsoft/` directory are licensed under Microsoft's Software License Terms, must be used accordingly with their meaning / file name.
111-
112-
> You have a right to Use and Distribute these files. This means that you are free to copy and use these images in documents and projects that you create, but you may not modify them in anyway.
113-
114-
For more information, please see the EULAs in the [./Resources/Microsoft/ directory](https://github.com/retailcoder/Rubberduck/tree/master/RetailCoder.VBE/Resources/Microsoft).
115-
116-
* [Visual Studio 2013 Image Library EULA](https://github.com/retailcoder/Rubberduck/blob/master/RetailCoder.VBE/Resources/Microsoft/Visual%20Studio%202013%20Image%20Library%20EULA.rtf)
117-
* [Visual Studio 2012 Image Library EULA](https://github.com/retailcoder/Rubberduck/blob/master/RetailCoder.VBE/Resources/Microsoft/Visual%20Studio%202012%20Image%20Library%20EULA.rtf)
110+
Icons in the `./Resources/Custom/` directory were created by (or modified using elements from) the SharpDevelop icon set licensed under the [MIT license](https://opensource.org/licenses/MIT).

‎RetailCoder.VBE/Common/DeclarationIconCache.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -56,162 +56,162 @@ public static BitmapImage ComponentIcon(vbext_ComponentType componentType)
5656

5757
private static Uri GetIconUri(DeclarationType declarationType, Accessibility accessibility)
5858
{
59-
const string baseUri = @"../../Resources/Microsoft/PNG/";
59+
const string baseUri = @"../../Resources/Custom/PNG/";
6060

6161
string path;
6262
switch (declarationType)
6363
{
6464
case DeclarationType.ProceduralModule:
65-
path = "VSObject_Module.png";
65+
path = "ObjectModule.png";
6666
break;
6767

6868
case DeclarationType.Document | DeclarationType.ClassModule:
69-
path = "document.png";
69+
path = "Document.png";
7070
break;
7171

7272
case DeclarationType.UserForm | DeclarationType.ClassModule | DeclarationType.Control:
73-
path = "VSProject_Form.png";
73+
path = "ProjectForm.png";
7474
break;
7575

7676
case DeclarationType.ClassModule | DeclarationType.ProceduralModule:
77-
path = "VSProject_Class.png";
77+
path = "ObjectClass.png";
7878
break;
7979

8080
case DeclarationType.Procedure | DeclarationType.Member:
8181
case DeclarationType.Function | DeclarationType.Member:
8282
if (accessibility == Accessibility.Private)
8383
{
84-
path = "VSObject_Method_Private.png";
84+
path = "ObjectMethodPrivate.png";
8585
break;
8686
}
8787
if (accessibility == Accessibility.Friend)
8888
{
89-
path = "VSObject_Method_Friend.png";
89+
path = "ObjectMethodFriend.png";
9090
break;
9191
}
9292

93-
path = "VSObject_Method.png";
93+
path = "ObjectMethod.png";
9494
break;
9595

9696
case DeclarationType.PropertyGet | DeclarationType.Property | DeclarationType.Function:
9797
case DeclarationType.PropertyLet | DeclarationType.Property | DeclarationType.Procedure:
9898
case DeclarationType.PropertySet | DeclarationType.Property | DeclarationType.Procedure:
9999
if (accessibility == Accessibility.Private)
100100
{
101-
path = "VSObject_Properties_Private.png";
101+
path = "ObjectPropertiesPrivate.png";
102102
break;
103103
}
104104
if (accessibility == Accessibility.Friend)
105105
{
106-
path = "VSObject_Properties_Friend.png";
106+
path = "ObjectPropertiesFriend.png";
107107
break;
108108
}
109109

110-
path = "VSObject_Properties.png";
110+
path = "ObjectProperties.png";
111111
break;
112112

113113
case DeclarationType.Parameter:
114-
path = "VSObject_Field_Shortcut.png";
114+
path = "ObjectFieldShortcut.png";
115115
break;
116116

117117
case DeclarationType.Variable:
118118
if (accessibility == Accessibility.Private)
119119
{
120-
path = "VSObject_Field_Private.png";
120+
path = "ObjectFieldPrivate.png";
121121
break;
122122
}
123123
if (accessibility == Accessibility.Friend)
124124
{
125-
path = "VSObject_Field_Friend.png";
125+
path = "ObjectFieldFriend.png";
126126
break;
127127
}
128128

129-
path = "VSObject_Field.png";
129+
path = "ObjectField.png";
130130
break;
131131

132132
case DeclarationType.Constant:
133133
if (accessibility == Accessibility.Private)
134134
{
135-
path = "VSObject_Constant_Private.png";
135+
path = "ObjectConstantPrivate.png";
136136
break;
137137
}
138138
if (accessibility == Accessibility.Friend)
139139
{
140-
path = "VSObject_Constant_Friend.png";
140+
path = "ObjectConstantFriend.png";
141141
break;
142142
}
143143

144-
path = "VSObject_Constant.png";
144+
path = "ObjectConstant.png";
145145
break;
146146

147147
case DeclarationType.Enumeration:
148148
if (accessibility == Accessibility.Private)
149149
{
150-
path = "VSObject_Enum_Private.png";
150+
path = "ObjectEnumPrivate.png";
151151
break;
152152
}
153153
if (accessibility == Accessibility.Friend)
154154
{
155-
path = "VSObject_Enum_Friend.png";
155+
path = "ObjectEnumFriend.png";
156156
break;
157157
}
158158

159-
path = "VSObject_Enum.png";
159+
path = "ObjectEnum.png";
160160
break;
161161

162162
case DeclarationType.EnumerationMember:
163-
path = "VSObject_EnumItem.png";
163+
path = "ObjectEnumItem.png";
164164
break;
165165

166166
case DeclarationType.Event:
167167
if (accessibility == Accessibility.Private)
168168
{
169-
path = "VSObject_Event_Private.png";
169+
path = "ObjectEventPrivate.png";
170170
break;
171171
}
172172
if (accessibility == Accessibility.Friend)
173173
{
174-
path = "VSObject_Event_Friend.png";
174+
path = "ObjectEventFriend.png";
175175
break;
176176
}
177177

178-
path = "VSObject_Event.png";
178+
path = "ObjectEvent.png";
179179
break;
180180

181181
case DeclarationType.UserDefinedType:
182182
if (accessibility == Accessibility.Private)
183183
{
184-
path = "VSObject_ValueTypePrivate.png";
184+
path = "ObjectValueTypePrivate.png";
185185
break;
186186
}
187187
if (accessibility == Accessibility.Friend)
188188
{
189-
path = "VSObject_ValueType_Friend.png";
189+
path = "ObjectValueTypeFriend.png";
190190
break;
191191
}
192192

193-
path = "VSObject_ValueType.png";
193+
path = "ObjectValueType.png";
194194
break;
195195

196196
case DeclarationType.UserDefinedTypeMember:
197-
path = "VSObject_Field.png";
197+
path = "ObjectField.png";
198198
break;
199199

200200
case DeclarationType.LibraryProcedure | DeclarationType.Procedure:
201201
case DeclarationType.LibraryFunction | DeclarationType.Function:
202-
path = "VSObject_Method_Shortcut.png";
202+
path = "ObjectMethodShortcut.png";
203203
break;
204204

205205
case DeclarationType.LineLabel:
206-
path = "VSObject_Constant_Shortcut.png";
206+
path = "ObjectConstantShortcut.png";
207207
break;
208208

209209
case DeclarationType.Project:
210-
path = "VSObject_Library.png";
210+
path = "ObjectLibrary.png";
211211
break;
212212

213213
default:
214-
path = "VSObject_Structure.png";
214+
path = "ObjectStructure.png";
215215
break;
216216
}
217217

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ private DeclarationType DeclarationType
161161

162162
private static readonly IDictionary<DeclarationType,BitmapImage> Icons = new Dictionary<DeclarationType, BitmapImage>
163163
{
164-
{ DeclarationType.ClassModule, GetImageSource(resx.VSObject_Class) },
165-
{ DeclarationType.ProceduralModule, GetImageSource(resx.VSObject_Module) },
166-
{ DeclarationType.UserForm, GetImageSource(resx.VSProject_form) },
164+
{ DeclarationType.ClassModule, GetImageSource(resx.ObjectClass) },
165+
{ DeclarationType.ProceduralModule, GetImageSource(resx.ObjectModule) },
166+
{ DeclarationType.UserForm, GetImageSource(resx.ProjectForm) },
167167
{ DeclarationType.Document, GetImageSource(resx.document_office) }
168168
};
169169

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ public class CodeExplorerMemberViewModel : CodeExplorerItemViewModel, ICodeExplo
2323
private static readonly IDictionary<Tuple<DeclarationType,Accessibility>,BitmapImage> Mappings =
2424
new Dictionary<Tuple<DeclarationType, Accessibility>, BitmapImage>
2525
{
26-
{ Tuple.Create(DeclarationType.Constant, Accessibility.Private), GetImageSource(resx.VSObject_Constant_Private)},
27-
{ Tuple.Create(DeclarationType.Constant, Accessibility.Public), GetImageSource(resx.VSObject_Constant)},
28-
{ Tuple.Create(DeclarationType.Enumeration, Accessibility.Public), GetImageSource(resx.VSObject_Enum)},
29-
{ Tuple.Create(DeclarationType.Enumeration, Accessibility.Private ), GetImageSource(resx.VSObject_EnumPrivate)},
30-
{ Tuple.Create(DeclarationType.EnumerationMember, Accessibility.Public), GetImageSource(resx.VSObject_EnumItem)},
31-
{ Tuple.Create(DeclarationType.Event, Accessibility.Public), GetImageSource(resx.VSObject_Event)},
32-
{ Tuple.Create(DeclarationType.Event, Accessibility.Private ), GetImageSource(resx.VSObject_Event_Private)},
33-
{ Tuple.Create(DeclarationType.Function, Accessibility.Public), GetImageSource(resx.VSObject_Method)},
34-
{ Tuple.Create(DeclarationType.Function, Accessibility.Friend ), GetImageSource(resx.VSObject_Method_Friend)},
35-
{ Tuple.Create(DeclarationType.Function, Accessibility.Private ), GetImageSource(resx.VSObject_Method_Private)},
36-
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Public), GetImageSource(resx.VSObject_Method_Shortcut)},
37-
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Public), GetImageSource(resx.VSObject_Method_Shortcut)},
38-
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Private), GetImageSource(resx.VSObject_Method_Shortcut)},
39-
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Private), GetImageSource(resx.VSObject_Method_Shortcut)},
40-
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Friend), GetImageSource(resx.VSObject_Method_Shortcut)},
41-
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Friend), GetImageSource(resx.VSObject_Method_Shortcut)},
42-
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Public), GetImageSource(resx.VSObject_Method)},
43-
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Friend ), GetImageSource(resx.VSObject_Method_Friend)},
44-
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Private ), GetImageSource(resx.VSObject_Method_Private)},
45-
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Public), GetImageSource(resx.VSObject_Properties)},
46-
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Friend ), GetImageSource(resx.VSObject_Properties_Friend)},
47-
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Private ), GetImageSource(resx.VSObject_Properties_Private)},
48-
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Public), GetImageSource(resx.VSObject_Properties)},
49-
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Friend ), GetImageSource(resx.VSObject_Properties_Friend)},
50-
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Private ), GetImageSource(resx.VSObject_Properties_Private)},
51-
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Public), GetImageSource(resx.VSObject_Properties)},
52-
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Friend ), GetImageSource(resx.VSObject_Properties_Friend)},
53-
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Private ), GetImageSource(resx.VSObject_Properties_Private)},
54-
{ Tuple.Create(DeclarationType.UserDefinedType, Accessibility.Public), GetImageSource(resx.VSObject_ValueType)},
55-
{ Tuple.Create(DeclarationType.UserDefinedType, Accessibility.Private ), GetImageSource(resx.VSObject_ValueTypePrivate)},
56-
{ Tuple.Create(DeclarationType.UserDefinedTypeMember, Accessibility.Public), GetImageSource(resx.VSObject_Field)},
57-
{ Tuple.Create(DeclarationType.Variable, Accessibility.Private), GetImageSource(resx.VSObject_Field_Private)},
58-
{ Tuple.Create(DeclarationType.Variable, Accessibility.Public ), GetImageSource(resx.VSObject_Field)},
26+
{ Tuple.Create(DeclarationType.Constant, Accessibility.Private), GetImageSource(resx.ObjectConstantPrivate)},
27+
{ Tuple.Create(DeclarationType.Constant, Accessibility.Public), GetImageSource(resx.ObjectConstant)},
28+
{ Tuple.Create(DeclarationType.Enumeration, Accessibility.Public), GetImageSource(resx.ObjectEnum)},
29+
{ Tuple.Create(DeclarationType.Enumeration, Accessibility.Private ), GetImageSource(resx.ObjectEnumPrivate)},
30+
{ Tuple.Create(DeclarationType.EnumerationMember, Accessibility.Public), GetImageSource(resx.ObjectEnumItem)},
31+
{ Tuple.Create(DeclarationType.Event, Accessibility.Public), GetImageSource(resx.ObjectEvent)},
32+
{ Tuple.Create(DeclarationType.Event, Accessibility.Private ), GetImageSource(resx.ObjectEventPrivate)},
33+
{ Tuple.Create(DeclarationType.Function, Accessibility.Public), GetImageSource(resx.ObjectMethod)},
34+
{ Tuple.Create(DeclarationType.Function, Accessibility.Friend ), GetImageSource(resx.ObjectMethodFriend)},
35+
{ Tuple.Create(DeclarationType.Function, Accessibility.Private ), GetImageSource(resx.ObjectMethodPrivate)},
36+
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Public), GetImageSource(resx.ObjectMethodShortcut)},
37+
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Public), GetImageSource(resx.ObjectMethodShortcut)},
38+
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Private), GetImageSource(resx.ObjectMethodShortcut)},
39+
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Private), GetImageSource(resx.ObjectMethodShortcut)},
40+
{ Tuple.Create(DeclarationType.LibraryFunction, Accessibility.Friend), GetImageSource(resx.ObjectMethodShortcut)},
41+
{ Tuple.Create(DeclarationType.LibraryProcedure, Accessibility.Friend), GetImageSource(resx.ObjectMethodShortcut)},
42+
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Public), GetImageSource(resx.ObjectMethod)},
43+
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Friend ), GetImageSource(resx.ObjectMethodFriend)},
44+
{ Tuple.Create(DeclarationType.Procedure, Accessibility.Private ), GetImageSource(resx.ObjectMethodPrivate)},
45+
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Public), GetImageSource(resx.ObjectProperties)},
46+
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Friend ), GetImageSource(resx.ObjectPropertiesFriend)},
47+
{ Tuple.Create(DeclarationType.PropertyGet, Accessibility.Private ), GetImageSource(resx.ObjectPropertiesPrivate)},
48+
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Public), GetImageSource(resx.ObjectProperties)},
49+
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Friend ), GetImageSource(resx.ObjectPropertiesFriend)},
50+
{ Tuple.Create(DeclarationType.PropertyLet, Accessibility.Private ), GetImageSource(resx.ObjectPropertiesPrivate)},
51+
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Public), GetImageSource(resx.ObjectProperties)},
52+
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Friend ), GetImageSource(resx.ObjectPropertiesFriend)},
53+
{ Tuple.Create(DeclarationType.PropertySet, Accessibility.Private ), GetImageSource(resx.ObjectPropertiesPrivate)},
54+
{ Tuple.Create(DeclarationType.UserDefinedType, Accessibility.Public), GetImageSource(resx.ObjectValueType)},
55+
{ Tuple.Create(DeclarationType.UserDefinedType, Accessibility.Private ), GetImageSource(resx.ObjectValueTypePrivate)},
56+
{ Tuple.Create(DeclarationType.UserDefinedTypeMember, Accessibility.Public), GetImageSource(resx.ObjectField)},
57+
{ Tuple.Create(DeclarationType.Variable, Accessibility.Private), GetImageSource(resx.ObjectFieldPrivate)},
58+
{ Tuple.Create(DeclarationType.Variable, Accessibility.Public ), GetImageSource(resx.ObjectField)},
5959
};
6060

6161
public CodeExplorerMemberViewModel(CodeExplorerItemViewModel parent, Declaration declaration, IEnumerable<Declaration> declarations)

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public CodeExplorerProjectViewModel(FolderHelper folderHelper, Declaration decla
3838

3939
_icon = _declaration.Project.Protection == vbext_ProjectProtection.vbext_pp_locked
4040
? GetImageSource(resx.lock__exclamation)
41-
: GetImageSource(resx.VSObject_Library);
41+
: GetImageSource(resx.ObjectLibrary);
4242
}
4343
catch (NullReferenceException e)
4444
{

0 commit comments

Comments
 (0)