Draw context menu icons

StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml

@@ -141,15 +141,15 @@
         </StackPanel>
     </DataTemplate>
 
-    <DataTemplate x:Key="ButtonCalculatorRectangle">              
+    <DataTemplate x:Key="ButtonCalculatorRectangle">
-    <Rectangle Style="{DynamicResource ButtonRect}" Stroke="{DynamicResource CalculatorFrame}">
+        <Rectangle Style="{DynamicResource ButtonRect}" Stroke="{DynamicResource CalculatorFrame}">
-        <Rectangle.Fill>
+            <Rectangle.Fill>
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                <GradientStop Color="{DynamicResource ButtonLight}" Offset="0.2"/>
+                    <GradientStop Color="{DynamicResource ButtonLight}" Offset="0.2"/>
-                <GradientStop Color="{DynamicResource CalculatorColor}" Offset="1"/>
+                    <GradientStop Color="{DynamicResource CalculatorColor}" Offset="1"/>
-            </LinearGradientBrush>
+                </LinearGradientBrush>
-        </Rectangle.Fill>
+            </Rectangle.Fill>
-    </Rectangle>
+        </Rectangle>
     </DataTemplate>
 
     <DataTemplate x:Key="ButtonResultRectangle">
@@ -266,7 +266,7 @@
         <Canvas Style="{DynamicResource ButtonResultCanvas}">
             <Canvas.Children>
                 <Rectangle Height="16" Width="8" Canvas.Left="12" Canvas.Top="12"
-                            Fill="DarkGray" Stroke="Black" StrokeThickness="1"/> 
+                            Fill="DarkGray" Stroke="Black" StrokeThickness="1"/>
                 <Rectangle Height="6" Width="16" Canvas.Left="8" Canvas.Top="7"
                             Fill="LightGray" Stroke="Black" StrokeThickness="1"/>
                 <Line X1="2" Y1="16" X2="30" Y2="16" Stroke="Black" StrokeThickness="0.5"/>
@@ -292,7 +292,7 @@
             </Canvas.Children>
         </Canvas>
     </DataTemplate>
-    
+
     <DataTemplate x:Key="InvertSelection">
         <Canvas Style="{DynamicResource ButtonResultCanvas}">
             <Canvas.Children>
@@ -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>

StructureHelper/StructureHelper.csproj

@@ -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>
 

StructureHelper/Windows/MainGraph/GraphView.xaml

@@ -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>

StructureHelper/Windows/TreeGraph/TreeGraphView.xaml

@@ -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"