Skip to content

Commit

Permalink
Closed #66
Browse files Browse the repository at this point in the history
  • Loading branch information
@sys27
sys27 committed Apr 28, 2014
1 parent a6cfdcd commit bef8bce
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 9 deletions.
74 changes: 74 additions & 0 deletions xFunc/Resources/Resource.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions xFunc/Resources/Resource.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,4 +681,28 @@
<data name="IfToolTip" xml:space="preserve">
<value>The If condition. Example: if(x &lt; 2, sin(x), cos(x)).</value>
</data>
<data name="EqualToolTip" xml:space="preserve">
<value>The equality operator. Example: x == 10.</value>
</data>
<data name="NotEqualToolTip" xml:space="preserve">
<value>The inequality operator. Example: x != 10.</value>
</data>
<data name="LessThanToolTip" xml:space="preserve">
<value>The "less than" operator. Example: x &lt; 10.</value>
</data>
<data name="GreaterThanToolTip" xml:space="preserve">
<value>The "greater than" operator. Example: x &gt; 10.</value>
</data>
<data name="LessOrEqualToolTip" xml:space="preserve">
<value>The "less or equal than" operator. Example: x &lt;= 10.</value>
</data>
<data name="GreaterOrEqualToolTip" xml:space="preserve">
<value>The "greater or equal than" operator. Example: x &gt;= 10.</value>
</data>
<data name="ConditionalAndToolTip" xml:space="preserve">
<value>The conditional-AND operator. Example: x == 0 &amp;&amp; y != 0.</value>
</data>
<data name="ConditionalOrToolTip" xml:space="preserve">
<value>The conditional-OR operator. Example: x == 0 || y != 0.</value>
</data>
</root>
24 changes: 24 additions & 0 deletions xFunc/Resources/Resource.ru.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,4 +681,28 @@
<data name="IfToolTip" xml:space="preserve">
<value>Условие if. Пример: if(x &lt; 2, sin(x), cos(x)).</value>
</data>
<data name="ConditionalAndToolTip" xml:space="preserve">
<value>Условный оператор И. Пример: x == 0 &amp;&amp; y != 0.</value>
</data>
<data name="EqualToolTip" xml:space="preserve">
<value>Оператор равенства. Пример: x == 10.</value>
</data>
<data name="NotEqualToolTip" xml:space="preserve">
<value>Оператор неравенства. Пример: x != 10.</value>
</data>
<data name="LessThanToolTip" xml:space="preserve">
<value>Оператор сравнения "меньше". Пример: x &lt; 10.</value>
</data>
<data name="GreaterThanToolTip" xml:space="preserve">
<value>Оператор сравнения "больше". Пример: x &gt; 10.</value>
</data>
<data name="LessOrEqualToolTip" xml:space="preserve">
<value>Оператор сравнения "меньше или равно". Пример: x &lt;= 10.</value>
</data>
<data name="GreaterOrEqualToolTip" xml:space="preserve">
<value>Оператор сравнения "больше или равно". Пример: x &gt;= 10.</value>
</data>
<data name="ConditionalOrToolTip" xml:space="preserve">
<value>Условный оператор ИЛИ. Пример: x == 0 || y != 0.</value>
</data>
</root>
24 changes: 24 additions & 0 deletions xFunc/Resources/Resource.uk.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,4 +681,28 @@
<data name="IfToolTip" xml:space="preserve">
<value>Умова if. Приклад: if(x &lt; 2, sin(x), cos(x)).</value>
</data>
<data name="EqualToolTip" xml:space="preserve">
<value>Оператор рівності. Приклад: x == 10.</value>
</data>
<data name="NotEqualToolTip" xml:space="preserve">
<value>Оператор нерівності. Приклад: x != 10.</value>
</data>
<data name="LessThanToolTip" xml:space="preserve">
<value>Оператор порівняння "менше". Приклад: x &lt;10.</value>
</data>
<data name="GreaterThanToolTip" xml:space="preserve">
<value>Оператор порівняння "більше". Приклад: x&gt; 10.</value>
</data>
<data name="LessOrEqualToolTip" xml:space="preserve">
<value>Оператор порівняння "менше або дорівнює". Приклад: x &lt;= 10.</value>
</data>
<data name="GreaterOrEqualToolTip" xml:space="preserve">
<value>Оператор порівняння "більше або дорівнює". Приклад: x&gt; = 10.</value>
</data>
<data name="ConditionalAndToolTip" xml:space="preserve">
<value>Умовний оператор І. Приклад: x == 0 &amp;&amp; y != 0.</value>
</data>
<data name="ConditionalOrToolTip" xml:space="preserve">
<value>Умовний оператор АБО. Приклад: x == 0 || y != 0.</value>
</data>
</root>
16 changes: 8 additions & 8 deletions xFunc/Views/MainView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,50 +594,50 @@ limitations under the License. -->
<Button Grid.Row="0" Grid.Column="0" Tag="==" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource equal}" Width="32" Height="22" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.EqualToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="0" Grid.Column="1" Tag="!=" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource notEqual}" Width="32" Height="19" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.NotEqualToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="0" Grid.Column="2" Tag="&amp;&amp;" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource condAnd}" Width="32" Height="22" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.ConditionalAndToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="0" Grid.Column="3" Tag="||" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource condOr}" Width="32" Height="20" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.ConditionalOrToolTip}" />
</Button.ToolTip>
</Button>

<Button Grid.Row="1" Grid.Column="0" Tag="&lt;" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource less}" Width="32" Height="14" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.LessThanToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="1" Grid.Column="1" Tag="&gt;" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource greater}" Width="32" Height="14" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.GreaterThanToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="1" Grid.Column="2" Tag="&lt;=" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource lessOrEqual}" Width="32" Height="20" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.LessOrEqualToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="1" Grid.Column="3" Tag="&gt;=" Click="InsertChar_Click">
<Rectangle Fill="{StaticResource greaterOrEqual}" Width="32" Height="20" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.InverseToolTip}" />
<ToolTip Content="{x:Static res:Resource.GreaterOrEqualToolTip}" />
</Button.ToolTip>
</Button>

Expand Down
2 changes: 1 addition & 1 deletion xFunc/xFunc.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Resources\Resource.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
<LastGenOutput>Resource1.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit bef8bce

Please sign in to comment.