Skip to content

Commit 3895e59

Browse files
sboulemasboulema
committed
#12: Start implementing Image Service and Catalog
1 parent 39d788a commit 3895e59

File tree

9 files changed

+129
-30
lines changed

9 files changed

+129
-30
lines changed

‎TGit/IconMappings.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,1,d53d7256-d44d-4245-bdd2-bfd22943659c,1
2+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,2,d53d7256-d44d-4245-bdd2-bfd22943659c,1
3+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,3,d53d7256-d44d-4245-bdd2-bfd22943659c,1
4+
fec49b6d-c04a-42bd-b021-b8b2e5cfb291,4,d53d7256-d44d-4245-bdd2-bfd22943659c,1

‎TGit/Images.imagemanifest

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!--
3+
This file defines icon ID's and which image files they correspond to. This file is used in
4+
conjunction with the CustomMoniker.vsct file to provide the necessary data to display your
5+
custom moniker in menu buttons, toolbars, etc.
6+
-->
7+
<ImageManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/VisualStudio/ImageManifestSchema/2014">
8+
<Symbols>
9+
<String Name="Resources" Value="/TGit;Component/Resources/Images" />
10+
<Guid Name="CustomMoniker" Value="{d53d7256-d44d-4245-bdd2-bfd22943659c}" />
11+
<ID Name="Branch" Value="1" />
12+
</Symbols>
13+
<Images>
14+
<Image Guid="$(CustomMoniker)" ID="$(Branch)">
15+
<Source Uri="$(Resources)/Branch_16.png">
16+
<Size Value="16" />
17+
</Source>
18+
</Image>
19+
</Images>
20+
<ImageLists />
21+
</ImageManifest>

‎TGit/Images.vsct

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!--
3+
This file defines the Guid data for the custom monikers and the ID symbols for individual
4+
icons. This file is used in conjunction with the imagemanifest file to provide the necessary
5+
data to display your custom icons in menu buttons, toolbars, etc.
6+
-->
7+
8+
<!--
9+
NOTE: This content does not have to be in a separate .vsct file, the Symbols for the custom
10+
monikers can be defined in the main .vsct file. Additional file added here for demonstrative
11+
purposes.
12+
-->
13+
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable">
14+
<Symbols>
15+
<GuidSymbol name="CustomMoniker" value="{d53d7256-d44d-4245-bdd2-bfd22943659c}">
16+
<IDSymbol name="Branch" value="1" />
17+
</GuidSymbol>
18+
</Symbols>
19+
</CommandTable>

‎TGit/Options.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System;
33
using System.ComponentModel;
44
using System.Runtime.InteropServices;
5+
// ReSharper disable InconsistentNaming
56

67
namespace SamirBoulema.TGit
78
{

‎TGit/Resources/Images/Branch_16.png

420 Bytes
Loading

‎TGit/TGIT.csproj

Lines changed: 65 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<NuGetPackageImportStamp>
3030
</NuGetPackageImportStamp>
3131
</PropertyGroup>
32+
<PropertyGroup>
33+
<ApplicationManifest>Images.imagemanifest</ApplicationManifest>
34+
</PropertyGroup>
3235
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
3336
<PropertyGroup>
3437
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -75,34 +78,46 @@
7578
<HintPath>..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
7679
<Private>False</Private>
7780
</Reference>
81+
<Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.14.3.25407\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
83+
<Private>True</Private>
84+
</Reference>
85+
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
87+
<Private>True</Private>
88+
</Reference>
89+
<Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90+
<EmbedInteropTypes>True</EmbedInteropTypes>
91+
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.25407\lib\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath>
92+
<Private>True</Private>
93+
</Reference>
7894
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
79-
<Private>False</Private>
80-
<HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
95+
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
96+
<Private>True</Private>
8197
</Reference>
82-
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
85-
<Private>False</Private>
98+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
99+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
100+
<Private>True</Private>
86101
</Reference>
87102
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<Private>False</Private>
89-
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
103+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
104+
<Private>True</Private>
90105
</Reference>
91106
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92-
<Private>False</Private>
93-
<HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
107+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
108+
<Private>True</Private>
94109
</Reference>
95110
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96-
<Private>False</Private>
97-
<HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
111+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
112+
<Private>True</Private>
98113
</Reference>
99-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
100-
<Private>False</Private>
101-
<HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
114+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
115+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
116+
<Private>True</Private>
102117
</Reference>
103-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
104-
<Private>False</Private>
105-
<HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
118+
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
119+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
120+
<Private>True</Private>
106121
</Reference>
107122
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
108123
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">
@@ -111,22 +126,33 @@
111126
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0">
112127
<EmbedInteropTypes>true</EmbedInteropTypes>
113128
</Reference>
129+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
131+
<Private>True</Private>
132+
</Reference>
114133
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
115-
<Private>False</Private>
116-
<HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
134+
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
135+
<Private>True</Private>
117136
</Reference>
118137
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
119-
<Private>False</Private>
120-
<HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
138+
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
139+
<Private>True</Private>
121140
</Reference>
122141
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
123-
<Private>False</Private>
124-
<HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
142+
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
143+
<Private>True</Private>
125144
</Reference>
126-
<Reference Include="Microsoft.VisualStudio.Threading, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
127-
<SpecificVersion>False</SpecificVersion>
128-
<HintPath>..\packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
129-
<Private>False</Private>
145+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
146+
<HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
147+
<Private>True</Private>
148+
</Reference>
149+
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
150+
<HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
151+
<Private>True</Private>
152+
</Reference>
153+
<Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154+
<HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
155+
<Private>True</Private>
130156
</Reference>
131157
<Reference Include="PresentationCore" />
132158
<Reference Include="PresentationFramework" />
@@ -196,6 +222,15 @@
196222
</EmbeddedResource>
197223
</ItemGroup>
198224
<ItemGroup>
225+
<Content Include="Images.vsct">
226+
<SubType>Designer</SubType>
227+
</Content>
228+
<Content Include="IconMappings.csv">
229+
<IncludeInVSIX>true</IncludeInVSIX>
230+
</Content>
231+
<Content Include="Images.imagemanifest">
232+
<IncludeInVSIX>true</IncludeInVSIX>
233+
</Content>
199234
<None Include="packages.config" />
200235
<None Include="source.extension.vsixmanifest">
201236
<SubType>Designer</SubType>
@@ -211,6 +246,7 @@
211246
</VSCTCompile>
212247
</ItemGroup>
213248
<ItemGroup>
249+
<Resource Include="Resources\Images\branch_16.png" />
214250
<Resource Include="Resources\octicons.png" />
215251
<Content Include="Resources\License.txt">
216252
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -237,6 +273,7 @@
237273
<Install>false</Install>
238274
</BootstrapperPackage>
239275
</ItemGroup>
276+
<ItemGroup />
240277
<PropertyGroup>
241278
<UseCodebase>true</UseCodebase>
242279
</PropertyGroup>

‎TGit/TGIT.vsct

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
33
<Extern href="stdidcmd.h"/>
44
<Extern href="vsshlids.h"/>
5+
<Include href="Images.vsct"/>
56

67
<Commands package="guidTGitPkg">
78
<Menus>

‎TGit/TGITPackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace SamirBoulema.TGit
1010
{
1111
[PackageRegistration(UseManagedResourcesOnly = true)]
1212
[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
13-
[ProvideMenuResource("Menus.ctmenu", 1)]
13+
[ProvideMenuResource("Menus.ctmenu", 1, IconMappingFilename = "IconMappings.csv")]
1414
[Guid(GuidList.GuidTgitPkgString)]
1515
[ProvideAutoLoad(UIContextGuids80.NoSolution)]
1616
[ProvideOptionPage(typeof(OptionPageGrid), "TGit", "General", 0, 0, true)]

‎TGit/packages.config

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" targetFramework="net45" />
4+
<package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net45" />
5+
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.25407" targetFramework="net45" />
6+
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net45" />
7+
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net45" />
8+
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net45" />
9+
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net45" />
10+
<package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net45" />
11+
<package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net45" />
12+
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net45" />
13+
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net45" />
14+
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net45" />
15+
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net45" />
16+
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net45" />
17+
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net45" />
18+
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net45" />
19+
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net45" />
320
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
421
<package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net45" />
522
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
@@ -9,7 +26,6 @@
926
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
1027
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
1128
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
12-
<package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net45" />
1329
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
1430
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
1531
<package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net45" />

0 commit comments

Comments
 (0)