Skip to content

Commit 95ea6e5

Browse files
StuparStupar
Stupar
authored and
Stupar
committed
ver 1.6
1 parent 5384d58 commit 95ea6e5

Some content is hidden

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

42 files changed

+5742
-1409
lines changed

‎source/2019/source.extension.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2f" Version="1.5" Language="en-US" Publisher="Stephane Molina" />
4+
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2f" Version="1.6" Language="en-US" Publisher="Stephane Molina" />
55
<DisplayName>Generate C++ Filters</DisplayName>
66
<Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
77
<License>resources\license</License>

‎source/2022/2022.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</UpgradeBackupLocation>
1313
<OldToolsVersion>15.0</OldToolsVersion>
1414
<TargetFrameworkProfile />
15+
<LangVersion>8.0</LangVersion>
1516
</PropertyGroup>
1617
<PropertyGroup>
1718
<SignAssembly>true</SignAssembly>
@@ -82,10 +83,10 @@
8283
</ItemGroup>
8384
<ItemGroup>
8485
<PackageReference Include="Microsoft.VisualStudio.SDK">
85-
<Version>17.0.31902.203</Version>
86+
<Version>17.0.32112.339</Version>
8687
</PackageReference>
8788
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
88-
<Version>17.0.31902.203</Version>
89+
<Version>17.0.32112.339</Version>
8990
</PackageReference>
9091
<PackageReference Include="Microsoft.VSSDK.BuildTools">
9192
<Version>17.1.1029-preview2</Version>

‎source/2022/source.extension.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2e" Version="1.5" Language="en-US" Publisher="Stephane Molina" />
4+
<Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2e" Version="1.6" Language="en-US" Publisher="Stephane Molina" />
55
<DisplayName>Generate C++ Filters</DisplayName>
66
<Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
77
<License>resources\license</License>

‎source/shared/packageXml.vsct

+52-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
3+
24
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
35
<Extern href="stdidcmd.h"/>
46
<Extern href="vsshlids.h"/>
57

6-
<Commands package="guidGenerateFilterPackage">
8+
<Commands package="packageGuid">
9+
<!--sdfdsf -->
10+
711
<Groups>
8-
<Group guid="guidGenerateFilterPackageCmdSet" id="grpIdProjectContextAdd" priority="0x0102">
12+
<Group guid="groupGuid" id="groupId" priority="0x0102">
913
<!-- Can check what the other existing id/priority (for positioning) are by looking at SharedCmdPlace.vsct, need to modify the group priority while targetting the right id -->
1014
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJNODE" />
1115

@@ -14,36 +18,70 @@
1418
</Group>
1519
</Groups>
1620

21+
22+
1723
<Buttons>
18-
<Button guid="guidGenerateFilterPackageCmdSet" id="GenerateFilterCommand" type="Button" priority="0x0100">
19-
<Parent guid="guidGenerateFilterPackageCmdSet" id="grpIdProjectContextAdd" />
20-
<Icon guid="GenerateFilterIcon" id="GenerateFilterIconID" />
24+
<Button guid="groupGuid" id="buttonId" type="Button" priority="0x0100">
25+
<Parent guid="groupGuid" id="groupId" />
26+
<Icon guid="iconGuid" id="iconId" />
2127

2228
<CommandFlag>DefaultInvisible</CommandFlag>
2329
<CommandFlag>DynamicVisibility</CommandFlag>
2430

2531
<Strings>
26-
<ButtonText>Generate C++ Project Filters</ButtonText>
32+
<ButtonText>sync folder -&gt; filter</ButtonText>
2733
</Strings>
2834
</Button>
35+
36+
<Button guid="groupGuid" id="button2Id" type="Button" priority="0x0100">
37+
<Parent guid="groupGuid" id="groupId" />
38+
<Icon guid="iconGuid" id="iconId" />
39+
40+
<CommandFlag>DefaultInvisible</CommandFlag>
41+
<CommandFlag>DynamicVisibility</CommandFlag>
42+
43+
<Strings>
44+
<ButtonText>sync filter -&gt; folder</ButtonText>
45+
</Strings>
46+
</Button>
2947
</Buttons>
3048

49+
50+
51+
52+
53+
54+
3155
<Bitmaps>
32-
<Bitmap guid="GenerateFilterIcon" href="Resources\GenerateFilters.ico" usedList="GenerateFilterIconID"/>
56+
<Bitmap guid="iconGuid" href="Resources\GenerateFilters.ico" usedList="iconId"/>
3357
</Bitmaps>
58+
59+
3460
</Commands>
3561

62+
63+
64+
65+
66+
67+
68+
3669
<Symbols>
37-
<GuidSymbol name="guidGenerateFilterPackage" value="{99d03761-6200-41ad-b2a1-638ae9e780e5}" />
70+
71+
<GuidSymbol name="packageGuid" value="{99d03761-6200-41ad-b2a1-638ae9e780e5}" /> <!--extern-->
3872

39-
<GuidSymbol name="guidGenerateFilterPackageCmdSet" value="{acd8036f-19ae-43b2-a2d6-11788cb282fe}">
40-
<IDSymbol name="GenerateFilterCommand" value="0x0100" />
41-
<IDSymbol name="grpIdProjectContextAdd" value="0x1080" />
42-
<IDSymbol name="grpIdSolutionContextAdd" value="0x1081" />
73+
<GuidSymbol name="groupGuid" value="{acd8036f-19ae-43b2-a2d6-11788cb282fe}"> <!--extern-->
74+
<IDSymbol name="buttonId" value="0x0100" /> <!--extern-->
75+
<IDSymbol name="button2Id" value="0x0101" /> <!--extern-->
76+
<IDSymbol name="groupId" value="0x1080" />
77+
<!--IDSymbol name="grpIdSolutionContextAdd" value="0x1081" /-->
4378
</GuidSymbol>
4479

45-
<GuidSymbol name="GenerateFilterIcon" value="{363F9640-FBB7-4403-AB20-9A53EA067ECA}">
46-
<IDSymbol name="GenerateFilterIconID" value="1" />
80+
<GuidSymbol name="iconGuid" value="{363F9640-FBB7-4403-AB20-9A53EA067ECA}">
81+
<IDSymbol name="iconId" value="1" />
4782
</GuidSymbol>
83+
4884
</Symbols>
85+
86+
4987
</CommandTable>

‎source/shared/project/cppFiltersAutoShared.projitems

+33-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@
1313
<EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\advanced.resx">
1414
<DependentUpon>advanced.cs</DependentUpon>
1515
</EmbeddedResource>
16+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\error.resx">
17+
<DependentUpon>error.cs</DependentUpon>
18+
</EmbeddedResource>
1619
<EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\question.resx">
1720
<DependentUpon>question.cs</DependentUpon>
1821
</EmbeddedResource>
22+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\questionFtd.resx">
23+
<DependentUpon>questionFtd.cs</DependentUpon>
24+
</EmbeddedResource>
1925
</ItemGroup>
2026
<ItemGroup>
2127
<Content Include="$(MSBuildThisFileDirectory)resources\generateFiltersPackage.ico" />
@@ -25,19 +31,40 @@
2531
<Compile Include="$(MSBuildThisFileDirectory)source\gui\advanced.Designer.cs">
2632
<DependentUpon>advanced.cs</DependentUpon>
2733
</Compile>
34+
<Compile Include="$(MSBuildThisFileDirectory)source\gui\error.cs" />
35+
<Compile Include="$(MSBuildThisFileDirectory)source\gui\error.Designer.cs">
36+
<DependentUpon>error.cs</DependentUpon>
37+
</Compile>
2838
<Compile Include="$(MSBuildThisFileDirectory)source\gui\question.cs" />
2939
<Compile Include="$(MSBuildThisFileDirectory)source\gui\question.Designer.cs">
3040
<DependentUpon>question.cs</DependentUpon>
3141
</Compile>
42+
<Compile Include="$(MSBuildThisFileDirectory)source\gui\questionFtd.cs" />
43+
<Compile Include="$(MSBuildThisFileDirectory)source\gui\questionFtd.Designer.cs">
44+
<DependentUpon>questionFtd.cs</DependentUpon>
45+
</Compile>
46+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\dirToFilter\file.cs" />
47+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\dirToFilter\filters.cs" />
48+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\dirToFilter\projectData.cs" />
49+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\dirToFilter\work.cs" />
3250
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\extension.cs" />
33-
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\file.cs" />
34-
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filters.cs" />
35-
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\work.cs" />
36-
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\test.cs" />
51+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filterToDir\error.cs" />
52+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filterToDir\file.cs" />
53+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filterToDir\filters.cs" />
54+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filterToDir\projectData.cs" />
55+
<Compile Include="$(MSBuildThisFileDirectory)source\source\extension\filterToDir\work.cs" />
56+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\dte\project.cs" />
57+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\dte\projectItem.cs" />
58+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\other.cs" />
59+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\vc\file.cs" />
60+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\vc\filter.cs" />
61+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\vc\project.cs" />
62+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\test\vc\projectReference.cs" />
63+
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\unused\project.cs" />
3764
<Compile Include="$(MSBuildThisFileDirectory)source\source\other\unused\xml.cs" />
3865
<Compile Include="$(MSBuildThisFileDirectory)source\source\package.cs" />
39-
<Compile Include="$(MSBuildThisFileDirectory)source\source\project\project.cs" />
40-
<Compile Include="$(MSBuildThisFileDirectory)source\source\project\projectData.cs" />
66+
<Compile Include="$(MSBuildThisFileDirectory)source\source\utility\extension.cs" />
4167
<Compile Include="$(MSBuildThisFileDirectory)source\source\utility\path.cs" />
68+
<Compile Include="$(MSBuildThisFileDirectory)source\source\utility\project.cs" />
4269
</ItemGroup>
4370
</Project>

‎source/shared/project/source/gui/advanced.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void formAdvancedFormClosing(object sender, FormClosingEventArgs e)
6060
if (!Directory.Exists(textBoxIn.Text)) throw new Exception("in dir is not valid");
6161
if (!Directory.Exists(textBoxRootDir.Text)) throw new Exception("root dir is not valid");
6262
if (checkBoxRootFilter.Checked)
63-
if (!ProjectData.Root.filterCheck(textBoxRootFilter.Text)) throw new Exception("root filter is not valid");
63+
if (!dirToFilter.ProjectData.Root.filterCheck(textBoxRootFilter.Text)) throw new Exception("root filter is not valid");
6464
}
6565
catch(Exception e2)
6666
{
@@ -115,10 +115,10 @@ private void buttonOkClick(object sender, EventArgs e)
115115
}
116116

117117

118-
public ProjectData p;
118+
public dirToFilter.ProjectData p;
119119
private void buttonCalculateFiltersDeleteAllClick(object sender, EventArgs e)
120120
{
121-
filters.filtersDeleteAll(p.p2);
121+
dirToFilter.filters.filtersDeleteAll(p.p2);
122122
}
123123

124124

‎source/shared/project/source/gui/error.Designer.cs

+69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎source/shared/project/source/gui/error.cs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace VisualStudioCppExtensions
12+
{
13+
public partial class formError : Form
14+
{
15+
public formError()
16+
{
17+
InitializeComponent();
18+
}
19+
20+
21+
22+
protected override bool ProcessDialogKey(Keys keyData)
23+
{
24+
if (Form.ModifierKeys != Keys.None || keyData != Keys.Escape) return base.ProcessDialogKey(keyData);
25+
this.Close();
26+
return true;
27+
}
28+
}
29+
}

0 commit comments

Comments
 (0)