Modified Exit code to call App Shutdown in every case

[pithos-ms-client] / trunk / Pithos.Client.WPF / Shell / PithosBalloon.xaml

diff --git a/trunk/Pithos.Client.WPF/Shell/PithosBalloon.xaml b/trunk/Pithos.Client.WPF/Shell/PithosBalloon.xaml
index 5a54275..e05be8e 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/PithosBalloon.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/PithosBalloon.xaml
@@ -5,9 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" \r
              mc:Ignorable="d" \r
              xmlns:tb="http://www.hardcodet.net/taskbar"\r
-             d:DesignHeight="120" d:DesignWidth="240"\r
-             Height="120"\r
-             Width="240">\r
+             Width="250"\r
+             xmlns:my="clr-namespace:Pithos.Client.WPF.Shell" >\r
     <UserControl.Resources>\r
         <Storyboard x:Key="FadeIn">\r
             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.Opacity)">\r
@@ -41,6 +40,7 @@
                 <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0.2"/>\r
             </DoubleAnimationUsingKeyFrames>\r
         </Storyboard>\r
+        <my:BalloonIconConverter x:Key="BalloonConverter" />\r
     </UserControl.Resources>\r
     <UserControl.Triggers>\r
         <EventTrigger RoutedEvent="tb:TaskbarIcon.BalloonShowing">\r
@@ -60,61 +60,77 @@
             <BeginStoryboard Storyboard="{StaticResource FadeOut}" x:Name="FadeOut_BeginStoryboard"/>\r
         </EventTrigger>\r
     </UserControl.Triggers>\r
-    <Grid>\r
-        <Border\r
-        HorizontalAlignment="Stretch"\r
-        Margin="5,5,5,5"\r
+    <Grid x:Name="grid" MouseEnter="grid_MouseEnter" >\r
+        <Grid.ColumnDefinitions>\r
+            <ColumnDefinition Width="Auto"/>\r
+            <ColumnDefinition Width="*"/>\r
+            <ColumnDefinition Width="Auto"/>\r
+        </Grid.ColumnDefinitions>\r
+        <Grid.RowDefinitions>\r
+            <RowDefinition Height="30" MaxHeight="30" />\r
+            <RowDefinition Height="Auto" MinHeight="50" />\r
+        </Grid.RowDefinitions>\r
+        <Border Grid.RowSpan="2" Grid.ColumnSpan="3" Grid.Row="0" Grid.Column="0"\r
+        HorizontalAlignment="Stretch" \r
+        Margin="5"\r
         BorderThickness="1,1,1,1"\r
-        BorderBrush="#FF997137">\r
-         <Border.Effect>\r
-             <DropShadowEffect Color="#FF747474"/>\r
-         </Border.Effect>\r
-         <Border.Background>\r
-             <LinearGradientBrush\r
+        BorderBrush="#FF379991">\r
+            <Border.Effect>\r
+                <DropShadowEffect Color="#FF747474"/>\r
+            </Border.Effect>\r
+            <Border.Background>\r
+                <LinearGradientBrush\r
             EndPoint="0.5,1"\r
             StartPoint="0.5,0">\r
-                 <GradientStop\r
+                    <GradientStop\r
               Color="#4085A5"\r
               Offset="0" />\r
-                 <GradientStop\r
+                    <GradientStop\r
               Color="#D7E8F0"\r
               Offset="1" />\r
-             </LinearGradientBrush>\r
-         </Border.Background>\r
-     </Border>\r
- <Image\r
+                </LinearGradientBrush>\r
+            </Border.Background>\r
+        </Border>\r
+        <StackPanel Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" VerticalAlignment="Stretch">\r
+            <Image \r
     HorizontalAlignment="Left"\r
-    Margin="0,10,0,0"\r
-    Width="48"\r
-    Source="/Images/PithosTaskbar.png"\r
-    Stretch="None" Height="72" VerticalAlignment="Top" />\r
- <TextBlock\r
-    Margin="72,49.2,10,0"\r
-    VerticalAlignment="Top"\r
-    Foreground="Black"\r
-    TextWrapping="Wrap"><Run Text="This is a user control. The animation uses the attached " Language="de-ch"/><Run FontStyle="Italic" FontWeight="Bold" Text="BalloonShowing " Language="de-ch"/><Run Text="event." Language="de-ch"/></TextBlock>\r
-    \r
-    <Path\r
-       Fill="#FFFFFFFF"\r
+    Margin="10,17,10,0"\r
+    Width="48"    \r
+    Stretch="None" Height="48" VerticalAlignment="Top" \r
+            Source="/Images/Info.png"/>\r
+\r
+\r
+        </StackPanel>\r
+        <TextBlock Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"\r
+                    Margin="0,5,10,10"\r
+                    VerticalAlignment="Top"\r
+                    Foreground="Black" \r
+                    TextWrapping="Wrap" \r
+                   Text="{Binding Message,FallbackValue='This is  a  message'}"                    \r
+                   Width="Auto"   Grid.RowSpan="2" MouseDown="TextBlock_MouseDown"\r
+                   >\r
+        </TextBlock>\r
+\r
+        <Path Grid.Column="1" Fill="#FFFFFFFF"\r
        Stretch="Fill"\r
-       Margin="72,38.2,34,0"\r
+       Margin="0,34,34,0"\r
        VerticalAlignment="Top"\r
        Height="1"\r
        Data="M26,107 L220.04123,107" SnapsToDevicePixels="True">\r
-        <Path.Stroke>\r
-           <LinearGradientBrush\r
+            <Path.Stroke>\r
+                <LinearGradientBrush\r
           EndPoint="0.973,0.5"\r
           StartPoint="0.005,0.5">\r
-               <GradientStop\r
-            Color="#00ECAD25"\r
+                    <GradientStop\r
+            Color="#0025ECDD"\r
             Offset="1" />\r
-               <GradientStop\r
-            Color="#87ECAD25"\r
+                    <GradientStop\r
+            Color="#8725ECDD"\r
          Offset="0" />\r
                 </LinearGradientBrush>\r
             </Path.Stroke>\r
         </Path>\r
-        <TextBlock Margin="72,10,10,0" VerticalAlignment="Top" Height="23.2" Text="{Binding Path=BalloonText, ElementName=me, Mode=Default}" TextWrapping="Wrap" Foreground="#FFECAD25" FontWeight="Bold"/>\r
-        <Image HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Width="16" Height="16" Source="/Images/Close.png" Stretch="Fill" Opacity="0.4" ToolTip="Close Balloon" x:Name="imgClose" MouseDown="imgClose_MouseDown"/>\r
+        <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Margin="0,10,10,0" VerticalAlignment="Top" Height="23.2" Text="{Binding Path=Title, FallbackValue='Pithos'}" TextWrapping="Wrap" Foreground="White" FontWeight="Bold"/>\r
+        <Image Grid.Column="2" HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Width="16" Height="16" Source="/Images/Close.png" Stretch="Fill" Opacity="0.7" ToolTip="Close Balloon" x:Name="imgClose" MouseDown="imgClose_MouseDown"/>\r
     </Grid>\r
 </UserControl>\r