Fixed a small bug in the about tab, about tab can now be accessed eve…

…n if the initial configuration hasn't been done
BlackTasty · Jun 21, 2018 · f4c2a30 · f4c2a30
1 parent 1f35341
commit f4c2a30
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/Osmo/Core/FixedValues.cs b/Osmo/Core/FixedValues.cs
@@ -26,6 +26,7 @@ internal static void InitializeReader()
         internal const int EDITOR_INDEX = 2;
         internal const int MIXER_INDEX = 3;
         internal const int CONFIG_INDEX = 5;
+        internal const int ABOUT_INDEX = 6;
         internal const int TEMPLATE_EDITOR_INDEX = 7;
 
         internal static SkinElementReader readerInterface;

diff --git a/Osmo/MainWindow.xaml.cs b/Osmo/MainWindow.xaml.cs
@@ -50,9 +50,13 @@ private void UIElement_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEven
 
         private void sidebarMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (sidebarMenu.SelectedIndex != FixedValues.CONFIG_INDEX && !configuration.IsValid)
+            if (sidebarMenu.SelectedIndex != FixedValues.ABOUT_INDEX)
             {
-                sidebarMenu.SelectedIndex = FixedValues.CONFIG_INDEX;
+                if (sidebarMenu.SelectedIndex != FixedValues.CONFIG_INDEX &&
+                    !configuration.IsValid)
+                {
+                    sidebarMenu.SelectedIndex = FixedValues.CONFIG_INDEX;
+                }
             }
 
             //until we had a StaysOpen glag to Drawer, this will help with scroll bars

diff --git a/Osmo/Properties/AssemblyInfo.cs b/Osmo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.0.1.50")]
+[assembly: AssemblyFileVersion("0.0.1.50")]
diff --git a/Osmo/UI/About.xaml b/Osmo/UI/About.xaml
@@ -23,13 +23,13 @@
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
             <material:PackIcon Kind="Application" Height="80" Width="80"/>
-            <TextBlock x:Name="txt_header" Text="Osmo " Style="{StaticResource MaterialDesignDisplay3TextBlock}"/>
+            <TextBlock x:Name="txt_header" Text="Osmo Alpha " Style="{StaticResource MaterialDesignDisplay3TextBlock}"/>
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center">
             <material:PackIcon Kind="GithubCircle" Height="22" Width="22"/>
             <TextBlock Margin="8,0,0,0" Text="{DynamicResource about_openSource1}" VerticalAlignment="Center" Style="{StaticResource MaterialDesignSubheadingTextBlock}"/>
-            <TextBlock Text="Click here" TextDecorations="Underline" VerticalAlignment="Center" Style="{StaticResource MaterialDesignSubheadingTextBlock}" Cursor="Hand" PreviewMouseDown="GitHubLink_PreviewMouseDown">
+            <TextBlock TextDecorations="Underline" VerticalAlignment="Center" Style="{StaticResource MaterialDesignSubheadingTextBlock}" Cursor="Hand" PreviewMouseDown="GitHubLink_PreviewMouseDown">
                 <Run Text=" "/><Run Text="{DynamicResource about_openSource2}"/><Run Text=" "/>
             </TextBlock>
             <TextBlock Text="{DynamicResource about_openSource3}" VerticalAlignment="Center" Style="{StaticResource MaterialDesignSubheadingTextBlock}"/>

diff --git a/Osmo/UI/About.xaml.cs b/Osmo/UI/About.xaml.cs
@@ -24,6 +24,8 @@ public partial class About : UserControl
     {
         private static About instance;
 
+        private bool versionAdded;
+
         public static About Instance
         {
             get
@@ -46,7 +48,11 @@ private void GitHubLink_PreviewMouseDown(object sender, MouseButtonEventArgs e)
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            txt_header.Text += Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            if (!versionAdded)
+            {
+                txt_header.Text += Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                versionAdded = true;
+            }
         }
     }
 }