Skip to content

Commit

Permalink
Merge pull request #2000 from diogotr7/feature/about
Browse files Browse the repository at this point in the history 
Updated about screen
  • Loading branch information
@diogotr7
diogotr7 authored May 14, 2020
2 parents 660c03e + 7ddef49 commit f21e2d8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
37 changes: 23 additions & 14 deletions Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,12 @@
<CheckBox Content="Enable Audio Capture (for gamestates)" ToolTip="Aurora only measures the activity level from your microphone for use with the 'LocalPCInfo' game state. None of this data is stored or transmitted elsewhere." HorizontalAlignment="Left" Margin="512,39,0,0" VerticalAlignment="Top" IsChecked="{Binding EnableAudioCapture}" />
</Grid>
</TabItem>
<TabItem Header="Volume Overlay">
<Grid>
<TextBlock HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="The Volume Overlay has moved to the Overlays section of Desktop! If you cannot find it try creating a new profile and copying the Volume Overlay layer over to your profile! To control the delay go into the Overrides section of the layer, go to Enabled, find the 'For x seconds' and change those" VerticalAlignment="Top"/>
</Grid>
</TabItem>
<TabItem Header="Away Effects">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="587*"/>
<ColumnDefinition Width="257*"/>
</Grid.ColumnDefinitions>
<TextBlock HorizontalAlignment="Left" Margin="10,12,0,0" TextWrapping="Wrap" Text="Away Effect Type: " VerticalAlignment="Top"/>
<ComboBox x:Name="idle_effects_type" HorizontalAlignment="Left" Margin="110,10,0,0" VerticalAlignment="Top" Width="170" ItemsSource="{Binding Source={StaticResource IdleEffects}}" ItemTemplate="{Binding Source={StaticResource IdleEffectsTemplate}}" SelectionChanged="idle_effects_type_SelectionChanged"/>
<TextBlock HorizontalAlignment="Left" Margin="10,38,0,0" TextWrapping="Wrap" Text="Delay:" VerticalAlignment="Top"/>
Expand Down Expand Up @@ -340,18 +339,28 @@
<TabItem Header="About">
<Grid>
<Label Content="Aurora" HorizontalAlignment="Left" Margin="143,10,0,0" VerticalAlignment="Top" FontWeight="Bold" FontSize="14"/>
<!--<Label Content="by Antonpup &amp; simon-wh" HorizontalAlignment="Left" Margin="294,12,0,0" VerticalAlignment="Top"/>-->
<TextBlock HorizontalAlignment="Left" Margin="148,44,0,0" TextWrapping="Wrap" VerticalAlignment="Top">
<Run Text="This is a public Beta version of Aurora, there will be bugs and issues."/><LineBreak/><LineBreak/>
<Run Text="You can report problems and give suggestions to me via "/><Hyperlink NavigateUri="http://steamcommunity.com/id/SimonWhyte/" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Steam"/></Hyperlink><LineBreak/>
<Run Text="or you can create an issue on "/><Hyperlink NavigateUri="https://github.com/antonpup/Aurora/issues/" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Github"/></Hyperlink><Run Text="."/><LineBreak/><LineBreak/>
<Run Text="The source code for this project is available on "/><Hyperlink NavigateUri="https://github.com/antonpup/Aurora/" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Github"/></Hyperlink><LineBreak/>
<Run Text="Game logos and other images are owned by their respective owners."/><LineBreak/><LineBreak/>
<Run Text="Some icons are used with the free license from"/><Hyperlink NavigateUri="https://icons8.com" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Icons8"/></Hyperlink><LineBreak/><LineBreak/>
<Run Text="I can be contacted at [email protected]"/><LineBreak/><LineBreak/>
<Run Text="This is a public Beta version of Aurora, there will be bugs and issues."/>
<LineBreak/>
<LineBreak/>
<Run Text="You can report problems and give suggestions by "/><Hyperlink NavigateUri="https://github.com/antonpup/Aurora/issues/" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="making an issue."/></Hyperlink>
<LineBreak/>
<LineBreak/>
<Run Text="The source code for this project is available on "/><Hyperlink NavigateUri="https://github.com/antonpup/Aurora/" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Github"/></Hyperlink>
<LineBreak/>
<LineBreak/>
<Run Text="Game logos and other images are owned by their respective owners."/>
<LineBreak/>
<LineBreak/>
<Run Text="Some icons are used with the free license from "/><Hyperlink NavigateUri="https://icons8.com" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Icons8"/></Hyperlink>
<LineBreak/>
<LineBreak/>
<Hyperlink NavigateUri="https://discord.gg/YAuBmg9" RequestNavigate="Hyperlink_RequestNavigate"><Run Text="Aurora's Discord Server"/></Hyperlink>
<LineBreak/>
<LineBreak/>
<Run Text="Made by all the"/> <Hyperlink NavigateUri="https://github.com/antonpup/Aurora#contributors-" RequestNavigate="Hyperlink_RequestNavigate"> <Run Text="contributors"/></Hyperlink>
</TextBlock>
<Label x:Name="lblVersion" Content="beta v0.6.0-dev2" HorizontalAlignment="Left" Margin="198,12,0,0" VerticalAlignment="Top"/>
<Label x:Name="lblVersion" Content="VERSION PLACEHOLDER" HorizontalAlignment="Left" Margin="198,12,0,0" VerticalAlignment="Top"/>
<Image HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Source="/Aurora;component/Resources/aurora_logo.png" Width="128"/>
</Grid>
</TabItem>
Expand Down
2 changes: 1 addition & 1 deletion Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public Control_Settings()

string v = FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion;

this.lblVersion.Content = ((int.Parse(v[0].ToString()) > 0) ? "" : "beta ") + $"v{v}" + " by Antonpup & simon-wh";
this.lblVersion.Content = ((int.Parse(v[0].ToString()) > 0) ? "" : "beta ") + $"v{v}";

this.start_silently_enabled.IsChecked = Global.Configuration.start_silently;

Expand Down

0 comments on commit f21e2d8

Please sign in to comment.