Fixes #198 missing icons on context menus

DaxStudio · Jun 26, 2019 · 1fb054f · 1fb054f
1 parent afcdb84
commit 1fb054f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/DaxStudio.UI/Views/QueryPlanTraceView.xaml b/src/DaxStudio.UI/Views/QueryPlanTraceView.xaml
@@ -82,7 +82,11 @@
             </DataGrid.RowStyle>
             <DataGrid.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Command="Copy" Icon="{StaticResource CopyIcon}"></MenuItem>
+                    <MenuItem Command="Copy">
+                        <MenuItem.Icon>
+                            <Image Source="{StaticResource CopyIcon}"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
                     <Separator/>
                     <MenuItem Command="SelectAll"></MenuItem>
                 </ContextMenu>
@@ -143,7 +147,11 @@
             </DataGrid.RowStyle>
             <DataGrid.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Command="Copy" Icon="{StaticResource CopyIcon}"></MenuItem>
+                    <MenuItem Command="Copy">
+                        <MenuItem.Icon>
+                            <Image Source="{StaticResource CopyIcon}"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
                     <Separator/>
                     <MenuItem Command="SelectAll"></MenuItem>
                 </ContextMenu>

diff --git a/src/DaxStudio.UI/Views/QueryResultsPaneView.xaml b/src/DaxStudio.UI/Views/QueryResultsPaneView.xaml
@@ -175,7 +175,11 @@
                             </DataGrid.ColumnHeaderStyle>
                             <DataGrid.ContextMenu>
                                 <ContextMenu>
-                                    <MenuItem Command="Copy" Icon="{StaticResource CopyIcon}"></MenuItem>
+                                    <MenuItem Command="Copy" >
+                                        <MenuItem.Icon>
+                                            <Image Source="{StaticResource CopyIcon}"/>
+                                        </MenuItem.Icon>
+                                    </MenuItem>
                                 </ContextMenu>
                             </DataGrid.ContextMenu>
                         </DataGrid>

diff --git a/src/DaxStudio.UI/Views/ServerTimesView.xaml b/src/DaxStudio.UI/Views/ServerTimesView.xaml
@@ -52,7 +52,11 @@
 
                         <custom:BindableRichTextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Command="Copy" Icon="{StaticResource CopyIcon}"></MenuItem>
+                                <MenuItem Command="Copy">
+                                <MenuItem.Icon>
+                                    <Image Source="{StaticResource CopyIcon}"/>
+                                </MenuItem.Icon>
+                                </MenuItem>
                                 <Separator/>
                                 <MenuItem Command="SelectAll"></MenuItem>
                             </ContextMenu>
@@ -253,7 +257,11 @@
                 <ContextMenu>
                     <ContextMenu.ItemsSource>
                         <CompositeCollection>
-                            <MenuItem Command="Copy" Icon="{StaticResource CopyIcon}"></MenuItem>
+                            <MenuItem Command="Copy" >
+                                <MenuItem.Icon>
+                                    <Image Source="{StaticResource CopyIcon}"/>
+                                </MenuItem.Icon>
+                            </MenuItem>
                             <Separator/>
                             <MenuItem Command="SelectAll"></MenuItem>
                             <Separator />