src/Morph-Exodus/Themes/Default/Default.xaml @@ -5,29 +5,9 @@ StartupUri="Views/Home/Dashboard.xaml"> <Application.Resources> <ResourceDictionary> - <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FF333333" /> - <SolidColorBrush x:Key="ControlForegroundBrush" Color="#33FFFFFF" /> - - <Style TargetType="{x:Type Grid}"> - <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" /> - </Style> - - <Style TargetType="{x:Type xpt:Form}"> - <Setter Property="xpt:FormItem.LabelWidth" Value="130" /> - - <Style.Resources> - <Style TargetType="{x:Type xpt:FormHeader}"> - <Setter Property="Foreground" Value="{DynamicResource ControlForegroundBrush}" /> - </Style> - <Style TargetType="{x:Type Label}"> - <Setter Property="Foreground" Value="{DynamicResource ControlForegroundBrush}" /> - <Setter Property="Margin" Value="5" /> - </Style> - <Style TargetType="{x:Type TextBox}"> - <Setter Property="Width" Value="120" /> - </Style> - </Style.Resources> - </Style> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="Themes/Default/Default.xaml" /> + </ResourceDictionary.MergedDictionaries> </ResourceDictionary> </Application.Resources> </Application> src/Morph-Exodus/App.xaml @@ -89,6 +89,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </ApplicationDefinition> + <Page Include="Themes\Default\Default.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Views\Home\Dashboard.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> src/Morph-Exodus/Morph-Exodus.csproj @@ -1,41 +1,44 @@ <Window xmlns:ad="clr-namespace:AvalonDock;assembly=AvalonDock" x:Class="Morph.Exodus.Views.Home.Dashboard" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + Background="{DynamicResource WindowBackground}" Title="Dashboard" Height="600" Width="800"> - <Grid> + <Grid Background="#00000000" AllowDrop="True"> <StackPanel> - <Menu Height="35"> + <Menu Height="30"> <MenuItem Header="File"> <MenuItem Header="Login" /> - <MenuItem Header="Register" x:Name="MenuItemRegister" Click="MenuItemRegister_Click" /> + <MenuItem Header="Register" x:Name="MenuItemRegister" Click="MenuItemRegister_Click" /> <MenuItem Header="Exit" Command="ApplicationCommands.Close" /> </MenuItem> </Menu> + <TextBlock>test</TextBlock> + </StackPanel> - <ad:DockingManager Margin="0,25,0,0"> - <ad:ResizingPanel Orientation="Vertical"> - - <ad:ResizingPanel Orientation="Horizontal" > - <ad:DockablePane> - <ad:DockableContent Title="TextBox1"> - <TextBox /> - </ad:DockableContent> - </ad:DockablePane> - <ad:DocumentPane x:Name="documentsHost"> - <ad:DocumentContent Title="File1.doc"> - <RichTextBox/> - </ad:DocumentContent > - <ad:DocumentContent Title="File2.doc"> - <RichTextBox/> - </ad:DocumentContent > - </ad:DocumentPane> - </ad:ResizingPanel> + <ad:DockingManager IsEnabled="False" Margin="0,25,0,0"> + <ad:ResizingPanel Orientation="Vertical"> + + <ad:ResizingPanel Orientation="Horizontal" > <ad:DockablePane> - <ad:DockableContent Title="TextBox2"> - <TextBox /> + <ad:DockableContent Title="TextBox1"> + <TextBox /> </ad:DockableContent> </ad:DockablePane> + <ad:DocumentPane x:Name="documentsHost"> + <ad:DocumentContent Title="File1.doc"> + <RichTextBox/> + </ad:DocumentContent > + <ad:DocumentContent Title="File2.doc"> + <RichTextBox/> + </ad:DocumentContent > + </ad:DocumentPane> </ad:ResizingPanel> - </ad:DockingManager> + <ad:DockablePane> + <ad:DockableContent Title="TextBox2"> + <TextBox /> + </ad:DockableContent> + </ad:DockablePane> + </ad:ResizingPanel> + </ad:DockingManager> </Grid> </Window> src/Morph-Exodus/Views/Home/Dashboard.xaml 3b190542be95c93695fc82ddd4d8d29957a1878b U-Michael-PC\Michael Michael@Michael-PC.(none) http://github.com/michaelherndon/morph/commit/b53b31aed89cec0df6fcd1f2c15e3b22822d62da b53b31aed89cec0df6fcd1f2c15e3b22822d62da 2009-06-27T19:58:08-07:00 2009-06-27T19:58:08-07:00 some tweaking of styles to the application and overall intial learning of styling in wpf f5dbc14c708d544d0a7d59cb0b61e8efefb744c3 U-Michael-PC\Michael Michael@Michael-PC.(none)