Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Rename Icons folder to IconsAndLogos
Browse files Browse the repository at this point in the history
  • Loading branch information
@StanleyGoldman
StanleyGoldman committed Jun 19, 2017
1 parent 96d6023 commit c58cd79
Show file tree
Hide file tree
Showing 65 changed files with 65 additions and 64 deletions.
124 changes: 62 additions & 62 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,68 +162,68 @@
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Icons\added%402x.png" />
<EmbeddedResource Include="Icons\added.png" />
<EmbeddedResource Include="Icons\big-logo%402x.png" />
<EmbeddedResource Include="Icons\big-logo-light%402x.png" />
<EmbeddedResource Include="Icons\big-logo-light.png" />
<EmbeddedResource Include="Icons\big-logo.png" />
<EmbeddedResource Include="Icons\branch%402x.png" />
<EmbeddedResource Include="Icons\branch-light%402x.png" />
<EmbeddedResource Include="Icons\branch-light.png" />
<EmbeddedResource Include="Icons\branch.png" />
<EmbeddedResource Include="Icons\conflicted%402x.png" />
<EmbeddedResource Include="Icons\conflicted.png" />
<EmbeddedResource Include="Icons\current-branch-indicator%402x.png" />
<EmbeddedResource Include="Icons\current-branch-indicator-light%402x.png" />
<EmbeddedResource Include="Icons\current-branch-indicator-light.png" />
<EmbeddedResource Include="Icons\current-branch-indicator.png" />
<EmbeddedResource Include="Icons\dot%402x.png" />
<EmbeddedResource Include="Icons\dot-light%402x.png" />
<EmbeddedResource Include="Icons\dot-light.png" />
<EmbeddedResource Include="Icons\dot.png" />
<EmbeddedResource Include="Icons\dropdown-list-icon%402x.png" />
<EmbeddedResource Include="Icons\dropdown-list-icon.png" />
<EmbeddedResource Include="Icons\favorite-branch-indicator.png" />
<EmbeddedResource Include="Icons\git-merge%402x.png" />
<EmbeddedResource Include="Icons\git-merge-light%402x.png" />
<EmbeddedResource Include="Icons\git-merge-light.png" />
<EmbeddedResource Include="Icons\git-merge.png" />
<EmbeddedResource Include="Icons\local-commit%402x.png" />
<EmbeddedResource Include="Icons\local-commit-icon%402x.png" />
<EmbeddedResource Include="Icons\local-commit-icon.png" />
<EmbeddedResource Include="Icons\local-commit-light%402x.png" />
<EmbeddedResource Include="Icons\local-commit-light.png" />
<EmbeddedResource Include="Icons\local-commit.png" />
<EmbeddedResource Include="Icons\lock%402x.png" />
<EmbeddedResource Include="Icons\lock-light%402x.png" />
<EmbeddedResource Include="Icons\lock-light.png" />
<EmbeddedResource Include="Icons\lock.png" />
<EmbeddedResource Include="Icons\locked%402x.png" />
<EmbeddedResource Include="Icons\locked-by-person%402x.png" />
<EmbeddedResource Include="Icons\locked-by-person.png" />
<EmbeddedResource Include="Icons\locked-modified%402x.png" />
<EmbeddedResource Include="Icons\locked-modified.png" />
<EmbeddedResource Include="Icons\locked-removed%402x.png" />
<EmbeddedResource Include="Icons\locked-removed.png" />
<EmbeddedResource Include="Icons\locked.png" />
<EmbeddedResource Include="Icons\modified%402x.png" />
<EmbeddedResource Include="Icons\modified.png" />
<EmbeddedResource Include="Icons\moved%402x.png" />
<EmbeddedResource Include="Icons\moved.png" />
<EmbeddedResource Include="Icons\removed%402x.png" />
<EmbeddedResource Include="Icons\removed.png" />
<EmbeddedResource Include="Icons\repo%402x.png" />
<EmbeddedResource Include="Icons\repo-light%402x.png" />
<EmbeddedResource Include="Icons\repo-light.png" />
<EmbeddedResource Include="Icons\repo.png" />
<EmbeddedResource Include="Icons\small-logo%402x.png" />
<EmbeddedResource Include="Icons\small-logo-light%402x.png" />
<EmbeddedResource Include="Icons\small-logo-light.png" />
<EmbeddedResource Include="Icons\small-logo.png" />
<EmbeddedResource Include="Icons\tracked-branch-indicator.png" />
<EmbeddedResource Include="Icons\untracked%402x.png" />
<EmbeddedResource Include="Icons\untracked.png" />
<EmbeddedResource Include="IconsAndLogos\added%402x.png" />
<EmbeddedResource Include="IconsAndLogos\added.png" />
<EmbeddedResource Include="IconsAndLogos\big-logo%402x.png" />
<EmbeddedResource Include="IconsAndLogos\big-logo-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\big-logo-light.png" />
<EmbeddedResource Include="IconsAndLogos\big-logo.png" />
<EmbeddedResource Include="IconsAndLogos\branch%402x.png" />
<EmbeddedResource Include="IconsAndLogos\branch-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\branch-light.png" />
<EmbeddedResource Include="IconsAndLogos\branch.png" />
<EmbeddedResource Include="IconsAndLogos\conflicted%402x.png" />
<EmbeddedResource Include="IconsAndLogos\conflicted.png" />
<EmbeddedResource Include="IconsAndLogos\current-branch-indicator%402x.png" />
<EmbeddedResource Include="IconsAndLogos\current-branch-indicator-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\current-branch-indicator-light.png" />
<EmbeddedResource Include="IconsAndLogos\current-branch-indicator.png" />
<EmbeddedResource Include="IconsAndLogos\dot%402x.png" />
<EmbeddedResource Include="IconsAndLogos\dot-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\dot-light.png" />
<EmbeddedResource Include="IconsAndLogos\dot.png" />
<EmbeddedResource Include="IconsAndLogos\dropdown-list-icon%402x.png" />
<EmbeddedResource Include="IconsAndLogos\dropdown-list-icon.png" />
<EmbeddedResource Include="IconsAndLogos\favorite-branch-indicator.png" />
<EmbeddedResource Include="IconsAndLogos\git-merge%402x.png" />
<EmbeddedResource Include="IconsAndLogos\git-merge-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\git-merge-light.png" />
<EmbeddedResource Include="IconsAndLogos\git-merge.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit%402x.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit-icon%402x.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit-icon.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit-light.png" />
<EmbeddedResource Include="IconsAndLogos\local-commit.png" />
<EmbeddedResource Include="IconsAndLogos\lock%402x.png" />
<EmbeddedResource Include="IconsAndLogos\lock-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\lock-light.png" />
<EmbeddedResource Include="IconsAndLogos\lock.png" />
<EmbeddedResource Include="IconsAndLogos\locked%402x.png" />
<EmbeddedResource Include="IconsAndLogos\locked-by-person%402x.png" />
<EmbeddedResource Include="IconsAndLogos\locked-by-person.png" />
<EmbeddedResource Include="IconsAndLogos\locked-modified%402x.png" />
<EmbeddedResource Include="IconsAndLogos\locked-modified.png" />
<EmbeddedResource Include="IconsAndLogos\locked-removed%402x.png" />
<EmbeddedResource Include="IconsAndLogos\locked-removed.png" />
<EmbeddedResource Include="IconsAndLogos\locked.png" />
<EmbeddedResource Include="IconsAndLogos\modified%402x.png" />
<EmbeddedResource Include="IconsAndLogos\modified.png" />
<EmbeddedResource Include="IconsAndLogos\moved%402x.png" />
<EmbeddedResource Include="IconsAndLogos\moved.png" />
<EmbeddedResource Include="IconsAndLogos\removed%402x.png" />
<EmbeddedResource Include="IconsAndLogos\removed.png" />
<EmbeddedResource Include="IconsAndLogos\repo%402x.png" />
<EmbeddedResource Include="IconsAndLogos\repo-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\repo-light.png" />
<EmbeddedResource Include="IconsAndLogos\repo.png" />
<EmbeddedResource Include="IconsAndLogos\small-logo%402x.png" />
<EmbeddedResource Include="IconsAndLogos\small-logo-light%402x.png" />
<EmbeddedResource Include="IconsAndLogos\small-logo-light.png" />
<EmbeddedResource Include="IconsAndLogos\small-logo.png" />
<EmbeddedResource Include="IconsAndLogos\tracked-branch-indicator.png" />
<EmbeddedResource Include="IconsAndLogos\untracked%402x.png" />
<EmbeddedResource Include="IconsAndLogos\untracked.png" />
</ItemGroup>
<ItemGroup>
<None Include="$(SolutionDir)EULA.txt">
Expand Down
1 change: 1 addition & 0 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=helpers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=icons/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=iconsandlogos/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=io/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=logging/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=misc/@EntryIndexedValue">True</s:Boolean>
Expand Down
0 ...ssets/Editor/GitHub.Unity/Icons/added.png → ...itor/GitHub.Unity/IconsAndLogos/added.png
View file
File renamed without changes
0 ...ts/Editor/GitHub.Unity/Icons/added@2x.png → ...r/GitHub.Unity/IconsAndLogos/added@2x.png
View file
File renamed without changes
0 ...tor/GitHub.Unity/Icons/big-logo-light.png → ...ub.Unity/IconsAndLogos/big-logo-light.png
View file
File renamed without changes
0 .../GitHub.Unity/Icons/big-logo-light@2x.png → ...Unity/IconsAndLogos/big-logo-light@2x.png
View file
File renamed without changes
0 ...ts/Editor/GitHub.Unity/Icons/big-logo.png → ...r/GitHub.Unity/IconsAndLogos/big-logo.png
View file
File renamed without changes
0 ...Editor/GitHub.Unity/Icons/big-logo@2x.png → ...itHub.Unity/IconsAndLogos/big-logo@2x.png
View file
File renamed without changes
0 ...ditor/GitHub.Unity/Icons/branch-light.png → ...tHub.Unity/IconsAndLogos/branch-light.png
View file
File renamed without changes
0 ...or/GitHub.Unity/Icons/branch-light@2x.png → ...b.Unity/IconsAndLogos/branch-light@2x.png
View file
File renamed without changes
0 ...sets/Editor/GitHub.Unity/Icons/branch.png → ...tor/GitHub.Unity/IconsAndLogos/branch.png
View file
File renamed without changes
0 ...s/Editor/GitHub.Unity/Icons/branch@2x.png → .../GitHub.Unity/IconsAndLogos/branch@2x.png
View file
File renamed without changes
0 .../Editor/GitHub.Unity/Icons/conflicted.png → ...GitHub.Unity/IconsAndLogos/conflicted.png
View file
File renamed without changes
0 ...itor/GitHub.Unity/Icons/conflicted@2x.png → ...Hub.Unity/IconsAndLogos/conflicted@2x.png
View file
File renamed without changes
0 .../Icons/current-branch-indicator-light.png → ...dLogos/current-branch-indicator-light.png
View file
File renamed without changes
0 ...ons/current-branch-indicator-light@2x.png → ...gos/current-branch-indicator-light@2x.png
View file
File renamed without changes
0 ....Unity/Icons/current-branch-indicator.png → ...consAndLogos/current-branch-indicator.png
View file
File renamed without changes
0 ...ity/Icons/current-branch-indicator@2x.png → ...sAndLogos/current-branch-indicator@2x.png
View file
File renamed without changes
0 ...s/Editor/GitHub.Unity/Icons/dot-light.png → .../GitHub.Unity/IconsAndLogos/dot-light.png
View file
File renamed without changes
0 ...ditor/GitHub.Unity/Icons/dot-light@2x.png → ...tHub.Unity/IconsAndLogos/dot-light@2x.png
View file
File renamed without changes
0 .../Assets/Editor/GitHub.Unity/Icons/dot.png → ...Editor/GitHub.Unity/IconsAndLogos/dot.png
View file
File renamed without changes
0 ...sets/Editor/GitHub.Unity/Icons/dot@2x.png → ...tor/GitHub.Unity/IconsAndLogos/dot@2x.png
View file
File renamed without changes
0 ...GitHub.Unity/Icons/dropdown-list-icon.png → ...nity/IconsAndLogos/dropdown-list-icon.png
View file
File renamed without changes
0 ...Hub.Unity/Icons/dropdown-list-icon@2x.png → ...y/IconsAndLogos/dropdown-list-icon@2x.png
View file
File renamed without changes
0 ...Unity/Icons/favorite-branch-indicator.png → ...onsAndLogos/favorite-branch-indicator.png
View file
File renamed without changes
0 ...or/GitHub.Unity/Icons/git-merge-light.png → ...b.Unity/IconsAndLogos/git-merge-light.png
View file
File renamed without changes
0 ...GitHub.Unity/Icons/git-merge-light@2x.png → ...nity/IconsAndLogos/git-merge-light@2x.png
View file
File renamed without changes
0 ...s/Editor/GitHub.Unity/Icons/git-merge.png → .../GitHub.Unity/IconsAndLogos/git-merge.png
View file
File renamed without changes
0 ...ditor/GitHub.Unity/Icons/git-merge@2x.png → ...tHub.Unity/IconsAndLogos/git-merge@2x.png
View file
File renamed without changes
0 .../GitHub.Unity/Icons/local-commit-icon.png → ...Unity/IconsAndLogos/local-commit-icon.png
View file
File renamed without changes
0 ...tHub.Unity/Icons/local-commit-icon@2x.png → ...ty/IconsAndLogos/local-commit-icon@2x.png
View file
File renamed without changes
0 ...GitHub.Unity/Icons/local-commit-light.png → ...nity/IconsAndLogos/local-commit-light.png
View file
File renamed without changes
0 ...Hub.Unity/Icons/local-commit-light@2x.png → ...y/IconsAndLogos/local-commit-light@2x.png
View file
File renamed without changes
0 ...ditor/GitHub.Unity/Icons/local-commit.png → ...tHub.Unity/IconsAndLogos/local-commit.png
View file
File renamed without changes
0 ...or/GitHub.Unity/Icons/local-commit@2x.png → ...b.Unity/IconsAndLogos/local-commit@2x.png
View file
File renamed without changes
0 .../Editor/GitHub.Unity/Icons/lock-light.png → ...GitHub.Unity/IconsAndLogos/lock-light.png
View file
File renamed without changes
0 ...itor/GitHub.Unity/Icons/lock-light@2x.png → ...Hub.Unity/IconsAndLogos/lock-light@2x.png
View file
File renamed without changes
0 ...Assets/Editor/GitHub.Unity/Icons/lock.png → ...ditor/GitHub.Unity/IconsAndLogos/lock.png
View file
File renamed without changes
0 ...ets/Editor/GitHub.Unity/Icons/lock@2x.png → ...or/GitHub.Unity/IconsAndLogos/lock@2x.png
View file
File renamed without changes
0 ...r/GitHub.Unity/Icons/locked-by-person.png → ....Unity/IconsAndLogos/locked-by-person.png
View file
File renamed without changes
0 ...itHub.Unity/Icons/locked-by-person@2x.png → ...ity/IconsAndLogos/locked-by-person@2x.png
View file
File renamed without changes
0 ...or/GitHub.Unity/Icons/locked-modified.png → ...b.Unity/IconsAndLogos/locked-modified.png
View file
File renamed without changes
0 ...GitHub.Unity/Icons/locked-modified@2x.png → ...nity/IconsAndLogos/locked-modified@2x.png
View file
File renamed without changes
0 ...tor/GitHub.Unity/Icons/locked-removed.png → ...ub.Unity/IconsAndLogos/locked-removed.png
View file
File renamed without changes
0 .../GitHub.Unity/Icons/locked-removed@2x.png → ...Unity/IconsAndLogos/locked-removed@2x.png
View file
File renamed without changes
0 ...sets/Editor/GitHub.Unity/Icons/locked.png → ...tor/GitHub.Unity/IconsAndLogos/locked.png
View file
File renamed without changes
0 ...s/Editor/GitHub.Unity/Icons/locked@2x.png → .../GitHub.Unity/IconsAndLogos/locked@2x.png
View file
File renamed without changes
0 ...ts/Editor/GitHub.Unity/Icons/modified.png → ...r/GitHub.Unity/IconsAndLogos/modified.png
View file
File renamed without changes
0 ...Editor/GitHub.Unity/Icons/modified@2x.png → ...itHub.Unity/IconsAndLogos/modified@2x.png
View file
File renamed without changes
0 ...ssets/Editor/GitHub.Unity/Icons/moved.png → ...itor/GitHub.Unity/IconsAndLogos/moved.png
View file
File renamed without changes
0 ...ts/Editor/GitHub.Unity/Icons/moved@2x.png → ...r/GitHub.Unity/IconsAndLogos/moved@2x.png
View file
File renamed without changes
0 ...ets/Editor/GitHub.Unity/Icons/removed.png → ...or/GitHub.Unity/IconsAndLogos/removed.png
View file
File renamed without changes
0 .../Editor/GitHub.Unity/Icons/removed@2x.png → ...GitHub.Unity/IconsAndLogos/removed@2x.png
View file
File renamed without changes
0 .../Editor/GitHub.Unity/Icons/repo-light.png → ...GitHub.Unity/IconsAndLogos/repo-light.png
View file
File renamed without changes
0 ...itor/GitHub.Unity/Icons/repo-light@2x.png → ...Hub.Unity/IconsAndLogos/repo-light@2x.png
View file
File renamed without changes
0 ...Assets/Editor/GitHub.Unity/Icons/repo.png → ...ditor/GitHub.Unity/IconsAndLogos/repo.png
View file
File renamed without changes
0 ...ets/Editor/GitHub.Unity/Icons/repo@2x.png → ...or/GitHub.Unity/IconsAndLogos/repo@2x.png
View file
File renamed without changes
0 ...r/GitHub.Unity/Icons/small-logo-light.png → ....Unity/IconsAndLogos/small-logo-light.png
View file
File renamed without changes
0 ...itHub.Unity/Icons/small-logo-light@2x.png → ...ity/IconsAndLogos/small-logo-light@2x.png
View file
File renamed without changes
0 .../Editor/GitHub.Unity/Icons/small-logo.png → ...GitHub.Unity/IconsAndLogos/small-logo.png
View file
File renamed without changes
0 ...itor/GitHub.Unity/Icons/small-logo@2x.png → ...Hub.Unity/IconsAndLogos/small-logo@2x.png
View file
File renamed without changes
0 ....Unity/Icons/tracked-branch-indicator.png → ...consAndLogos/tracked-branch-indicator.png
View file
File renamed without changes
0 ...s/Editor/GitHub.Unity/Icons/untracked.png → .../GitHub.Unity/IconsAndLogos/untracked.png
View file
File renamed without changes
0 ...ditor/GitHub.Unity/Icons/untracked@2x.png → ...tHub.Unity/IconsAndLogos/untracked@2x.png
View file
File renamed without changes
4 changes: 2 additions & 2 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ public static Texture2D GetIcon(string filename, string filename2x = "")
filename = filename2x;
}

var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("GitHub.Unity.Icons." + filename);
var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("GitHub.Unity.IconsAndLogos." + filename);
if (stream != null)
return stream.ToTexture2D();

var iconPath = ExtensionInstallPath.ToNPath().Combine("Icons", filename).ToString(SlashMode.Forward);
var iconPath = ExtensionInstallPath.ToNPath().Combine("IconsAndLogos", filename).ToString(SlashMode.Forward);
return AssetDatabase.LoadAssetAtPath<Texture2D>(iconPath);
}

Expand Down

0 comments on commit c58cd79

Please sign in to comment.