Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIcore/Window.cs	Sat Feb 14 13:26:00 2015 +0100
+++ b/ui/wpf/UIcore/Window.cs	Sun Feb 15 15:44:24 2015 +0100
@@ -42,21 +42,33 @@
 
             // menu
             Application app = Application.GetInstance();
-            if (!app.AppMenu.IsEmpty())
+            if (!app.Menu.IsEmpty())
             {
-                System.Windows.Controls.Menu menu = app.AppMenu.CreateMenu(uiobj);
+                System.Windows.Controls.Menu menu = app.Menu.CreateMenu(uiobj);
 
                 RowDefinition menuRow = new RowDefinition();
                 menuRow.Height = GridLength.Auto;
                 windowGrid.RowDefinitions.Add(menuRow);
 
-                Grid.SetRow(menu, 0);
-                Grid.SetColumn(menu, rowIndex);
+                Grid.SetRow(menu, rowIndex);
+                Grid.SetColumn(menu, 0);
                 windowGrid.Children.Add(menu);
                 rowIndex++;
             }
 
-            // TODO: toolbar
+            // toolbar
+            if(app.ToolBar.HasItems())
+            {
+                System.Windows.Controls.ToolBarTray tray = app.ToolBar.CreateToolBarTray(uiobj);
+                RowDefinition menuRow = new RowDefinition();
+                menuRow.Height = GridLength.Auto;
+                windowGrid.RowDefinitions.Add(menuRow);
+
+                Grid.SetRow(tray, rowIndex);
+                Grid.SetColumn(tray, 0);
+                windowGrid.Children.Add(tray);
+                rowIndex++;
+            }
 
             // content
             RowDefinition contentRow = new RowDefinition();