Changeset 162

Show
Ignore:
Timestamp:
03/09/07 00:10:36 (2 years ago)
Author:
timtsu2
Message:

Updated the main_window graphics
Modified the server list to use a canvas
Changed the color scheme in SongViewer?.cs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dmp/trunk/client/wpfclient/SongViewer.cs

    r154 r162  
    1717                Brush ColNonSortBGColor = Brushes.White;//Background color for non-sorted columns 
    1818 
    19                 Brush RowMajorColor = Brushes.LightSteelBlue; 
     19                Brush RowMajorColor = Brushes.PowderBlue; 
    2020                Brush RowMinorColor = Brushes.White; 
    2121                 
    22                 Brush HighlightedRowColor = Brushes.LightGreen; 
     22                Brush HighlightedRowColor = Brushes.SeaGreen; 
    2323 
    2424        private DataTable songDT = new DataTable(); 

  • dmp/trunk/client/wpfclient/main_window.xaml

    r154 r162  
    22    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
    33    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     4    xmlns:def="Definition" 
    45 
    56    Title="Rubicon" 
    67    > 
     8  <Window.Background> 
     9    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0" SpreadMethod="Pad"> 
     10      <GradientStop Color="#91AFAF" Offset="0"/> 
     11      <GradientStop Color="#589898" Offset="0.159"/> 
     12      <GradientStop Color="#164141" Offset="1"/> 
     13      <GradientStop Color="#96BBBB" Offset="0.865"/> 
     14    </LinearGradientBrush> 
     15  </Window.Background> 
    716        <Window.Resources> 
    817                <ResourceDictionary> 
    …… 
    1524        <Grid> 
    1625                <Grid.ColumnDefinitions> 
    17                         <ColumnDefinition Width="Auto"/> 
     26                        <ColumnDefinition Width="200"/> 
    1827                        <ColumnDefinition/> 
    1928                        <ColumnDefinition Width="Auto"/> 
    …… 
    2231 
    2332                <Grid.RowDefinitions> 
    24                         <RowDefinition Height="Auto"/> 
     33      <RowDefinition Height="Auto"> 
     34      </RowDefinition> 
    2535                        <RowDefinition/> 
    2636                        <RowDefinition Height="Auto"/> 
    27                 </Grid.RowDefinitions>           
    28  
    29                 <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center"> 
    30                         <Button Template="{StaticResource BackIcon}" Margin="5"/> 
    31                         <Button Template="{StaticResource PlayIcon}" Margin="5"/> 
    32                         <Button Template="{StaticResource NextIcon}" Margin="5"/> 
     37                </Grid.RowDefinitions> 
     38     
     39    <!-- This is the background for the top control bar--> 
     40    <Border BorderThickness="0" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4"> 
     41      <Border.Background> 
     42        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0" SpreadMethod="Pad"> 
     43          <GradientStop Color="#B3DADA" Offset="0"/> 
     44          <GradientStop Color="#428484" Offset="0.5"/> 
     45          <GradientStop Color="#2C7C7C" Offset="0.5"/> 
     46          <GradientStop Color="#0E5353" Offset="1"/> 
     47        </LinearGradientBrush> 
     48      </Border.Background> 
     49    </Border> 
     50     
     51                <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="3" Grid.Column="1" HorizontalAlignment="Center"> 
     52      <Button Template="{StaticResource BackIcon}" Margin="5"> 
     53        <Button.BitmapEffect> 
     54          <OuterGlowBitmapEffect GlowColor="#FF000000" GlowSize="2" Opacity="0.9"/> 
     55        </Button.BitmapEffect> 
     56      </Button> 
     57      <Button Template="{StaticResource PlayIcon}" Margin="5"> 
     58        <Button.BitmapEffect> 
     59          <OuterGlowBitmapEffect GlowColor="#FF000000" GlowSize="2" Opacity="0.9"/> 
     60        </Button.BitmapEffect> 
     61      </Button> 
     62      <Button Template="{StaticResource NextIcon}" Margin="5"> 
     63        <Button.BitmapEffect> 
     64          <OuterGlowBitmapEffect GlowColor="#FF000000" GlowSize="2" Opacity="0.9"/> 
     65        </Button.BitmapEffect> 
     66      </Button> 
    3367                </StackPanel> 
    3468                 
    3569                <TextBox Width="100" Height="20" Margin="5"  Name="SearchBox" Grid.Row="0" Grid.Column="2"/> 
    3670 
    37                 <StackPanel Name="serverStack" Grid.Row="1" Grid.Column="0" Margin="5"> 
    38       <!--StackPanel Orientation="Horizontal"> 
    39         <Image Source="pack://application:,,/resources/Server_red.png" Height="20" Width="20"/> 
    40         <TextBlock Margin="2" FontSize="15">Brian's</TextBlock> 
    41         <Button Template="{StaticResource ServerAdd}"/> 
    42       </StackPanel--> 
    43                 </StackPanel> 
    44                          
     71    <Border Grid.Row="1" BorderBrush="#80CCD9D9" Margin="3,0,0,0" BorderThickness="3"> 
     72                  <StackPanel Name="serverStack"> 
     73        <StackPanel.Background> 
     74          <SolidColorBrush Color="GhostWhite" Opacity="0.6"/> 
     75        </StackPanel.Background> 
     76        <Canvas Height="24"> 
     77          <Image Source="pack://application:,,/resources/Server_red.png"/> 
     78          <TextBlock x:Name="ServerIndicator" Width="150" Margin="20,3,0,0" TextTrimming="CharacterEllipsis"  
     79                     ToolTip="{Binding Path=Text, ElementName=ServerIndicator, Mode=Default}" 
     80                     Text="My Server name is really long blah blah blah"/> 
     81          <Button Template="{StaticResource ServerAdd}" Margin="170,0,0,0"/> 
     82        </Canvas> 
     83        <!--StackPanel Orientation="Horizontal"> 
     84          <Image Source="pack://application:,,/resources/Server_red.png" Height="20" Width="20"/> 
     85          <TextBlock Margin="2" FontSize="15">Brian's</TextBlock> 
     86          <Button Template="{StaticResource ServerAdd}"/> 
     87        </StackPanel--> 
     88                  </StackPanel> 
     89                </Border>        
     90     
    4591                <ScrollBar Name="horizScroll"  Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal"/> 
    4692                <ScrollBar Name="vertScroll" Grid.Row="1" Grid.Column="3"  Orientation="Vertical"/> 
    4793                         
    48                 <Border Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"  
    49           BorderBrush="Black" BorderThickness="1" Name="songViewBorder"/> 
     94                <Border Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" 
     95        BorderBrush="#80CCD9D9" BorderThickness="3" Name="songViewBorder"/> 
     96     
    5097        </Grid> 
    5198</Window> 

  • dmp/trunk/client/wpfclient/main_window.xaml.cs

    r154 r162  
    3838            songViewBorder.Child = songView; 
    3939                        songView.Focusable = true; 
    40  
     40            /* 
    4141            myBridge = new Bridge(); 
    4242 
    …… 
    4545                        myBridge.SongListChanged += DataTableChanged; 
    4646            myBridge.StartZeroConf(); 
    47              
     47            */ 
    4848            songView.VertScrollBar = vertScroll; 
    4949            songView.HorizScrollBar = horizScroll;