Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 2b49df3

Browse files
shanashana
committed
Move commands to submenu
1 parent 3228dc2 commit 2b49df3

File tree

5 files changed

+70
-10
lines changed

5 files changed

+70
-10
lines changed

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,14 @@
344344
<Resource Include="Resources\default_user_avatar.png" />
345345
</ItemGroup>
346346
<ItemGroup>
347+
<Page Include="Resources\icons\clippy.xaml">
348+
<Generator>MSBuild:Compile</Generator>
349+
<SubType>Designer</SubType>
350+
</Page>
351+
<Page Include="Resources\icons\link_external.xaml">
352+
<Generator>MSBuild:Compile</Generator>
353+
<SubType>Designer</SubType>
354+
</Page>
347355
<Page Include="Resources\icons\refresh.xaml">
348356
<Generator>MSBuild:Compile</Generator>
349357
<SubType>Designer</SubType>

‎src/GitHub.VisualStudio/GitHub.VisualStudio.imagemanifest‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<ID Name="arrow_right" Value="3" />
99
<ID Name="refresh" Value="4" />
1010
<ID Name="pullrequest" Value="5" />
11+
<ID Name="link_external" Value="6"/>
12+
<ID Name="clippy" Value="7"/>
1113
</Symbols>
1214

1315
<Images>
@@ -26,5 +28,11 @@
2628
<Image Guid="$(guidImages)" ID="$(pullrequest)">
2729
<Source Uri="$(Resources)/git_pull_request.xaml" />
2830
</Image>
31+
<Image Guid="$(guidImages)" ID="$(link_external)">
32+
<Source Uri="$(Resources)/link_external.xaml" />
33+
</Image>
34+
<Image Guid="$(guidImages)" ID="$(clippy)">
35+
<Source Uri="$(Resources)/clippy.xaml" />
36+
</Image>
2937
</Images>
3038
</ImageManifest>

‎src/GitHub.VisualStudio/GitHub.VisualStudio.vsct‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@
3838
<Parent guid="guidGitHubToolbarCmdSet" id="idGitHubToolbar" />
3939
</Group>
4040

41-
<Group guid="guidContextMenuSet" id="idContextMenuGroup">
41+
<Group guid="guidContextMenuSet" id="idGitHubContextMenuGroup">
42+
</Group>
43+
44+
<Group guid="guidContextMenuSet" id="idGitHubContextSubMenuGroup" priority="0x0000">
45+
<Parent guid="guidContextMenuSet" id="idGitHubContextMenu"/>
4246
</Group>
4347

4448
</Groups>
@@ -51,6 +55,14 @@
5155
</Strings>
5256
</Menu>
5357

58+
<Menu guid="guidContextMenuSet" id="idGitHubContextMenu" priority="0x200" type="Menu">
59+
<Parent guid="guidContextMenuSet" id="idGitHubContextMenuGroup" />
60+
<Strings>
61+
<ButtonText>GitHub</ButtonText>
62+
<CommandName>GitHub</CommandName>
63+
</Strings>
64+
</Menu>
65+
5466
</Menus>
5567

5668
<!--Buttons section. -->
@@ -121,8 +133,8 @@
121133
</Button>
122134

123135
<Button guid="guidContextMenuSet" id="openLinkCommand" priority="0x0100" type="Button">
124-
<Parent guid="guidContextMenuSet" id="idContextMenuGroup"/>
125-
<Icon guid="guidImages" id="logo" />
136+
<Parent guid="guidContextMenuSet" id="idGitHubContextSubMenuGroup"/>
137+
<Icon guid="guidImages" id="link_external" />
126138
<CommandFlag>IconIsMoniker</CommandFlag>
127139
<CommandFlag>DefaultInvisible</CommandFlag>
128140
<CommandFlag>DynamicVisibility</CommandFlag>
@@ -132,8 +144,8 @@
132144
</Button>
133145

134146
<Button guid="guidContextMenuSet" id="copyLinkCommand" priority="0x0101" type="Button">
135-
<Parent guid="guidContextMenuSet" id="idContextMenuGroup"/>
136-
<Icon guid="guidImages" id="logo" />
147+
<Parent guid="guidContextMenuSet" id="idGitHubContextSubMenuGroup"/>
148+
<Icon guid="guidImages" id="clippy" />
137149
<CommandFlag>IconIsMoniker</CommandFlag>
138150
<CommandFlag>DefaultInvisible</CommandFlag>
139151
<CommandFlag>DynamicVisibility</CommandFlag>
@@ -146,19 +158,19 @@
146158
</Commands>
147159

148160
<CommandPlacements>
149-
<CommandPlacement guid="guidContextMenuSet" id="idContextMenuGroup" priority="0x1000">
161+
<CommandPlacement guid="guidContextMenuSet" id="idGitHubContextMenuGroup" priority="0x1000">
150162
<Parent guid="GUID_XAML_EDITOR" id="ID_XAML_CTXT"/>
151163
</CommandPlacement>
152164

153-
<CommandPlacement guid="guidContextMenuSet" id="idContextMenuGroup" priority="0x1000">
165+
<CommandPlacement guid="guidContextMenuSet" id="idGitHubContextMenuGroup" priority="0x1000">
154166
<Parent guid="GUID_HTML_EDITOR" id="ID_HTML_CTXT"/>
155167
</CommandPlacement>
156168

157-
<CommandPlacement guid="guidContextMenuSet" id="idContextMenuGroup" priority="0x1000">
169+
<CommandPlacement guid="guidContextMenuSet" id="idGitHubContextMenuGroup" priority="0x1000">
158170
<Parent guid="GUID_JSON_EDITOR" id="ID_JSON_CTXT"/>
159171
</CommandPlacement>
160172

161-
<CommandPlacement guid="guidContextMenuSet" id="idContextMenuGroup" priority="0x1000">
173+
<CommandPlacement guid="guidContextMenuSet" id="idGitHubContextMenuGroup" priority="0x1000">
162174
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_CODEWIN"/>
163175
</CommandPlacement>
164176
</CommandPlacements>
@@ -186,6 +198,8 @@
186198
<IDSymbol name="arrow_right" value="3" />
187199
<IDSymbol name="refresh" value="4" />
188200
<IDSymbol name="pullrequest" value="5" />
201+
<IDSymbol name="link_external" value="6"/>
202+
<IDSymbol name="clippy" value="7"/>
189203
</GuidSymbol>
190204

191205
<GuidSymbol name="guidGitHubToolbarCmdSet" value="{C5F1193E-F300-41B3-B4C4-5A703DD3C1C6}">
@@ -199,7 +213,9 @@
199213
</GuidSymbol>
200214

201215
<GuidSymbol name="guidContextMenuSet" value="{31057D08-8C3C-4C5B-9F91-8682EA08EC27}">
202-
<IDSymbol name="idContextMenuGroup" value="0x1010" />
216+
<IDSymbol name="idGitHubContextMenu" value="0x1000" />
217+
<IDSymbol name="idGitHubContextMenuGroup" value="0x1001" />
218+
<IDSymbol name="idGitHubContextSubMenuGroup" value="0x1002" />
203219
<IDSymbol name="openLinkCommand" value="0x100" />
204220
<IDSymbol name="copyLinkCommand" value="0x101"/>
205221
</GuidSymbol>

‎src/GitHub.VisualStudio/Resources/icons/clippy.xaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
3+
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
4+
<Viewbox.Resources>
5+
<ResourceDictionary>
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
9+
</ResourceDictionary>
10+
</Viewbox.Resources>
11+
<ui:OcticonImage Icon="clippy"
12+
VerticalAlignment="Center"
13+
Background="{DynamicResource VsBrush.ActiveBorder}" />
14+
</Viewbox>

‎src/GitHub.VisualStudio/Resources/icons/link_external.xaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
3+
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
4+
<Viewbox.Resources>
5+
<ResourceDictionary>
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
9+
</ResourceDictionary>
10+
</Viewbox.Resources>
11+
<ui:OcticonImage Icon="link_external"
12+
VerticalAlignment="Center"
13+
Background="{DynamicResource VsBrush.ActiveBorder}" />
14+
</Viewbox>

0 commit comments

Comments
 (0)