* Fixed duplicated tooltips for sound preview buttons
* If Filtration is not running in its expected installation directory it will not check for updates - this enables us to release a zip file release that won't fail an update check every time it's run
This commit is contained in:
		
							parent
							
								
									2ba1b8adac
								
							
						
					
					
						commit
						0fe21336e6
					
				| @ -10,12 +10,14 @@ | |||||||
|     <requireLicenseAcceptance>false</requireLicenseAcceptance> |     <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||||||
|     <copyright>Copyright 2018</copyright> |     <copyright>Copyright 2018</copyright> | ||||||
|     <releaseNotes>* Added support for new Prophecies block item type |     <releaseNotes>* Added support for new Prophecies block item type | ||||||
|  | * Added Betrayal League Item Base Types and Item Classes to static data | ||||||
| * All open filter scripts are now remembered on exit and reopened when the application is started rather than just the last opened one (#95) | * All open filter scripts are now remembered on exit and reopened when the application is started rather than just the last opened one (#95) | ||||||
| * Filter sections are once again now expanded by default when scripts are opened, unless the new "Auto-expand all sections when opening scripts" setting is disabled | * Filter sections are once again now expanded by default when scripts are opened, unless the new "Auto-expand all sections when opening scripts" setting is disabled | ||||||
| * A new Clear Styles button has been added which removes all styles from the selected block (#96) | * A new Clear Styles button has been added which removes all styles from the selected block (#96) | ||||||
| * New buttons for adding/removing DisableDropSound from selected blocks have been added (#110) | * New buttons for adding/removing DisableDropSound from selected blocks have been added (#110) | ||||||
| * The Enable/Disable Block toggle button is now visible on both the Regular Block Items and Appearance Block Items views | * The Enable/Disable Block toggle button is now visible on both the Regular Block Items and Appearance Block Items views | ||||||
| * When there are too many block items to fit horizontally in a block a horizontal scrollbar will now appear | * When there are too many block items to fit horizontally in a block a horizontal scrollbar will now appear | ||||||
|  | * Fixed the previously incorrect handling of DisableDropSound as a true/false value when in fact it is enabled/disabled purely by its presence or lack thereof in a block (#111) | ||||||
| * Fixed the application freezing for a long period of time when Ctrl+A (Select All) is performed | * Fixed the application freezing for a long period of time when Ctrl+A (Select All) is performed | ||||||
| * Fixed the Switch to Appearance/Regular Block Items text overlapping block items | * Fixed the Switch to Appearance/Regular Block Items text overlapping block items | ||||||
| * Fixed theme saving (blank theme files were being saved) (#83) | * Fixed theme saving (blank theme files were being saved) (#83) | ||||||
|  | |||||||
| @ -1,5 +1,7 @@ | |||||||
| using System; | using System; | ||||||
|  | using System.IO; | ||||||
| using System.Linq; | using System.Linq; | ||||||
|  | using System.Reflection; | ||||||
| using System.Text.RegularExpressions; | using System.Text.RegularExpressions; | ||||||
| using System.Threading.Tasks; | using System.Threading.Tasks; | ||||||
| using Filtration.Enums; | using Filtration.Enums; | ||||||
| @ -117,6 +119,17 @@ namespace Filtration.Services | |||||||
|                 _downloadPrereleaseUpdates = true; |                 _downloadPrereleaseUpdates = true; | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  |                 var expectedInstallationPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Filtration"); | ||||||
|  |                 var baseDirectory = AppDomain.CurrentDomain.BaseDirectory; | ||||||
|  | 
 | ||||||
|  |                 var runningInstalled = baseDirectory.StartsWith(expectedInstallationPath); | ||||||
|  | 
 | ||||||
|  |                 if (!runningInstalled) | ||||||
|  |                 { | ||||||
|  |                     Logger.Debug($"Skipping update check since base directory of {baseDirectory} does not start with the expected installation path of {expectedInstallationPath}"); | ||||||
|  |                     return; | ||||||
|  |                 } | ||||||
|  | 
 | ||||||
|                 async Task CheckForUpdatesAsync(IUpdateManager updateManager) |                 async Task CheckForUpdatesAsync(IUpdateManager updateManager) | ||||||
|                 { |                 { | ||||||
|                     _updates = await updateManager.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress))); |                     _updates = await updateManager.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress))); | ||||||
|  | |||||||
| @ -158,7 +158,7 @@ | |||||||
|                                         Visibility="{Binding HasPositionalSound, Converter={StaticResource BooleanVisibilityConverter}}" |                                         Visibility="{Binding HasPositionalSound, Converter={StaticResource BooleanVisibilityConverter}}" | ||||||
|                                         Background="Transparent" |                                         Background="Transparent" | ||||||
|                                         BorderBrush="Transparent" |                                         BorderBrush="Transparent" | ||||||
|                                         ToolTip="Click to preview drop sound"> |                                         ToolTip="Click to preview positional drop sound"> | ||||||
|                                     <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" /> |                                     <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" /> | ||||||
|                                 </Button> |                                 </Button> | ||||||
|                                 <Button Command="{Binding PlayCustomSoundCommand}" |                                 <Button Command="{Binding PlayCustomSoundCommand}" | ||||||
| @ -170,7 +170,7 @@ | |||||||
|                                         Visibility="{Binding HasCustomSound, Converter={StaticResource BooleanVisibilityConverter}}" |                                         Visibility="{Binding HasCustomSound, Converter={StaticResource BooleanVisibilityConverter}}" | ||||||
|                                         Background="Transparent" |                                         Background="Transparent" | ||||||
|                                         BorderBrush="Transparent" |                                         BorderBrush="Transparent" | ||||||
|                                         ToolTip="Click to preview drop sound"> |                                         ToolTip="Click to preview custom drop sound"> | ||||||
|                                     <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" /> |                                     <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" /> | ||||||
|                                 </Button> |                                 </Button> | ||||||
|                                 <Line Y1="5" Y2="38" StrokeThickness="2" Panel.ZIndex="999" |                                 <Line Y1="5" Y2="38" StrokeThickness="2" Panel.ZIndex="999" | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user