Merge branch 'Releases/Beta' into Defect/ActivityGroupToolTip

Ginger-Automation · Jan 12, 2024 · 7f9fbe6 · 7f9fbe6
2 parents 07be82c + ce98286
commit 7f9fbe6
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 51 deletions.
diff --git a/Ginger/Ginger/AutomatePageLib/ExecutionSummaryPage.xaml b/Ginger/Ginger/AutomatePageLib/ExecutionSummaryPage.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
     x:Class="Ginger.BusinessFlowWindows.ExecutionSummaryPage"
-    Height="800" Width="1000">
+    Height="600" Width="600">
 
     <Page.Resources>
         <x:ArrayExtension Type="{x:Type Brush}" x:Key="brushes">

diff --git a/Ginger/Ginger/AutomatePageLib/NewAutomatePage.xaml b/Ginger/Ginger/AutomatePageLib/NewAutomatePage.xaml
@@ -318,7 +318,7 @@
                         </DockPanel>
                         <Grid x:Name="xActivitiesDataGrid" DockPanel.Dock="Top" Visibility="Visible" Background="Transparent">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="650"/>
+                                <ColumnDefinition Width="550"/>
                                 <ColumnDefinition Width="300*"/>
                                 <ColumnDefinition x:Name="xAddActionsColumn" Width="5" MinWidth="5" MaxWidth="1300"/>
                             </Grid.ColumnDefinitions>
@@ -327,7 +327,7 @@
                                 <Frame x:Name="xActivitiesListFrame"  Content="Activities List Frame" Margin="10,0,10,0" NavigationUIVisibility="Hidden"  />
                             </Border>
 
-                            <GridSplitter x:Name="xActivityDetailsSectionSpliter" ResizeDirection="Columns" Grid.Column="1" Width="1" HorizontalAlignment="Left" Background="DarkGray"  VerticalAlignment="Stretch"  IsEnabled="True" Margin="0,0,0,0"/>
+                            <GridSplitter x:Name="xActivityDetailsSectionSpliter" ResizeDirection="Columns" Grid.Column="1" Width="1" HorizontalAlignment="Left" Background="DarkGray"  VerticalAlignment="Stretch"  IsEnabled="True" Margin="0,0,0,10"/>
 
                             <StackPanel x:Name="xCurrentActivityLoadingIconPnl" Grid.Column="1" HorizontalAlignment="Center" Visibility="Collapsed" VerticalAlignment="Center" >
                                 <UserControls:ImageMakerControl x:Name="xCurrentActivityLoadingIcon" ImageType="Processing"  HorizontalAlignment="Center" Width="80" Height="80" />

diff --git a/Ginger/Ginger/Dictionaries/Skins/GingerDefaultSkinDictionary.xaml b/Ginger/Ginger/Dictionaries/Skins/GingerDefaultSkinDictionary.xaml
@@ -1574,7 +1574,7 @@
     </Style>
 
     <Style TargetType="ListViewItem" x:Key="$ListViewItemStyle">
-        <Setter Property="Margin" Value="0 5 0 5"/>
+        <Setter Property="Margin" Value="0 4 0 4"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListViewItem}">

diff --git a/Ginger/Ginger/UserControlsLib/UCListView/UcListViewItem.xaml b/Ginger/Ginger/UserControlsLib/UCListView/UcListViewItem.xaml
@@ -93,34 +93,58 @@
 
                 <usercontrols:ImageMakerControl x:Name="xItemIcon" Grid.RowSpan="2" Grid.Column="3" ImageToolTip="" ImageType="Null" ImageForeground="{StaticResource $BackgroundColor_DarkGray}" SetAsFontImageWithSize="17" Height="20" Width="20" HorizontalAlignment="Center" Margin="0,0,0,0"/>
 
-                <Grid x:Name="xDetailsGrid" Grid.Row="0" Grid.Column="4" >
+                <Grid x:Name="xDetailsGrid" Grid.Row="0" Grid.Column="4" HorizontalAlignment="Stretch" >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100*" MinWidth="100"/>
+                        <ColumnDefinition x:Name="xItemNameColumn" Width="100*" MinWidth="100"/>
                         <ColumnDefinition x:Name="xItemNotificationsClm" Width="0"/>
                         <ColumnDefinition x:Name="xItemStatusClm"  Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock x:Name="xItemNameTxtBlock" Grid.Column="0" Text="Title">
-                        <TextBlock.Style>
-                            <Style TargetType="TextBlock">
-                                <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                                <Setter Property="VerticalAlignment" Value="Center"/>
-                                <Setter Property="FontSize" Value="15"/>
-                                <Setter Property="FontWeight" Value="Normal"/>
-                                <Setter Property="Margin" Value="2,0,0,0"/>
-                                <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="True">
-                                        <Setter Property="FontWeight" Value="Bold"/>
-                                        <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="False">
-                                        <Setter Property="FontWeight" Value="Normal"/>
-                                        <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </TextBlock.Style>
-                    </TextBlock>
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" >
+                        <TextBlock x:Name="xItemNameTxtBlock" Text="Title" >
+                            <TextBlock.Style>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="HorizontalAlignment" Value="Left"/>
+                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                    <Setter Property="FontSize" Value="15"/>
+                                    <Setter Property="FontWeight" Value="Normal"/>
+                                    <Setter Property="Margin" Value="2,0,0,0"/>
+                                    <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="True">
+                                            <Setter Property="FontWeight" Value="Bold"/>
+                                            <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="False">
+                                            <Setter Property="FontWeight" Value="Normal"/>
+                                            <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                        <TextBlock x:Name="xItemExtraInfoTxtBlock" Text="[ExtraInfo]" MaxWidth="100" >
+                            <TextBlock.Style>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="HorizontalAlignment" Value="Left"/>
+                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                    <Setter Property="FontSize" Value="15"/>
+                                    <Setter Property="FontWeight" Value="Normal"/>
+                                    <Setter Property="Margin" Value="2,0,0,0"/>
+                                    <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="True">
+                                            <Setter Property="FontWeight" Value="Bold"/>
+                                            <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListViewItem}}, Path=IsSelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Value="False">
+                                            <Setter Property="FontWeight" Value="Normal"/>
+                                            <Setter Property="Foreground" Value="{StaticResource $BackgroundColor_Black}"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </StackPanel>
                     <StackPanel x:Name="xItemNotificationsPnl" Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" Margin="10,0,0,0" />
                     <uclistview:UcItemExecutionStatus x:Name="xItemStatusImage" StatusViewMode="Image"  StatusSize="16" VerticalAlignment="Center" Grid.Column="2"/>
                 </Grid>
@@ -132,7 +156,7 @@
                         <!--to set width per need like for notifications-->
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock x:Name="xItemDescriptionTxtBlock" Grid.Column="0" Text="Description" FontSize="11" Margin="2 0 0 0" Foreground="{StaticResource $BackgroundColor_DarkGray}" FontStyle="Normal" FontWeight="Normal" TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+                    <TextBlock x:Name="xItemDescriptionTxtBlock" Grid.Column="0" Text="Description" FontSize="11" Margin="2 0 0 0" Foreground="{StaticResource $BackgroundColor_DarkGray}" FontStyle="Normal" FontWeight="Normal" TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" HorizontalAlignment="left" VerticalAlignment="Center" />
 
                     <DockPanel x:Name="xItemOperationsMainPnl" Grid.Column="1" HorizontalAlignment="Right" Visibility="Collapsed">
                         <StackPanel x:Name="xItemExecutionOperationsPnl" Orientation="Horizontal" DockPanel.Dock="Right"/>

diff --git a/Ginger/Ginger/UserControlsLib/UCListView/UcListViewItem.xaml.cs b/Ginger/Ginger/UserControlsLib/UCListView/UcListViewItem.xaml.cs
@@ -697,7 +697,12 @@ private void SetItemFullName()
             {
                 try
                 {
+                    AlignGridandTextWidth();
+                    xDetailsGrid.SizeChanged -= XDetailsGrid_SizeChanged;
+                    xDetailsGrid.SizeChanged += XDetailsGrid_SizeChanged;
                     xItemNameTxtBlock.Text = string.Empty;
+                    xItemExtraInfoTxtBlock.Text = string.Empty;
+                    xItemExtraInfoTxtBlock.Visibility = Visibility.Collapsed;
                     string fullname = string.Empty;
                     if (!string.IsNullOrEmpty(mItemNameField))
                     {
@@ -709,7 +714,6 @@ private void SetItemFullName()
                                 FontSize = 15,
                                 Text = name.ToString()
                             });
-
                             fullname += name;
                         }
                     }
@@ -718,7 +722,8 @@ private void SetItemFullName()
                         bool isMandatory = (bool)Item.GetType().GetProperty(mItemMandatoryField).GetValue(Item);
                         if (isMandatory)
                         {
-                            xItemNameTxtBlock.Inlines.Add(new System.Windows.Documents.Run
+                            xItemExtraInfoTxtBlock.Visibility = Visibility.Visible;
+                            xItemExtraInfoTxtBlock.Inlines.Add(new System.Windows.Documents.Run
                             {
                                 FontSize = 18,
                                 Text = "*",
@@ -733,7 +738,8 @@ private void SetItemFullName()
                         Object extension = Item.GetType().GetProperty(mItemNameExtentionField).GetValue(Item);
                         if (extension != null)
                         {
-                            xItemNameTxtBlock.Inlines.Add(new System.Windows.Documents.Run
+                            xItemExtraInfoTxtBlock.Visibility = Visibility.Visible;
+                            xItemExtraInfoTxtBlock.Inlines.Add(new System.Windows.Documents.Run
                             {
                                 FontSize = 11,
                                 Text = string.Format(" [{0}]", extension.ToString())
@@ -744,6 +750,7 @@ private void SetItemFullName()
                     }
 
                     xItemNameTxtBlock.ToolTip = fullname;
+                    xItemExtraInfoTxtBlock.ToolTip = fullname;
                 }
                 catch (Exception ex)
                 {
@@ -753,6 +760,20 @@ private void SetItemFullName()
             });
         }
 
+        private void AlignGridandTextWidth()
+        {
+            if (xItemNameColumn.ActualWidth > 200)
+            {
+                xItemNameTxtBlock.MaxWidth = xItemNameColumn.ActualWidth - 100;
+                xItemDescriptionTxtBlock.MaxWidth = xItemNameTxtBlock.MaxWidth;
+            }           
+        }
+
+        private void XDetailsGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            AlignGridandTextWidth();
+        }
+
         private void SetItemDescription()
         {
             this.Dispatcher.Invoke(() =>

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -1578,6 +1578,7 @@ private void ScreenshotHandler(ActScreenShot act)
         private void TakeFullPageWithDesktopScreenScreenShot(Act act)
         {
             List<Bitmap> bitmapsToMerge = new();
+            string filepath = null;
             try
             {
                 using (Bitmap browserHeaderScreenshot = GetBrowserHeaderScreenShot())
@@ -1586,31 +1587,29 @@ private void TakeFullPageWithDesktopScreenScreenShot(Act act)
                     {
                         bitmapsToMerge.Add(browserHeaderScreenshot);
                     }
-                }
-
-                using (Bitmap browserFullPageScreenshot = GetScreenShot(true))
-                {
-                    if (browserFullPageScreenshot != null)
+                    using (Bitmap browserFullPageScreenshot = GetScreenShot(true))
                     {
-                        bitmapsToMerge.Add(browserFullPageScreenshot);
+                        if (browserFullPageScreenshot != null)
+                        {
+                            bitmapsToMerge.Add(browserFullPageScreenshot);
+                        }
+                        using (Bitmap taskbarScreenshot = TargetFrameworkHelper.Helper.GetTaskbarScreenshot())
+                        {
+                            if (taskbarScreenshot != null)
+                            {
+                                bitmapsToMerge.Add(taskbarScreenshot);
+                            }
+                            filepath = TargetFrameworkHelper.Helper.MergeVerticallyAndSaveBitmaps(bitmapsToMerge.ToArray());
+                        }
                     }
                 }
-
-
-                using (Bitmap taskbarScreenshot = TargetFrameworkHelper.Helper.GetTaskbarScreenshot())
+                if (!string.IsNullOrEmpty(filepath))
                 {
-                    if (taskbarScreenshot != null)
-                    {
-                        bitmapsToMerge.Add(taskbarScreenshot);
-                    }
+                    act.ScreenShotsNames.Add(Driver.Title);
+                    act.ScreenShots.Add(filepath);
                 }
-
-                string filepath = TargetFrameworkHelper.Helper.MergeVerticallyAndSaveBitmaps(bitmapsToMerge.ToArray());
-
-                act.ScreenShotsNames.Add(Driver.Title);
-                act.ScreenShots.Add(filepath);   
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 act.Error = "Failed to create Selenuim WebDriver browser page screenshot. Error= " + ex.Message;
                 return;