Commit d3da3eb

mo khan <mo@mokhan.ca>
2010-02-07 03:13:53
refactored family member region to a usercontrol.
1 parent 9cfd1d4
Changed files (3)
product/client/presentation.windows/views/ShellWIndow.xaml
@@ -1,26 +1,13 @@
 <Window x:Class="presentation.windows.views.ShellWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:presentation.windows.views" Title="MoMoney - (ALPHA)" MinHeight="600" MinWidth="800" WindowStartupLocation="CenterScreen" WindowState="Maximized">
-    <DockPanel  VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:presentation.windows.views" Title="MoMoney - (ALPHA)" MinWidth="1024" MinHeight="768" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+    <DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <ui:MainMenu x:Name="Menu" DockPanel.Dock="Top">
         </ui:MainMenu>
         <ui:StatusBarRegion x:Name="StatusBar" DockPanel.Dock="Bottom"></ui:StatusBarRegion>
         <StackPanel>
-            <Expander>
-                <Expander.Header>
-                    <DockPanel>
-                    <Label>Family Member:</Label>
-                    <ComboBox Width="150"></ComboBox>
-                    </DockPanel>
-                </Expander.Header>
-                <UniformGrid>
-                    <Label FontWeight="Bold">First Name</Label>
-                    <Label>Mo</Label>
-                    <Label FontWeight="Bold">Last Name</Label>
-                    <Label>Khan</Label>
-                </UniformGrid>
-            </Expander>
-        <TabControl Name="Tabs"></TabControl>
+            <ui:FamilyMemberRegion x:Name="SelectedFamilyMember"></ui:FamilyMemberRegion>
+            <TabControl Name="Tabs"></TabControl>
         </StackPanel>
     </DockPanel>
 </Window>
product/client/presentation.windows/views/ShellWIndow.xaml.cs
@@ -19,6 +19,7 @@ namespace presentation.windows.views
                           {Tabs.GetType(), Tabs},
                           {StatusBar.GetType(), StatusBar},
                           {Menu.GetType(), Menu},
+                          {SelectedFamilyMember.GetType(), SelectedFamilyMember},
                       };
         }
 
product/client/presentation.windows/presentation.windows.csproj
@@ -76,7 +76,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="views\ShellWIndow.xaml">
+    <Page Include="views\FamilyMemberRegion.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="views\ShellWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -84,8 +88,8 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="views\ShellWIndow.xaml.cs">
-      <DependentUpon>ShellWIndow.xaml</DependentUpon>
+    <Compile Include="views\ShellWindow.xaml.cs">
+      <DependentUpon>ShellWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
@@ -138,6 +142,9 @@
     <Compile Include="views\ErrorWindow.xaml.cs">
       <DependentUpon>ErrorWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="views\FamilyMemberRegion.xaml.cs">
+      <DependentUpon>FamilyMemberRegion.xaml</DependentUpon>
+    </Compile>
     <Compile Include="views\MainMenu.cs" />
     <Compile Include="views\MenuItemExtensions.cs" />
     <Compile Include="presenters\SimpleCommand.cs" />