refactor

heku · Mar 18, 2023 · 259bda8 · 259bda8
1 parent 5b3f258
commit 259bda8
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 28 deletions.
diff --git a/Kool.EditProject.2019/Kool.EditProject.2019.csproj b/Kool.EditProject.2019/Kool.EditProject.2019.csproj
@@ -57,18 +57,18 @@
  <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
- <Compile Include="..\Kool.EditProject.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
+ <Compile Include="..\Kool.EditProject.Linked\I18n.Designer.cs" Link="I18n.Designer.cs">
  <AutoGen>True</AutoGen>
  <DesignTime>True</DesignTime>
- <DependentUpon>VSPackage.tt</DependentUpon>
+ <DependentUpon>I18n.tt</DependentUpon>
  </Compile>
  </ItemGroup>
  <ItemGroup>
  <None Include="source.extension.vsixmanifest" />
  <None Include="..\Kool.EditProject.Linked\Menus.vsct" Link="Menus.vsct" />
- <None Include="..\Kool.EditProject.Linked\VSPackage.tt" Link="VSPackage.tt">
+ <None Include="..\Kool.EditProject.Linked\I18n.tt" Link="I18n.tt">
  <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
+ <LastGenOutput>I18n.Designer.cs</LastGenOutput>
  </None>
  </ItemGroup>
  <ItemGroup>
@@ -79,18 +79,24 @@
  <ItemGroup>
  <VSCTCompile Include="..\Kool.EditProject.Linked\Menus.en.vsct" Link="Menus.en.vsct">
  <ResourceName>Menus.ctmenu</ResourceName>
+ <DependentUpon>Menus.vsct</DependentUpon>
  </VSCTCompile>
  <VSCTCompile Include="..\Kool.EditProject.Linked\Menus.zh-Hans.vsct" Link="Menus.zh-Hans.vsct">
  <ResourceName>Menus.ctmenu</ResourceName>
+ <DependentUpon>Menus.vsct</DependentUpon>
  </VSCTCompile>
  </ItemGroup>
  <ItemGroup>
- <EmbeddedResource Include="..\Kool.EditProject.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
+ <EmbeddedResource Include="..\Kool.EditProject.Linked\I18n.en.resx" Link="I18n.en.resx">
  <MergeWithCTO>true</MergeWithCTO>
+ <LogicalName>VSPackage.en.resources</LogicalName>
+ <DependentUpon>I18n.tt</DependentUpon>
  <SubType>Designer</SubType>
  </EmbeddedResource>
- <EmbeddedResource Include="..\Kool.EditProject.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
+ <EmbeddedResource Include="..\Kool.EditProject.Linked\I18n.zh-Hans.resx" Link="I18n.zh-Hans.resx">
  <MergeWithCTO>true</MergeWithCTO>
+ <LogicalName>VSPackage.zh-Hans.resources</LogicalName>
+ <DependentUpon>I18n.tt</DependentUpon>
  <SubType>Designer</SubType>
  </EmbeddedResource>
  </ItemGroup>

diff --git a/Kool.EditProject.2022/Kool.EditProject.2022.csproj b/Kool.EditProject.2022/Kool.EditProject.2022.csproj
@@ -57,18 +57,18 @@
  <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
- <Compile Include="..\Kool.EditProject.Linked\VSPackage.Designer.cs" Link="VSPackage.Designer.cs">
+ <Compile Include="..\Kool.EditProject.Linked\I18n.Designer.cs" Link="I18n.Designer.cs">
  <AutoGen>True</AutoGen>
  <DesignTime>True</DesignTime>
- <DependentUpon>VSPackage.tt</DependentUpon>
+ <DependentUpon>I18n.tt</DependentUpon>
  </Compile>
  </ItemGroup>
  <ItemGroup>
  <None Include="source.extension.vsixmanifest" />
  <None Include="..\Kool.EditProject.Linked\Menus.vsct" Link="Menus.vsct" />
- <None Include="..\Kool.EditProject.Linked\VSPackage.tt" Link="VSPackage.tt">
+ <None Include="..\Kool.EditProject.Linked\I18n.tt" Link="I18n.tt">
  <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>VSPackage.Designer.cs</LastGenOutput>
+ <LastGenOutput>I18n.Designer.cs</LastGenOutput>
  </None>
  </ItemGroup>
  <ItemGroup>
@@ -79,18 +79,24 @@
  <ItemGroup>
  <VSCTCompile Include="..\Kool.EditProject.Linked\Menus.en.vsct" Link="Menus.en.vsct">
  <ResourceName>Menus.ctmenu</ResourceName>
+ <DependentUpon>Menus.vsct</DependentUpon>
  </VSCTCompile>
  <VSCTCompile Include="..\Kool.EditProject.Linked\Menus.zh-Hans.vsct" Link="Menus.zh-Hans.vsct">
  <ResourceName>Menus.ctmenu</ResourceName>
+ <DependentUpon>Menus.vsct</DependentUpon>
  </VSCTCompile>
  </ItemGroup>
  <ItemGroup>
- <EmbeddedResource Include="..\Kool.EditProject.Linked\VSPackage.en.resx" Link="VSPackage.en.resx">
+ <EmbeddedResource Include="..\Kool.EditProject.Linked\I18n.en.resx" Link="I18n.en.resx">
  <MergeWithCTO>true</MergeWithCTO>
+ <LogicalName>VSPackage.en.resources</LogicalName>
+ <DependentUpon>I18n.tt</DependentUpon>
  <SubType>Designer</SubType>
  </EmbeddedResource>
- <EmbeddedResource Include="..\Kool.EditProject.Linked\VSPackage.zh-Hans.resx" Link="VSPackage.zh-Hans.resx">
+ <EmbeddedResource Include="..\Kool.EditProject.Linked\I18n.zh-Hans.resx" Link="I18n.zh-Hans.resx">
  <MergeWithCTO>true</MergeWithCTO>
+ <LogicalName>VSPackage.zh-Hans.resources</LogicalName>
+ <DependentUpon>I18n.tt</DependentUpon>
  <SubType>Designer</SubType>
  </EmbeddedResource>
  </ItemGroup>

diff --git a/....EditProject.Linked/VSPackage.Designer.cs → Kool.EditProject.Linked/I18n.Designer.cs b/....EditProject.Linked/VSPackage.Designer.cs → Kool.EditProject.Linked/I18n.Designer.cs
diff --git a/Kool.EditProject.Linked/VSPackage.en.resx → Kool.EditProject.Linked/I18n.en.resx b/Kool.EditProject.Linked/VSPackage.en.resx → Kool.EditProject.Linked/I18n.en.resx
diff --git a/Kool.EditProject.Linked/VSPackage.tt → Kool.EditProject.Linked/I18n.tt b/Kool.EditProject.Linked/VSPackage.tt → Kool.EditProject.Linked/I18n.tt
@@ -11,7 +11,6 @@ const string BenchmarkLanguage = "en";
 
 var resourceNameWithoutCulture = Path.GetFileNameWithoutExtension(Host.TemplateFile);
 var resourceNamespace = Host.ResolveParameterValue("directiveId", "namespaceDirectiveProcessor", "namespaceHint") ?? string.Empty;
-var resourceFullNameWithoutCulture = resourceNamespace + "." + resourceNameWithoutCulture;
 #>
 
 // ------------------------------------------------------------------------------
@@ -29,7 +28,7 @@ namespace <#= resourceNamespace#>
  /// </summary>
  static class <#= resourceNameWithoutCulture#>
  {
- static readonly ResourceManager Resx = new ResourceManager("<#= resourceFullNameWithoutCulture#>", typeof(<#= resourceNameWithoutCulture#>).Assembly);
+ static readonly ResourceManager Resx = new ResourceManager("VSPackage", typeof(<#= resourceNameWithoutCulture#>).Assembly);
 
 <#
 var resx = Path.ChangeExtension(Host.TemplateFile , BenchmarkLanguage + ".resx");

diff --git a/...EditProject.Linked/VSPackage.zh-Hans.resx → Kool.EditProject.Linked/I18n.zh-Hans.resx b/...EditProject.Linked/VSPackage.zh-Hans.resx → Kool.EditProject.Linked/I18n.zh-Hans.resx
diff --git a/Kool.EditProject.Shared/Commands/EditProjectCommand.cs b/Kool.EditProject.Shared/Commands/EditProjectCommand.cs
@@ -38,7 +38,7 @@ protected override void OnExecute()
  }
  catch (Exception ex)
  {
- MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+ MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
  }
  }
 }
diff --git a/Kool.EditProject.Shared/Commands/EditProjectsCommand.cs b/Kool.EditProject.Shared/Commands/EditProjectsCommand.cs
@@ -22,7 +22,7 @@ protected override void OnExecute()
  }
  catch (Exception ex)
  {
- MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+ MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
  }
  }
 }
diff --git a/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs b/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs
@@ -20,7 +20,7 @@ protected override void OnExecute()
  }
  catch (Exception ex)
  {
- MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+ MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
  }
  }
 }
diff --git a/Kool.EditProject.Shared/Pages/OptionsPage.xaml b/Kool.EditProject.Shared/Pages/OptionsPage.xaml
@@ -11,10 +11,10 @@
  <StackPanel>
  <GroupBox Padding="0,5">
  <GroupBox.Header>
- <CheckBox IsChecked="{Binding UseCustomEditor}" Content="{x:Static ep:VSPackage.OptionsPage_UseCustomEditor}" />
+ <CheckBox IsChecked="{Binding UseCustomEditor}" Content="{x:Static ep:I18n.OptionsPage_UseCustomEditor}" />
  </GroupBox.Header>
  <StackPanel IsEnabled="{Binding UseCustomEditor, Mode=OneWay}">
- <TextBlock Text="{x:Static ep:VSPackage.OptionsPage_CustomEditor}" />
+ <TextBlock Text="{x:Static ep:I18n.OptionsPage_CustomEditor}" />
  <Grid>
  <Grid.ColumnDefinitions>
  <ColumnDefinition Width="*" />
@@ -23,17 +23,17 @@
  <TextBox Name="EditorExe" VerticalContentAlignment="Center" Text="{Binding EditorExe, UpdateSourceTrigger=PropertyChanged}" />
  <Button Grid.Column="1" Width="40" Height="25" Content="..." Click="OnBrowseButtonClicked" />
  </Grid>
- <TextBlock Margin="0,5,0,0" Text="{x:Static ep:VSPackage.OptionsPage_Arguments}" />
+ <TextBlock Margin="0,5,0,0" Text="{x:Static ep:I18n.OptionsPage_Arguments}" />
  <Grid>
  <Grid.ColumnDefinitions>
  <ColumnDefinition Width="*" />
  <ColumnDefinition Width="50" />
  </Grid.ColumnDefinitions>
  <TextBox VerticalContentAlignment="Center" Text="{Binding EditorArg, UpdateSourceTrigger=PropertyChanged}" />
- <Button Grid.Column="1" Width="40" Height="25" Content="{x:Static ep:VSPackage.OptionsPage_TestButtonContent}" Click="OnTestButtonClicked" />
+ <Button Grid.Column="1" Width="40" Height="25" Content="{x:Static ep:I18n.OptionsPage_TestButtonContent}" Click="OnTestButtonClicked" />
  </Grid>
  </StackPanel>
  </GroupBox>
- <CheckBox Margin="0,5,0,0" IsChecked="{Binding OpenProjitems}" Content="{x:Static ep:VSPackage.OptionsPage_OpenProjitems}" />
+ <CheckBox Margin="0,5,0,0" IsChecked="{Binding OpenProjitems}" Content="{x:Static ep:I18n.OptionsPage_OpenProjitems}" />
  </StackPanel>
 </UserControl>
diff --git a/Kool.EditProject.Shared/Pages/OptionsPage.xaml.cs b/Kool.EditProject.Shared/Pages/OptionsPage.xaml.cs
@@ -44,7 +44,7 @@ private void OnTestButtonClicked(object sender, RoutedEventArgs e)
  }
  catch (Exception ex)
  {
- Models.MessageBox.Error(VSPackage.ErrorMessageTitle, ex.Message);
+ Models.MessageBox.Error(I18n.ErrorMessageTitle, ex.Message);
  }
  }
 }