Browse Source

MessageBox if some of the assembly info values was incorrect

pull/624/head
olegbevz 11 years ago
parent
commit
3de10a3d5e
  1. 6
      data/resources/StringResources.resx
  2. 4
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
  3. 4
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs

6
data/resources/StringResources.resx

@ -8434,4 +8434,10 @@ Press Esc to cancel this operation.</value>
<data name="Dialog.ProjectOptions.AssemblyInfo.NewGUID" xml:space="preserve"> <data name="Dialog.ProjectOptions.AssemblyInfo.NewGUID" xml:space="preserve">
<value>New GUID</value> <value>New GUID</value>
</data> </data>
<data name="Dialog.ProjectOptions.AssemblyInfo.IncorrectValue" xml:space="preserve">
<value>One of the assembly info values is incorrect.</value>
</data>
<data name="Dialog.ProjectOptions.AssemblyInfo.None" xml:space="preserve">
<value>None</value>
</data>
</root> </root>

4
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml

@ -9,7 +9,7 @@
mc:Ignorable="d" mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type={x:Type optionPanels:AssemblyInfoViewModel}}"> d:DataContext="{d:DesignInstance Type={x:Type optionPanels:AssemblyInfoViewModel}}">
<ScrollViewer VerticalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid> <Grid x:Name="RootGrid">
<Grid.Resources> <Grid.Resources>
<Style TargetType="{x:Type Label}"> <Style TargetType="{x:Type Label}">
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
@ -18,7 +18,7 @@
<Setter Property="Height" Value="20"/> <Setter Property="Height" Value="20"/>
<Setter Property="Margin" Value="4"/> <Setter Property="Margin" Value="4"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/> <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
</Style> </Style>
<Style TargetType="{x:Type ComboBox}"> <Style TargetType="{x:Type ComboBox}">
<Setter Property="Height" Value="20"/> <Setter Property="Height" Value="20"/>

4
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs

@ -23,8 +23,8 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
Languages = new Dictionary<string, string>(); Languages = new Dictionary<string, string>();
Languages.Add( Languages.Add(
NONE_LANGUAGE_CODE, NONE_LANGUAGE_CODE,
string.Format("({0})", StringParser.Parse("${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentStyle.None}"))); string.Format("({0})", StringParser.Parse("${res:Dialog.ProjectOptions.AssemblyInfo.None}")));
Languages.AddRange(cultures.ToDictionary(x => x.Name, x => x.DisplayName).Distinct().OrderBy(x => x.Value)); Languages.AddRange(cultures.ToDictionary(x => x.Name, x => x.DisplayName).Distinct().OrderBy(x => x.Value));
} }

Loading…
Cancel
Save