Skip to content

Commit

Permalink
Added buttons.
Browse files Browse the repository at this point in the history
  • Loading branch information
sys27 committed Apr 22, 2014
1 parent 731f02c commit 8a68d2b
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 5 deletions.
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("Release")]
#endif

[assembly: AssemblyVersion("2.12.0")]
[assembly: AssemblyFileVersion("2.12.0")]
[assembly: AssemblyInformationalVersion("2.12.0")]
[assembly: AssemblyVersion("2.12.1")]
[assembly: AssemblyFileVersion("2.12.1")]
[assembly: AssemblyInformationalVersion("2.12.1")]
[assembly: NeutralResourcesLanguageAttribute("en")]
2 changes: 1 addition & 1 deletion xFunc/Presenters/Updater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internal class Updater
{

private const string checkUri = "http://xfunc.codeplex.com/releases/";
private const int currentRelease = 121177;
private const int currentRelease = 121268;
private string updateUri;
private bool hasUpdates;

Expand Down
18 changes: 18 additions & 0 deletions xFunc/Resources/Resource.Designer.cs

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

8 changes: 7 additions & 1 deletion xFunc/Resources/Resource.resx
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,12 @@
<value>Inverse a matrix. Example: inverse({{1, 3}, {9, 4}})</value>
</data>
<data name="RoundToolTip" xml:space="preserve">
<value>The "round" function. Example: round(number, digits).</value>
<value>Rounds a value to the nearest integer or to the specified number of fractional digits. Example: round(number, digits).</value>
</data>
<data name="CeilToolTip" xml:space="preserve">
<value>Returns the smallest integer greater than or equal to the specified number. Example: ceil(5.5555).</value>
</data>
<data name="FloorToolTip" xml:space="preserve">
<value>Returns the largest integer less than or equal to the specified number. Example: floor(5.55555).</value>
</data>
</root>
6 changes: 6 additions & 0 deletions xFunc/Resources/Resource.ru.resx
Original file line number Diff line number Diff line change
Expand Up @@ -663,4 +663,10 @@
<data name="RoundToolTip" xml:space="preserve">
<value>Функция округления. Пример: round(number, digits).</value>
</data>
<data name="CeilToolTip" xml:space="preserve">
<value>Возвращает наименьшее целое число, которое больше или равно заданному числу. Пример: ceil(5.55555).</value>
</data>
<data name="FloorToolTip" xml:space="preserve">
<value>Возвращает наибольшее целое число, которое меньше или равно указанному числу. Пример: floor(5.55555).</value>
</data>
</root>
6 changes: 6 additions & 0 deletions xFunc/Resources/Resource.uk.resx
Original file line number Diff line number Diff line change
Expand Up @@ -663,4 +663,10 @@
<data name="RoundToolTip" xml:space="preserve">
<value>Функція округлення. Приклад: round(number, digits).</value>
</data>
<data name="CeilToolTip" xml:space="preserve">
<value>Повертає найменше ціле число, яке більше або дорівнює заданому числу. Приклад: ceil(5.55555).</value>
</data>
<data name="FloorToolTip" xml:space="preserve">
<value>Повертає найбільше ціле число, яке менше або дорівнює вказаному числу. Приклад: floor(5.55555).</value>
</data>
</root>
12 changes: 12 additions & 0 deletions xFunc/Views/MainView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,18 @@ limitations under the License. -->
<ToolTip Content="{x:Static res:Resource.RoundToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="2" Grid.Column="2" Tag="ceil" Click="InsertFunc_Click">
<Rectangle Fill="{StaticResource round}" Width="40" Height="20" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.CeilToolTip}" />
</Button.ToolTip>
</Button>
<Button Grid.Row="2" Grid.Column="3" Tag="floor" Click="InsertFunc_Click">
<Rectangle Fill="{StaticResource round}" Width="40" Height="20" />
<Button.ToolTip>
<ToolTip Content="{x:Static res:Resource.FloorToolTip}" />
</Button.ToolTip>
</Button>
</Grid>
</Expander>
<Expander x:Name="standartLogicToolBar" Header="{x:Static res:Resource.StandartExpanderHeader}" Visibility="Collapsed" IsExpanded="True">
Expand Down

0 comments on commit 8a68d2b

Please sign in to comment.