Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7e3b7e0

Browse files
committed
localize .vsct files
Also fold `fsiCommands.vsct` into `MenusAndCommands.vsct` since that's the only place it's used.
1 parent2a48921 commit7e3b7e0

File tree

27 files changed

+3719
-323
lines changed

27 files changed

+3719
-323
lines changed

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@
6969
<packageid="StrawberryPerl64"version="5.22.2.1" />
7070

7171
<!-- Xliff localization-->
72-
<packageid="XliffTasks"version="0.2.0-beta-000070" />
72+
<packageid="XliffTasks"version="0.2.0-beta-000072" />
7373

7474
</packages>

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<!-- Localization-->
5454
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
55-
<XliffTasksVersion>0.2.0-beta-000070</XliffTasksVersion>
55+
<XliffTasksVersion>0.2.0-beta-000072</XliffTasksVersion>
5656
</PropertyGroup>
5757

5858
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">

‎vsintegration/src/FSharp.ProjectSystem.FSharp/MenusAndCommands.vsct‎

Lines changed: 188 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,50 @@
33
<CommandTablexmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable">
44
<Externhref="stdidcmd.h"/>
55
<Externhref="vsshlids.h"/>
6-
<Includehref="..\FSharp.VS.FSI\fsiCommands.vsct"/><!-- FSI-LINKAGE-POINT-->
76
<Includehref="KnownImageIds.vsct"/>
87

98
<!-- Stake a claime to existing commands so they aren't marked as unused and removed.-->
109
<UsedCommands>
10+
<UsedCommandguid="guidVSStd97"id="cmdidCut"/>
11+
<UsedCommandguid="guidVSStd97"id="cmdidCopy"/>
12+
<UsedCommandguid="guidVSStd97"id="cmdidPaste"/>
13+
<UsedCommandguid="guidVSStd97"id="cmdidClearPane"/>
1114
<UsedCommandguid="guidVSStd2K"id="ECMD_ADDREFERENCE" />
1215
<UsedCommandguid="guidVSStd2K"id="ECMD_ADDREFERENCECTX" />
1316
</UsedCommands>
1417

1518
<CommandPlacements>
19+
<CommandPlacementguid="guidVSStd97"id="cmdidCut"priority="0x0100">
20+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleEditGrp"/>
21+
</CommandPlacement>
22+
<CommandPlacementguid="guidVSStd97"id="cmdidCopy"priority="0x0300">
23+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleEditGrp"/>
24+
</CommandPlacement>
25+
<CommandPlacementguid="guidVSStd97"id="cmdidPaste"priority="0x0500">
26+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleEditGrp"/>
27+
</CommandPlacement>
28+
<!-- Context menu, clear group-->
29+
<!-- uncomment here to add standard VS "WordWrap" toggle command to the context menu (note, it indicates toggle status with a box around the icon)
30+
<CommandPlacement guid="GUID_CMDSETID_StandardCommandSet2K" id="ECMD_TOGGLEWORDWRAP" priority="0x0100">
31+
<Parent guid="guidFsiConsoleCmdSet" id="FsiConsoleClearGrp"/>
32+
</CommandPlacement>
33+
-->
34+
<CommandPlacementguid="guidVSStd97"id="cmdidClearPane"priority="0x0200">
35+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleClearGrp"/>
36+
</CommandPlacement>
37+
<!-- Context menu, session group-->
38+
<CommandPlacementguid="guidVSStd11"id="cmdidInteractiveSessionInterrupt"priority="0x0100">
39+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleSessionsGrp"/>
40+
</CommandPlacement>
41+
<CommandPlacementguid="guidVSStd11"id="cmdidInteractiveSessionRestart"priority="0x0300">
42+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleSessionsGrp"/>
43+
</CommandPlacement>
44+
<CommandPlacementguid="guidFsiConsoleCmdSet"id="cmdidAttachDebugger"priority="0x0700">
45+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleSessionsGrp"/>
46+
</CommandPlacement>
47+
<CommandPlacementguid="guidFsiConsoleCmdSet"id="cmdidDetachDebugger"priority="0x0800">
48+
<Parentguid="guidFsiConsoleCmdSet"id="FsiConsoleSessionsGrp"/>
49+
</CommandPlacement>
1650
<CommandPlacement guid ="FSharpProjectCmdSet" id ="MyFSharpGroup" priority ="0x100">
1751
<Parent guid ="guidSHLMainMenu" id ="IDM_VS_CTXT_ITEMNODE" />
1852
</CommandPlacement>
@@ -35,7 +69,33 @@
3569
<Parentguid="guidSHLMainMenu"id="IDM_VS_CTXT_PROJNODE"/>
3670
</CommandPlacement>
3771
</CommandPlacements>
38-
72+
73+
<Commandspackage="guidFsiPkg">
74+
<Groups>
75+
<Groupguid="guidFsiPackageCmdSet"id="MyMenuGroup"priority="0x0600">
76+
<Parentguid="guidSHLMainMenu"id="IDM_VS_MENU_TOOLS"/>
77+
</Group>
78+
<Groupguid="guidFsiConsoleCmdSet"id="FsiConsoleSessionsGrp"priority="0x100">
79+
<Parentguid="guidFsiConsoleCmdSet"id="cmdIDFsiConsoleContextMenu"/>
80+
</Group>
81+
<Groupguid="guidFsiConsoleCmdSet"id="FsiConsoleEditGrp"priority="0x200">
82+
<Parentguid="guidFsiConsoleCmdSet"id="cmdIDFsiConsoleContextMenu"/>
83+
</Group>
84+
<Groupguid="guidFsiConsoleCmdSet"id="FsiConsoleClearGrp"priority="0x300">
85+
<Parentguid="guidFsiConsoleCmdSet"id="cmdIDFsiConsoleContextMenu"/>
86+
</Group>
87+
</Groups>
88+
<Menus>
89+
<Menuguid="guidFsiConsoleCmdSet"id="cmdIDFsiConsoleContextMenu"priority="0x0000"type="Context">
90+
<Parentguid="guidFsiConsoleCmdSet"id="0"/>
91+
<Strings>
92+
<ButtonText>FSI Console Context</ButtonText>
93+
<CommandName>FSI Console Context</CommandName>
94+
</Strings>
95+
</Menu>
96+
</Menus>
97+
</Commands>
98+
3999
<Commands package ="FSharpProjectPackage">
40100
<Groups>
41101
<Group guid ="FSharpProjectCmdSet" id ="MyFSharpGroup" priority ="0x100" />
@@ -45,7 +105,7 @@
45105
<Groupguid="FSharpProjectCmdSet"id="FSharpSendReferencesToInteractiveGroup"priority="0x105" />
46106
<Groupguid="FSharpProjectCmdSet"id="FSharpSendProjectOutputToInteractiveGroup"priority="0x105" />
47107
</Groups>
48-
<Menus>
108+
<Menus>
49109
<Menu guid ="FSharpProjectCmdSet" id ="FSharpAddBelowMenu" priority ="0x305" type ="Menu">
50110
<Parentguid="FSharpProjectCmdSet"id="MyFSharpGroup"/>
51111
<Strings>
@@ -64,6 +124,49 @@
64124
</Menu>
65125
</Menus>
66126
<Buttons>
127+
<Buttonguid="guidFsiPackageCmdSet"id="cmdidFsiToolWindow"priority="0x8000"type="Button"><!-- low priority-->
128+
<Parentguid="guidSHLMainMenu"id="IDG_VS_WNDO_OTRWNDWS1"/>
129+
<!-- Icon guid="guidImages" id="bmpPic2" /-->
130+
<Iconguid="guidFsiConsoleBmp"id="bmpConsole" />
131+
<Strings>
132+
<CommandName>FSharp.Interactive.ToolWindow</CommandName>
133+
<ButtonText>F# Interactive</ButtonText>
134+
</Strings>
135+
</Button>
136+
137+
<!-- In Dev11+, shell now has
138+
<Button guid ="guidVSStd11" id ="cmdidInteractiveSessionInterrupt" priority ="0x100" type ="Button">
139+
<Button guid ="guidVSStd11" id ="cmdidInteractiveSessionRestart" priority ="0x105" type ="Button">
140+
-->
141+
<Buttonguid="guidFsiConsoleCmdSet"id="cmdidAttachDebugger"priority="0x0100"type="Button">
142+
<Strings>
143+
<CommandName>FSharp.Interactive.AttachDebugger</CommandName>
144+
<ButtonText>Start Debugging</ButtonText>
145+
</Strings>
146+
<CommandFlag>DynamicVisibility | DefaultInvisible</CommandFlag>
147+
</Button>
148+
149+
<Buttonguid="guidFsiConsoleCmdSet"id="cmdidDetachDebugger"priority="0x0101"type="Button">
150+
<Strings>
151+
<CommandName>FSharp.Interactive.DetachDebugger</CommandName>
152+
<ButtonText>Stop Debugging</ButtonText>
153+
</Strings>
154+
<CommandFlag>DynamicVisibility | DefaultInvisible</CommandFlag>
155+
</Button>
156+
157+
<!-- The following places a button on the F# Editor Context Menu-->
158+
<!-- In Dev11+, shell now has
159+
<Button guid ="guidVSStd11" id ="cmdidExecuteSelectionInInteractive" priority ="0x100" type ="Button">
160+
-->
161+
<Button guid ="guidInteractive" id ="cmdidDebugSelection" priority ="0x106" type ="Button">
162+
<Parentguid="guidSHLMainMenu"id="IDG_VS_CODEWIN_LANGUAGE"/>
163+
<Strings>
164+
<ButtonText>Debug In Interactive</ButtonText>
165+
<CommandName>Interactive.Debug.Selection.Context</CommandName>
166+
</Strings>
167+
<CommandFlag>DynamicVisibility | DefaultInvisible</CommandFlag>
168+
</Button>
169+
67170
<Button guid ="FSharpProjectCmdSet" id ="FSharpSendThisReferenceToInteractiveCmd" priority ="0x100" type ="Button">
68171
<Parent guid ="FSharpProjectCmdSet" id ="FSharpSendThisReferenceToInteractiveGroup"/>
69172
<CommandFlag>DynamicVisibility</CommandFlag>
@@ -204,15 +307,97 @@
204307
</Button>
205308
</Buttons>
206309
<Bitmaps>
310+
<Bitmapguid="guidImages"href="Resources\Images_32bit.bmp"usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>
311+
<Bitmapguid="guidFsiConsoleBmp"href="Resources\TabIcon.png" />
312+
<Bitmapguid="guidCancelEvaluationBmp"href="Resources\CancelEvaluation.bmp"usedList="bmpConsole"/>
313+
<Bitmapguid="guidResetSessionBmp"href="Resources\ResetSession.bmp"usedList="bmpConsole"/>
207314
<Bitmapguid="FSharpMoveUpBmp"href="Resources\MoveUp.bmp"usedList="moveUp"/>
208315
<Bitmapguid="FSharpMoveDownBmp"href="Resources\MoveDown.bmp"usedList="moveDown"/>
209316
</Bitmaps>
210317
</Commands>
211318
<KeyBindings>
319+
<KeyBinding guid ="guidVSStd11" id ="cmdidExecuteSelectionInInteractive"editor="guidFSharpEditorFactory"key1="VK_RETURN"mod1="Alt" />
320+
<KeyBinding guid ="guidVSStd11" id ="cmdidExecuteLineInInteractive"editor="guidFSharpEditorFactory"key1="VK_OEM_7"mod1="Alt" />
321+
322+
<!-- CRTL-ALT-F for FSI window - following similar bindings for "other windows"-->
323+
<KeyBindingguid="guidFsiPackageCmdSet"id="cmdidFsiToolWindow"editor="guidVSStd97"key1="F"mod1="Control Alt" />
324+
325+
<!-- CRTL-Break when in FSI ToolWindow is Interrupt-->
326+
<KeyBindingguid="guidVSStd11"id="cmdidInteractiveSessionInterrupt"editor="guidFsiToolWindow"key1="VK_CANCEL"mod1="Control" />
327+
328+
<!-- CRTL-Alt-R when in FSI ToolWindow is Reset-->
329+
<KeyBindingguid="guidVSStd11"id="cmdidInteractiveSessionRestart"editor="guidFsiToolWindow"key1="R"mod1="Control Alt" />
330+
331+
<!-- CRTL-Alt-C when in FSI ToolWindow is Clear All-->
332+
<KeyBindingguid="guidVSStd97"id="cmdidClearPane"editor="guidFsiToolWindow"key1="C"mod1="Control Alt" />
333+
334+
<!-- CRTL-Alt-D when in FSI ToolWindow is attach debugger-->
335+
<KeyBindingguid="guidFsiConsoleCmdSet"id="cmdidAttachDebugger"editor="guidFsiToolWindow"key1="D"mod1="Control Alt" />
336+
337+
<!-- CRTL-Shift-D when in FSI ToolWindow is detach debugger-->
338+
<KeyBindingguid="guidFsiConsoleCmdSet"id="cmdidDetachDebugger"editor="guidFsiToolWindow"key1="D"mod1="Control Shift" />
212339
<KeyBindingguid="FSharpProjectCmdSet"id="MoveUpCmd"editor="SlnExplorerGuid"key1="VK_UP"mod1="Alt" />
213340
<KeyBindingguid="FSharpProjectCmdSet"id="MoveDownCmd"editor="SlnExplorerGuid"key1="VK_DOWN"mod1="Alt" />
214341
</KeyBindings>
215342
<Symbols>
343+
<!-- FSI-LINKAGE-POINT: choose the right package guid.-->
344+
<!-- GuidSymbol name="guidFsiPkg" value="{eeeeeeee-9342-42f1-8ea9-42f0e8a6be55}" /--><!-- fsi package guid-->
345+
<GuidSymbolname="guidFsiPkg"value="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" /><!-- project system guid-->
346+
347+
<GuidSymbolname="guidEditorFactory"value="{4EB7CCB7-4336-4FFD-B12B-396E9FD079A9}" /><!-- Linked to constants in project system-->
348+
<GuidSymbolname="guidFSharpEditorFactory"value="{8a5aa6cf-46e3-4520-a70a-7393d15233e9}" /><!-- FSharpEditorFactory Guid-->
349+
<GuidSymbolname="GUID_CMDSETID_StandardCommandSet2K"value="{1496A755-94DE-11D0-8C3F-00C04FC2AAE2}" /><!-- See stdidcmd.h-->
350+
<GuidSymbolname="guidFsiToolWindow"value="{dee22b65-9761-4a26-8fb2-759b971d6dfc}" />
351+
<GuidSymbolname="guidFsharpEditorUIContext"value="{63492653-460B-4bcc-B57B-233FD0F1F33D}" />
352+
<GuidSymbolname="guidFsharpLanguageService"value="{BC6DD5A5-D4D6-4dab-A00D-A51242DBAF1B}" />
353+
354+
<!-- This is the guid used to group the menu commands together-->
355+
<GuidSymbolname="guidFsiPackageCmdSet"value="{0be3b0d7-4fc2-45bf-a168-957e8a8834d0}">
356+
<IDSymbolname="MyMenuGroup"value="0x1020" />
357+
<IDSymbolname="cmdidFsiToolWindow"value="0x0101" />
358+
</GuidSymbol>
359+
360+
<GuidSymbolname="guidImages"value="{43ba0ca6-658b-43a7-8773-b5f9506b4335}" >
361+
<IDSymbolname="bmpPic1"value="1" />
362+
<IDSymbolname="bmpPic2"value="2" />
363+
<IDSymbolname="bmpPicSearch"value="3" />
364+
<IDSymbolname="bmpPicX"value="4" />
365+
<IDSymbolname="bmpPicArrows"value="5" />
366+
</GuidSymbol>
367+
368+
<GuidSymbolname="guidFsiConsoleCmdSet"value="{0E455B35-F2EB-431b-A0BE-B268D8A7D17F}" >
369+
<IDSymbolname="cmdIDFsiConsoleContextMenu"value="0x2100" />
370+
<IDSymbolname="MyMenuGroup"value="0x1020" />
371+
<IDSymbolname="FsiConsoleEditGrp"value="0x1030" />
372+
<IDSymbolname="FsiConsoleClearGrp"value="0x1040" />
373+
<IDSymbolname="FsiConsoleSessionsGrp"value="0x1050" />
374+
<IDSymbolname="cmdidFsiConsole"value="0x101" />
375+
<IDSymbolname="cmdidAttachDebugger"value="0x104" />
376+
<IDSymbolname="cmdidDetachDebugger"value="0x105" />
377+
</GuidSymbol>
378+
379+
<GuidSymbolname="guidFsiConsoleBmp"value="{01F8DC29-935A-4460-8D5D-F213B4CFA7EA}" >
380+
<IDSymbolname="bmpConsole"value="0x01" />
381+
</GuidSymbol>
382+
383+
<GuidSymbolname="guidCancelEvaluationBmp"value="{28D7068A-2B32-4CD0-AA0E-AB119744E7C0}" >
384+
<IDSymbolname="bmpConsole"value="0x01" />
385+
</GuidSymbol>
386+
387+
<GuidSymbolname="guidResetSessionBmp"value="{E8B33A9E-F5A0-492B-BB84-EC294A164CFD}" >
388+
<IDSymbolname="bmpConsole"value="0x01" />
389+
</GuidSymbol>
390+
391+
<GuidSymbolname="guidVSStd11"value="{D63DB1F0-404E-4B21-9648-CA8D99245EC3}" >
392+
<IDSymbolname="cmdidExecuteSelectionInInteractive" value ="0x018"/>
393+
<IDSymbolname="cmdidExecuteLineInInteractive" value ="0x019"/>
394+
<IDSymbolname="cmdidInteractiveSessionInterrupt" value ="0x01A"/>
395+
<IDSymbolname="cmdidInteractiveSessionRestart" value ="0x01B"/>
396+
</GuidSymbol>
397+
398+
<GuidSymbolname="guidInteractive"value="{8B9BF77B-AF94-4588-8847-2EB2BFFD29EB}" >
399+
<IDSymbolname="cmdidDebugSelection" value ="0x01"/>
400+
</GuidSymbol>
216401
<GuidSymbol name ="FSharpProjectPackage" value ="{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}" />
217402
<GuidSymbol name ="FSharpProjectCmdSet" value ="{75AC5611-A912-4195-8A65-457AE17416FB}">
218403
<IDSymbol name ="MyFSharpGroup" value ="0x4001"/>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
<Link>FSharp.ProjectSystem.FSharp.dll</Link>
8585
<Parser>210</Parser>
8686
</FilesToLocalize>
87-
<VSCTCompileInclude="MenusAndCommands.vsct">
88-
<XlfInput>false</XlfInput>
89-
</VSCTCompile>
87+
<VSCTCompileInclude="MenusAndCommands.vsct" />
9088
<EmbeddedResourceInclude="VSPackage.resx">
9189
<GenerateSource>true</GenerateSource>
9290
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp