Merge branch 'main' into zt/131-smart-textbox

microsoft · Jan 29, 2025 · fc60274 · fc60274
2 parents c845bdf + 1c0ae00
commit fc60274
Show file tree

Hide file tree

Showing 2 changed files with 289 additions and 274 deletions.
diff --git a/AIDevGallery/Samples/Open Source Models/Embeddings/RetrievalAugmentedGeneration.xaml b/AIDevGallery/Samples/Open Source Models/Embeddings/RetrievalAugmentedGeneration.xaml
@@ -10,33 +10,23 @@
     mc:Ignorable="d">
     <Grid Loaded="Grid_Loaded">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid
-            x:Name="IndexPDFProgressStackPanel"
-            MaxWidth="480"
-            Margin="16"
-            Visibility="Collapsed">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <TextBlock
-                x:Name="IndexPDFProgressTextBlock"
-                Grid.Row="1"
-                Margin="4"
-                HorizontalAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}" />
-            <ProgressBar
-                x:Name="IndexPDFProgressBar"
-                Grid.Row="0"
-                Height="8"
-                Margin="12"
-                HorizontalAlignment="Stretch" />
-        </Grid>
-        <ScrollViewer x:Name="InformationSV" Grid.Row="1" Padding="16" Visibility="Collapsed">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Button 
+            x:Name="SelectNewPDFButton"
+            Grid.Column="1"
+            Content="Select PDF"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Click="SelectNewPDF_Click"
+            Margin="12" Style="{StaticResource AccentButtonStyle}"
+            Visibility="Collapsed"/>
+        <ScrollViewer x:Name="InformationSV" Padding="16" Visibility="Collapsed">
             <TextBlock TextWrapping="Wrap" AutomationProperties.Name="PDF Information">
                 <Run x:Name="PagesUsedRun" FontWeight="SemiBold" />
                 <LineBreak />
@@ -46,7 +36,8 @@
         </ScrollViewer>
         <Grid
             x:Name="ChatGrid"
-            Grid.Row="2"
+            Grid.Row="1"
+            Grid.ColumnSpan="2"
             Margin="12"
             ColumnSpacing="16"
             RowSpacing="8"
@@ -58,6 +49,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Border
                 Grid.RowSpan="3"
@@ -67,7 +59,7 @@
                 BorderThickness="0,1,0,0" />
             <TextBox
                 x:Name="SearchTextBox"
-                Grid.RowSpan="2"
+                Grid.RowSpan="3"
                 VerticalAlignment="Stretch"
                 GotFocus="SearchTextBox_GotFocus"
                 LostFocus="SearchTextBox_LostFocus"
@@ -88,7 +80,7 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 Click="ShowPDFPage_Click"
-                Content="Show page"
+                Content="Show Page"
                 IsEnabled="False" />
         </Grid>
         <Grid
@@ -130,7 +122,6 @@
                 Click="NextPageButton_Click">
                 <FontIcon FontSize="16" Glyph="&#xE76C;" />
             </Button>
-
             <Button
                 x:Name="ClosePdfButton"
                 ToolTipService.ToolTip="Close PDF" 
@@ -152,12 +143,12 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock
                 x:Name="PdfProblemTextBlock"
                 HorizontalAlignment="Center"
-                Grid.Row="0"
-                />
+                Grid.Row="0" />
             <Button
                 x:Name="IndexPDFButton"
                 ToolTipService.ToolTip="Select PDF"
@@ -171,14 +162,18 @@
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <ProgressRing
                         x:Name="LoadPDFProgressRing"
-                        Width="24"
-                        Height="24"
+                        Width="16"
+                        Height="16"
                         IsActive="false"
                         HorizontalAlignment="Center"
                         Visibility="Collapsed" />
-                    <TextBlock x:Name="IndexPDFText" Text="Select a PDF" />
+                    <TextBlock x:Name="IndexPDFText" Text="Select a PDF" VerticalAlignment="Center" />
                 </StackPanel>
             </Button>
+            <StackPanel x:Name="ProgressPanel" HorizontalAlignment="Center" Grid.Row="2" Visibility="Collapsed" Spacing="8">
+                <ProgressBar x:Name="IndexingProgressBar" Width="250" Value="0"/>
+                <TextBlock x:Name="ProgressStatusTextBlock" HorizontalAlignment="Center"/>
+            </StackPanel>
         </Grid>
     </Grid>
 </samples:BaseSamplePage>