Merge of changes for 1.0.0.5

igolovic · Nov 18, 2019 · 3894a4a · 3894a4a
2 parents a3ffd6a + a624d17
commit 3894a4a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Documentation/SessionTimeDocumentation.txt b/Documentation/SessionTimeDocumentation.txt
diff --git a/SessionTimeViewer/AboutWindow.xaml b/SessionTimeViewer/AboutWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="SessionTime.SessionTimeViewer.AboutWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="SessionTimeViewer"
+        Title="Help &amp; about"
         Height="230" 
         Width="400" 
         Loaded="Window_Loaded" 
@@ -37,7 +37,6 @@
                 https://github.com/igolovic/session-time/
             </Hyperlink>
         </TextBlock>
-
         <Label Grid.Row="3" Grid.Column="0">Help:</Label>
         <TextBlock Grid.Row="3" Grid.Column="1" Margin="5">
             <Hyperlink NavigateUri="https://github.com/igolovic/session-time/" Name="LnkDocumentation" RequestNavigate="LnkDocumentation_RequestNavigate">

diff --git a/SessionTimeViewer/MainWindow.xaml b/SessionTimeViewer/MainWindow.xaml
@@ -12,7 +12,7 @@
             <Label DockPanel.Dock="Left" HorizontalAlignment="Left" Margin="0 0 5 0" Content="Parse data records and display sessions and locked/unlocked periods for selected user account:" />
             <ComboBox DockPanel.Dock="Left" HorizontalAlignment="Left" Margin="0 0 5 0" Name="cbUser" />
             <Button DockPanel.Dock="Left" HorizontalAlignment="Left" Name="btnRefresh" Click="BtnRefresh_Click" Width="150">Refresh</Button>
-            <Button DockPanel.Dock="Right" HorizontalAlignment="Right" Name="btnInfo" Click="BtnInfo_Click" Width="150">About</Button>
+            <Button DockPanel.Dock="Right" HorizontalAlignment="Right" Name="btnInfo" Click="BtnInfo_Click" Width="150">Help &amp; about</Button>
         </DockPanel>
         <ListView DockPanel.Dock="Top"  Name="lvSessionMain">
             <ListView.Resources>