41 changed files
BExplorer/BetterExplorer | ||
_MainWindow | ||
MainWindow_Updating.cs | ||
BetterExplorer.csproj | ||
MainWindow.xaml.cs | ||
Shell | ||
Interop | ||
User32.cs | ||
Extensions.cs | ||
ShellTreeViewEx.cs | ||
ShellViewEx.cs | ||
TaskDialog | ||
DesignData | ||
DesignerCommandLink.xaml + | ||
DesignerTaskDialogViewModel.xaml + | ||
Properties | ||
AssemblyInfo.cs + | ||
Resources.Designer.cs + | ||
Resources.resx + | ||
ResourceDictionaries | ||
Common.xaml + | ||
Resources | ||
cmdarr1.png + | ||
cmdarr2.png + | ||
exparr-down1.bmp + | ||
exparr-down2.bmp + | ||
exparr-down3.bmp + | ||
exparr-up1.bmp + | ||
exparr-up2.bmp + | ||
exparr-up3.bmp + | ||
shield-16.png + | ||
shield-32.png + | ||
CommandLink.xaml + | ||
CommandLink.xaml.cs + | ||
Converters.cs + | ||
NativeMethods.cs + | ||
RelayCommand.cs + | ||
SafeNativeMethods.cs + | ||
TaskDialog.cs + | ||
TaskDialog.csproj + | ||
TaskDialog.xaml + | ||
TaskDialog.xaml.cs + | ||
TaskDialogEvents.cs + | ||
TaskDialogInterop.cs + | ||
TaskDialogResult.cs + | ||
TaskDialogTypes.cs + | ||
TaskDialogViewModel.cs + | ||
UnsafeNativeMethods.cs + | ||
VistaActiveTaskDialog.cs + | ||
BExplorer.sln | ||
MainWindow_Updating.cs
/BExplorer/BetterExplorer/_MainWindow/MainWindow_Updating.cs-29+5/BExplorer/BetterExplorer/_MainWindow/MainWindow_Updating.cs
Add comment 10 partial class MainWindow {
Add comment 11 private BackgroundWorker UpdaterWorker;
Add comment 12 private int UpdateCheckType;
Add comment 13 Minus
Add comment 13 Plus private Boolean _IsCheckUpdateFromTimer = false;
Add comment 14 Plus private Boolean _IsUpdateNotificationMessageBoxShown = false;
Add comment 14 15 private void CheckForUpdate(bool ShowUpdateUI = true) {
Add comment 15 16 this.UpdaterWorker = new BackgroundWorker();
Add comment 16 17 this.UpdaterWorker.WorkerSupportsCancellation = true;
Add comment 21 22 this.UpdaterWorker.RunWorkerAsync(ShowUpdateUI);
Add comment 22 23 else if (ShowUpdateUI)
Add comment 23 24 MessageBox.Show("Update in progress! Please wait!");
Add comment 24 Minus
Add comment 25 Minus // var informalVersion = (Assembly.GetExecutingAssembly().GetCustomAttributes(
Add comment 26 Minus //typeof(AssemblyInformationalVersionAttribute), false).FirstOrDefault() as AssemblyInformationalVersionAttribute).InformationalVersion;
Add comment 27 25 }
Add comment 28 26
Add comment 29 27 private void UpdaterWorker_DoWork(object sender, DoWorkEventArgs e) {
Add comment 30 Minus Updater updater = new Updater("http://update.better-explorer.com/update.xml", 5, UpdateCheckType == 1);
Add comment 31 Minus if (updater.LoadUpdateFile()) {
Add comment 32 Minus if ((bool)e.Argument) {
Add comment 28 Plus this._IsCheckUpdateFromTimer = true;
Add comment 33 29 Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Normal,
Add comment 34 Minus (Action)(() => {
Add comment 35 Minus UpdateWizard updateWizzard = new UpdateWizard(updater);
Add comment 36 Minus updateWizzard.ShowDialog(this.GetWin32Window());
Add comment 37 Minus }));
Add comment 38 Minus }
Add comment 39 Minus else {
Add comment 40 Minus Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Normal,
Add comment 41 Minus (Action)(() => {
Add comment 42 Minus stiUpdate.Content = FindResource("stUpdateAvailableCP").ToString().Replace("VER", updater.AvailableUpdates[0].Version);
Add comment 43 Minus stiUpdate.Foreground = System.Windows.Media.Brushes.Red;
Add comment 30 Plus (Action) (() => {
Add comment 31 Plus autoUpdater.ForceCheckForUpdate(true);
Add comment 44 32 }));
Add comment 45 Minus }
Add comment 46 Minus }
Add comment 47 Minus else {
Add comment 48 Minus Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Normal,
Add comment 49 Minus (Action)(() => {
Add comment 50 Minus stiUpdate.Content = FindResource("stUpdateNotAvailableCP").ToString();
Add comment 51 Minus stiUpdate.Foreground = System.Windows.Media.Brushes.Black;
Add comment 52 Minus if ((bool)e.Argument)
Add comment 53 Minus MessageBox.Show(FindResource("stUpdateNotAvailableCP").ToString());
Add comment 54 Minus }));
Add comment 55 Minus }
Add comment 56 Minus
Add comment 57 33 Utilities.SetRegistryValue("LastUpdateCheck", DateTime.Now.ToBinary(), RegistryValueKind.QWord);
Add comment 58 34 LastUpdateCheck = DateTime.Now;
Add comment 59 35 }
BetterExplorer.csproj
/BExplorer/BetterExplorer/BetterExplorer.csproj-1+5/BExplorer/BetterExplorer/BetterExplorer.csproj
Add comment 694 <Project>{509d06bd-aeb6-4e92-8e5b-21188ebdbd9c}</Project>
Add comment 695 <Name>Wpf.TabControl</Name>
Add comment 696 </ProjectReference>
Add comment 697 Plus <ProjectReference Include="..\..\TaskDialog\TaskDialog.csproj">
Add comment 698 Plus <Project>{37fd53f7-8a8f-4427-8ff4-6299e2933a7e}</Project>
Add comment 699 Plus <Name>TaskDialog</Name>
Add comment 700 Plus </ProjectReference>
Add comment 697 701 <ProjectReference Include="..\..\UsbEject\UsbEject.csproj">
Add comment 698 702 <Project>{ae269158-dfa5-4dd7-8afc-f45faf2b958c}</Project>
Add comment 699 703 <Name>UsbEject</Name>
Add comment 1162 1166 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Add comment 1163 1167 <ProjectExtensions>
Add comment 1164 1168 <VisualStudio>
Add comment 1165 Minus <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UseGlobalSettings="True" />
Add comment 1169 Plus <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
Add comment 1166 1170 </VisualStudio>
Add comment 1167 1171 </ProjectExtensions>
Add comment 1168 1172 <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs/BExplorer/BetterExplorer/MainWindow.xaml.cs
DesignerCommandLink.xaml
/TaskDialog/DesignData/DesignerCommandLink.xaml/TaskDialog/DesignData/DesignerCommandLink.xaml
DesignerTaskDialogViewModel.xaml
/TaskDialog/DesignData/DesignerTaskDialogViewModel.xaml/TaskDialog/DesignData/DesignerTaskDialogViewModel.xaml
Resources.Designer.cs
/TaskDialog/Properties/Resources.Designer.cs/TaskDialog/Properties/Resources.Designer.cs
Common.xaml
/TaskDialog/ResourceDictionaries/Common.xaml/TaskDialog/ResourceDictionaries/Common.xaml
VistaActiveTaskDialog.cs
/TaskDialog/VistaActiveTaskDialog.cs/TaskDialog/VistaActiveTaskDialog.cs