Draw context menu icons

This commit is contained in:
Иван Ивашкин
2024-12-20 11:31:42 +05:00
parent 5712a85f38
commit 7996bd7a3d
12 changed files with 55 additions and 19 deletions

View File

@@ -142,14 +142,14 @@
</DataTemplate>
<DataTemplate x:Key="ButtonCalculatorRectangle">
<Rectangle Style="{DynamicResource ButtonRect}" Stroke="{DynamicResource CalculatorFrame}">
<Rectangle.Fill>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="{DynamicResource ButtonLight}" Offset="0.2"/>
<GradientStop Color="{DynamicResource CalculatorColor}" Offset="1"/>
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
<Rectangle Style="{DynamicResource ButtonRect}" Stroke="{DynamicResource CalculatorFrame}">
<Rectangle.Fill>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="{DynamicResource ButtonLight}" Offset="0.2"/>
<GradientStop Color="{DynamicResource CalculatorColor}" Offset="1"/>
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
</DataTemplate>
<DataTemplate x:Key="ButtonResultRectangle">
@@ -326,5 +326,25 @@
</Canvas.Children>
</Canvas>
</DataTemplate>
<DataTemplate x:Key="AddTable">
<Canvas Style="{DynamicResource ButtonResultCanvas}">
<Canvas.Children>
<Rectangle Height="32" Width="32" Fill="LightGreen"/>
<Line X1="2" X2="30" Y1="2" Y2="2" Stroke="Black" StrokeThickness="2"/>
<Line X1="2" X2="30" Y1="16" Y2="16" Stroke="Black" StrokeThickness="2"/>
<Line X1="2" X2="30" Y1="30" Y2="30" Stroke="Black" StrokeThickness="2"/>
<Line X1="2" X2="2" Y1="2" Y2="30" Stroke="Black" StrokeThickness="2"/>
<Line X1="16" X2="16" Y1="2" Y2="30" Stroke="Black" StrokeThickness="2"/>
<Line X1="30" X2="30" Y1="2" Y2="30" Stroke="Black" StrokeThickness="2"/>
</Canvas.Children>
</Canvas>
</DataTemplate>
<DataTemplate x:Key="TestIcon">
<Canvas Style="{DynamicResource ButtonResultCanvas}">
<Canvas.Children>
<TextBlock Text="fx" Width="32" Height="32" Background="LightGreen"/>
</Canvas.Children>
</Canvas>
</DataTemplate>
</ResourceDictionary>

View File

@@ -27,6 +27,8 @@
<None Remove="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_graph_1.png" />
<None Remove="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_graph_2.png" />
<None Remove="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_interpolation_1_1.png" />
<None Remove="Windows\MainWindow\AddFormula.png" />
<None Remove="Windows\MainWindow\AddTable.png" />
<None Remove="Windows\MainWindow\Analysis32.png" />
<None Remove="Windows\MainWindow\Beam32.png" />
<None Remove="Windows\MainWindow\Calculator32.png" />
@@ -37,7 +39,10 @@
<None Remove="Windows\MainWindow\Delete.png" />
<None Remove="Windows\MainWindow\Edit.png" />
<None Remove="Windows\MainWindow\ElasticMaterial32.png" />
<None Remove="Windows\MainWindow\GetY.png" />
<None Remove="Windows\MainWindow\GlassMaterial32.png" />
<None Remove="Windows\MainWindow\LimX.png" />
<None Remove="Windows\MainWindow\LimY.png" />
<None Remove="Windows\MainWindow\Materials32.png" />
<None Remove="Windows\MainWindow\MovePrimitivesToCenter.png" />
<None Remove="Windows\MainWindow\Point32.png" />
@@ -46,10 +51,13 @@
<None Remove="Windows\MainWindow\RectangleColumn32.png" />
<None Remove="Windows\MainWindow\RFMaterial32.png" />
<None Remove="Windows\MainWindow\Run.png" />
<None Remove="Windows\MainWindow\ScaleX.png" />
<None Remove="Windows\MainWindow\ScaleY.png" />
<None Remove="Windows\MainWindow\Slab32.png" />
<None Remove="Windows\MainWindow\ToBackground.png" />
<None Remove="Windows\MainWindow\ToForeground.png" />
<None Remove="Windows\MainWindow\Tools_Settings.png" />
<None Remove="Windows\MainWindow\Tree.png" />
<None Remove="Windows\MainWindow\СarbonMaterial32.png" />
</ItemGroup>
@@ -94,6 +102,8 @@
<Resource Include="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_graph_1.png" />
<Resource Include="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_graph_2.png" />
<Resource Include="Windows\CalculationWindows\CalculatorsViews\ForceCalculatorViews\32px_interpolation_1_1.png" />
<Resource Include="Windows\MainWindow\AddFormula.png" />
<Resource Include="Windows\MainWindow\AddTable.png" />
<Resource Include="Windows\MainWindow\Analysis32.png" />
<Resource Include="Windows\MainWindow\Beam32.png" />
<Resource Include="Windows\MainWindow\Calculator32.png" />
@@ -104,7 +114,10 @@
<Resource Include="Windows\MainWindow\Delete.png" />
<Resource Include="Windows\MainWindow\Edit.png" />
<Resource Include="Windows\MainWindow\ElasticMaterial32.png" />
<Resource Include="Windows\MainWindow\GetY.png" />
<Resource Include="Windows\MainWindow\GlassMaterial32.png" />
<Resource Include="Windows\MainWindow\LimX.png" />
<Resource Include="Windows\MainWindow\LimY.png" />
<Resource Include="Windows\MainWindow\Materials32.png" />
<Resource Include="Windows\MainWindow\MovePrimitivesToCenter.png" />
<Resource Include="Windows\MainWindow\Point32.png" />
@@ -113,10 +126,13 @@
<Resource Include="Windows\MainWindow\RectangleColumn32.png" />
<Resource Include="Windows\MainWindow\RFMaterial32.png" />
<Resource Include="Windows\MainWindow\Run.png" />
<Resource Include="Windows\MainWindow\ScaleX.png" />
<Resource Include="Windows\MainWindow\ScaleY.png" />
<Resource Include="Windows\MainWindow\Slab32.png" />
<Resource Include="Windows\MainWindow\ToBackground.png" />
<Resource Include="Windows\MainWindow\ToForeground.png" />
<Resource Include="Windows\MainWindow\Tools_Settings.png" />
<Resource Include="Windows\MainWindow\Tree.png" />
<Resource Include="Windows\MainWindow\СarbonMaterial32.png" />
</ItemGroup>

View File

@@ -82,13 +82,13 @@
<MenuItem Header="Add table"
Command="{Binding AddTableCommand}">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/AddTable.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Add formula"
Command="{Binding AddFormulaCommand}">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/Addformula.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Edit"
@@ -115,7 +115,7 @@
Command="{Binding TreeCommand}"
IsEnabled="{Binding SelectedFuntion.IsUser, UpdateSourceTrigger=PropertyChanged}">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/Tree.png" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

View File

@@ -46,35 +46,35 @@
<MenuItem Header="Get Y"
Command="{Binding GetYCommand}">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/GetY.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Scale X"
Command="{Binding ScaleCommand}"
CommandParameter="x">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/ScaleX.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Scale Y"
Command="{Binding ScaleCommand}"
CommandParameter="y">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/ScaleY.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Lim X"
Command="{Binding LimitCommand}"
CommandParameter="x">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/LimX.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Lim Y"
Command="{Binding LimitCommand}"
CommandParameter="y">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
<Image Width="16" Height="16" Source="/Windows/MainWindow/LimY.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Delete"