dialog cleanup

HoloLensCommander/HoloLensCommander/Dialogs/GetAppInstallFilesDialog.xaml

@@ -11,22 +11,22 @@
     SecondaryButtonText="Cancel"
     PrimaryButtonClick="ContentDialog_OkClick"
     MaxHeight="500" 
-    MaxWidth="650">
+    MaxWidth="700">
     <StackPanel>
         <TextBlock 
             x:Name="appPackageLabel" 
             Text="Application package" 
             TextWrapping="NoWrap" FontSize="16"
-            Width="600"/>
+            Width="650"/>
         <Canvas
-            Width="600" Height="90">
+            Width="650" Height="50">
             <TextBox
                 x:Name="appPackage"
                 Text="{Binding Path=AppPackageFileName}"
                 ToolTipService.ToolTip="The application package file"
                 FontSize="16"
                 IsReadOnly="True"
-                Width="545"
+                Width="540"
                 Canvas.Top="5"/>
             <Button 
                 x:Name="browseForAppPackage"
@@ -34,9 +34,8 @@
                 Command="{Binding Path=BrowseForAppPackageCommand}"
                 ToolTipService.ToolTip="Browse for the application package file"
                 FontSize="16"
-<<<<<<< HEAD
                 Width="50" Height="40"
-                Canvas.Left="550"/>
+                Canvas.Left="545"/>
             <Button 
                 x:Name="browseForParentFolder"
                 Content="&#xED43;"
@@ -44,27 +43,15 @@
                 ToolTipService.ToolTip="Browse for the application package folder"
                 FontFamily="Segoe MDL2 Assets" FontSize="16"
                 Width="50" Height="40"
-                Canvas.Left="550" Canvas.Top="50"/>
-=======
-                Width="30" Height="40"
-                Canvas.Left="590"/>
-            <Button 
-                x:Name="browseForParentFolder"
-                Content="../"
-                Command="{Binding BrowseForParentFolderCommand}"
-                ToolTipService.ToolTip="Browse for the installation folder"
-                FontSize="16"
-                Width="35" Height="40"
-                Canvas.Left="550"/>
->>>>>>> upstream/master
+                Canvas.Left="600"/>
         </Canvas>
         <TextBlock 
             x:Name="certFileLabel" 
             Text="Application certificate" 
             TextWrapping="NoWrap" FontSize="16"
-            Width="600"/>
+            Width="650"/>
         <Canvas
-            Width="600" Height="50">
+            Width="650" Height="50">
             <TextBox
                 x:Name="certFileName"
                 Text="{Binding Path=AppCertificateFileName}"
@@ -86,9 +73,9 @@
             x:Name="dependencyFilesLabel" 
             Text="Dependency files" 
             TextWrapping="NoWrap" FontSize="16"
-            Width="600"/>
+            Width="650"/>
         <Canvas
-            Width="600" Height="115">
+            Width="650" Height="115">
             <ListBox 
                 x:Name="dependencyList" 
                 ItemsSource="{Binding Path=DependencyFileNames}"
@@ -122,7 +109,7 @@
             x:Name="dependencyArchitectureLabel" 
             Text="Dependency architecture" 
             TextWrapping="NoWrap" FontSize="16"
-            Width="600"/>
+            Width="650"/>
         <StackPanel
             Orientation="Horizontal">
             <RadioButton 
@@ -134,10 +121,6 @@
                 Content="x64" 
                 GroupName="Architecture" 
                 Checked="RadioButton_Checked"/>
-            <RadioButton 
-                Content="ARM"
-                GroupName="Architecture" 
-                Checked="RadioButton_Checked"/>
         </StackPanel>
     </StackPanel>
 </ContentDialog>

HoloLensCommander/HoloLensCommander/Dialogs/GetAppInstallFilesDialogViewModelCommands.cs

@@ -150,16 +150,11 @@ namespace HoloLensCommander
 
             StorageFolder dependenciesFolder = await appPackageFolder.GetFolderAsync(@"Dependencies\x86");
 
-            if (this.ProcessorArchitectureValue == "x64")
+            if (string.Equals(this.ProcessorArchitectureValue, "x64"))
             {
                 dependenciesFolder = await appPackageFolder.GetFolderAsync(@"Dependencies\x64");
             }
 
-            if (this.ProcessorArchitectureValue == "ARM")
-            {
-                dependenciesFolder = await appPackageFolder.GetFolderAsync(@"Dependencies\ARM");
-            }
-
             IReadOnlyList<StorageFile> dependencies = await dependenciesFolder.GetFilesAsync();
             foreach (StorageFile dependency in dependencies.Where(appxFilter))
             {

HoloLensCommander/HoloLensCommander/Dialogs/ManageAppsDialogViewModelCommands.cs

@@ -80,8 +80,6 @@ namespace HoloLensCommander
         /// <returns>Task object used for tracking method completion.</returns>
         private async Task RefreshInstalledAppsAsync()
         {
-            //this.StatusMessage = "Refreshing list of installed apps.";
-
             AppPackages installedApps = await this.deviceMonitor.GetInstalledApplicationsAsync();
 
             List<string> appNames = Utilities.GetAppNamesFromPackageInfo(

HoloLensCommander/HoloLensCommander/Dialogs/ManageAppsDialogViewModelProperties.cs

@@ -119,27 +119,6 @@ namespace HoloLensCommander
             }
         }
 
-        /// <summary>
-        /// Gets the message to be displayed to the user.
-        /// </summary>
-        private string statusMessage = string.Empty;
-        public string StatusMessage
-        {
-            get
-            {
-                return this.statusMessage;
-            }
-
-            private set
-            {
-                if (this.statusMessage != value)
-                {
-                    this.statusMessage = value;
-                    this.NotifyPropertyChanged("StatusMessage");
-                }
-            }
-        }
-
         /// <summary>
         /// Updates the value of the CanRunApp property.
         /// </summary>