[Projects] Add Select all checkbox, Delete selected button

src/modules/Projects/ProjectsEditor/Models/Application.cs

@@ -71,8 +71,21 @@ namespace ProjectsEditor.Models
             }
         }
 
+        private bool _isSelected;
+
         [JsonIgnore]
-        public bool IsSelected { get; set; }
+        public bool IsSelected
+        {
+            get => _isSelected;
+            set
+            {
+                if (_isSelected != value)
+                {
+                    _isSelected = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelected)));
+                }
+            }
+        }
 
         [JsonIgnore]
         public bool IsHighlighted { get; set; }

src/modules/Projects/ProjectsEditor/Models/Project.cs

@@ -121,7 +121,7 @@ namespace ProjectsEditor.Models
 
         public bool CanBeSaved
         {
-            get => Name.Length > 0 && Applications.Where(x => x.IsSelected).Any();
+            get => Name.Length > 0 && Applications.Count > 0;
         }
 
         private bool _isPopupVisible;
@@ -177,11 +177,13 @@ namespace ProjectsEditor.Models
         {
             get
             {
-                int count = Applications.Where(x => x.IsSelected).Count();
+                int count = Applications.Count;
                 return count.ToString(CultureInfo.InvariantCulture) + " " + (count == 1 ? Properties.Resources.App : Properties.Resources.Apps);
             }
         }
 
+        public bool IsAnySelected { get => Applications?.Any(x => x.IsSelected) == true; }
+
         public List<MonitorSetup> Monitors { get; set; }
 
         private BitmapImage _previewIcons;
@@ -216,7 +218,7 @@ namespace ProjectsEditor.Models
                     PackageFullName = item.PackageFullName,
                     Minimized = item.Minimized,
                     Maximized = item.Maximized,
-                    IsSelected = item.IsSelected,
+                    IsSelected = false,
                     MonitorNumber = item.MonitorNumber,
                     IsNotFound = item.IsNotFound,
                     Position = new Application.WindowPosition() { X = item.Position.X, Y = item.Position.Y, Height = item.Position.Height, Width = item.Position.Width },

src/modules/Projects/ProjectsEditor/ProjectEditorPage.xaml

@@ -103,7 +103,7 @@
                     </TextBlock>
                     <CheckBox
                         Grid.Column="5"
-                        IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                        IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         Checked="CheckBox_Checked"
                         Unchecked="CheckBox_Checked"
                         Margin="10"/>
@@ -151,21 +151,41 @@
                 Foreground="{DynamicResource PrimaryForegroundBrush}"
                 VerticalAlignment="Center"/>
         </StackPanel>
-        <StackPanel Grid.Row="1" Orientation="Vertical">
+        <DockPanel Grid.Row="1">
-            <TextBlock Text="{x:Static props:Resources.ProjectName}" FontSize="14" FontWeight="Normal" Foreground="{DynamicResource PrimaryForegroundBrush}"/>
+            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" >
-            <TextBox
+                <Button x:Name="DeleteButton"
-                x:Name="EditNameTextBox"
+                    Margin="10,0,0,0"
-                Width="320"
+                    Height="36"
-                Text="{Binding Name, Mode=TwoWay}"
+                    Padding="24,0,24,0"
-                Background="{DynamicResource SecondaryBackgroundBrush}"
+                    Content="{x:Static props:Resources.DeleteSelected}"
-                BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                    Background="{DynamicResource SecondaryBackgroundBrush}"
-                BorderThickness="2"
+                    AutomationProperties.Name="{x:Static props:Resources.Cancel}"
-                Margin="0,6,0,6"
+                    IsEnabled="{Binding IsAnySelected, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                HorizontalAlignment="Left"
+                    Click="RemoveSelectedButtonClicked"/>
-                GotFocus="EditNameTextBox_GotFocus"
+                <CheckBox
-                TextChanged="EditNameTextBox_TextChanged"
+                    x:Name="SelectAllCheckBox"
-                KeyDown="EditNameTextBoxKeyDown" />
+                    Margin="10,0,0,0"
-        </StackPanel>
+                    FontSize="14"
+                    Content="{x:Static props:Resources.SelectedAllInProject}"
+                    Checked="SelectAllCheckBox_Modified"
+                    Unchecked="SelectAllCheckBox_Modified"/>
+            </StackPanel>
+            <StackPanel DockPanel.Dock="Left" Orientation="Vertical">
+                <TextBlock Text="{x:Static props:Resources.ProjectName}" FontSize="14" FontWeight="Normal" Foreground="{DynamicResource PrimaryForegroundBrush}"/>
+                <TextBox
+                    x:Name="EditNameTextBox"
+                    Width="320"
+                    Text="{Binding Name, Mode=TwoWay}"
+                    Background="{DynamicResource SecondaryBackgroundBrush}"
+                    BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                    BorderThickness="2"
+                    Margin="0,6,0,6"
+                    HorizontalAlignment="Left"
+                    GotFocus="EditNameTextBox_GotFocus"
+                    TextChanged="EditNameTextBox_TextChanged"
+                    KeyDown="EditNameTextBoxKeyDown" />
+            </StackPanel>
+        </DockPanel>
         <Border
             Grid.Row="2"
             HorizontalAlignment="Stretch"
@@ -189,7 +209,7 @@
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <ItemsControl
-                        ItemsSource="{Binding ApplicationsListed, Mode=OneWay}"
+                        ItemsSource="{Binding ApplicationsListed, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
                         ItemTemplateSelector="{StaticResource AppListDataTemplateSelector}">
                     </ItemsControl>
                 </Grid>

src/modules/Projects/ProjectsEditor/ProjectEditorPage.xaml.cs

@@ -30,6 +30,7 @@ namespace ProjectsEditor
             Models.Application application = checkBox.DataContext as Models.Application;
             Models.Project project = application.Parent;
             project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.CanBeSaved)));
+            project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.IsAnySelected)));
             project.Initialize();
         }
 
@@ -40,6 +41,12 @@ namespace ProjectsEditor
             _mainViewModel.SwitchToMainView();
         }
 
+        private void RemoveSelectedButtonClicked(object sender, RoutedEventArgs e)
+        {
+            Project projectToSave = this.DataContext as Project;
+            _mainViewModel.RemoveSelectedApps(projectToSave);
+        }
+
         private void CancelButtonClicked(object sender, RoutedEventArgs e)
         {
             _mainViewModel.CancelLastEdit();
@@ -91,5 +98,12 @@ namespace ProjectsEditor
             project.Name = EditNameTextBox.Text;
             project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.CanBeSaved)));
         }
+
+        private void SelectAllCheckBox_Modified(object sender, RoutedEventArgs e)
+        {
+            Project project = this.DataContext as Project;
+            bool newValue = SelectAllCheckBox.IsChecked == true;
+            _mainViewModel.UpdateIsSelectedStates(project, newValue);
+        }
     }
 }

src/modules/Projects/ProjectsEditor/Properties/Resources.Designer.cs

@@ -168,6 +168,15 @@ namespace ProjectsEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remove Selected Apps.
+        /// </summary>
+        public static string DeleteSelected {
+            get {
+                return ResourceManager.GetString("DeleteSelected", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit.
         /// </summary>
@@ -438,6 +447,15 @@ namespace ProjectsEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Select All Apps in Project.
+        /// </summary>
+        public static string SelectedAllInProject {
+            get {
+                return ResourceManager.GetString("SelectedAllInProject", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sort by.
         /// </summary>

src/modules/Projects/ProjectsEditor/Properties/Resources.resx

@@ -150,6 +150,9 @@
   <data name="Delete" xml:space="preserve">
     <value>Remove</value>
   </data>
+  <data name="DeleteSelected" xml:space="preserve">
+    <value>Remove Selected Apps</value>
+  </data>
   <data name="Delete_Project_Dialog_Announce" xml:space="preserve">
     <value>Delete project dialog.</value>
   </data>
@@ -243,6 +246,9 @@
   <data name="SecondsAgo" xml:space="preserve">
     <value>seconds ago</value>
   </data>
+  <data name="SelectedAllInProject" xml:space="preserve">
+    <value>Select All Apps in Project</value>
+  </data>
   <data name="SortBy" xml:space="preserve">
     <value>Sort by</value>
   </data>

src/modules/Projects/ProjectsEditor/Utils/DrawHelper.cs

@@ -48,8 +48,7 @@ namespace ProjectsEditor.Utils
 
             Dictionary<string, int> repeatCounter = new Dictionary<string, int>();
 
-            var selectedApps = project.Applications.Where(x => x.IsSelected);
+            foreach (Application app in project.Applications)
-            foreach (Application app in selectedApps)
             {
                 if (repeatCounter.TryGetValue(app.AppPath, out int value))
                 {
@@ -64,12 +63,12 @@ namespace ProjectsEditor.Utils
             }
 
             // remove those repeatIndexes, which are single 1-es (no repetitions) by setting them to 0
-            foreach (Application app in selectedApps.Where(x => repeatCounter[x.AppPath] == 1))
+            foreach (Application app in project.Applications.Where(x => repeatCounter[x.AppPath] == 1))
             {
                 app.RepeatIndex = 0;
             }
 
-            foreach (Application app in project.Applications.Where(x => !x.IsSelected))
+            foreach (Application app in project.Applications)
             {
                 app.RepeatIndex = 0;
             }
@@ -112,7 +111,7 @@ namespace ProjectsEditor.Utils
                     g.FillRectangle(monitorBrush, new Rectangle(TransformX(monitor.MonitorDpiAwareBounds.Left), TransformY(monitor.MonitorDpiAwareBounds.Top), Scaled(monitor.MonitorDpiAwareBounds.Width), Scaled(monitor.MonitorDpiAwareBounds.Height)));
                 }
 
-                var appsToDraw = project.Applications.Where(x => x.IsSelected && !x.Minimized);
+                var appsToDraw = project.Applications.Where(x => !x.Minimized);
 
                 // draw the highlighted app at the end to have its icon in the foreground for the case there are overlapping icons
                 foreach (Application app in appsToDraw.Where(x => !x.IsHighlighted))
@@ -129,7 +128,7 @@ namespace ProjectsEditor.Utils
 
                 // draw the minimized windows
                 Rectangle rectMinimized = new Rectangle(0, Scaled((bounds.Height * 1.02) + (horizontalGaps.Count * gapHeight)), Scaled(bounds.Width + (verticalGaps.Count * gapWidth)), Scaled(bounds.Height * 0.18));
-                DrawWindow(g, brush, rectMinimized, project.Applications.Where(x => x.IsSelected && x.Minimized));
+                DrawWindow(g, brush, rectMinimized, project.Applications.Where(x => x.Minimized));
             }
 
             using (var memory = new MemoryStream())
@@ -264,8 +263,7 @@ namespace ProjectsEditor.Utils
 
         public static BitmapImage DrawPreviewIcons(Project project)
         {
-            var selectedApps = project.Applications.Where(x => x.IsSelected);
+            int appsCount = project.Applications.Count;
-            int appsCount = selectedApps.Count();
             if (appsCount == 0)
             {
                 return null;
@@ -278,7 +276,7 @@ namespace ProjectsEditor.Utils
                 graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
                 graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
                 int appIndex = 0;
-                foreach (var app in selectedApps)
+                foreach (var app in project.Applications)
                 {
                     try
                     {

src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs

@@ -117,7 +117,7 @@ namespace ProjectsEditor.Utils
                     CommandLineArguments = app.CommandLineArguments,
                     Maximized = app.Maximized,
                     Minimized = app.Minimized,
-                    IsSelected = true,
+                    IsSelected = false,
                     IsNotFound = false,
                     Position = new Models.Application.WindowPosition()
                     {
@@ -161,27 +161,24 @@ namespace ProjectsEditor.Utils
 
                 foreach (var app in project.Applications)
                 {
-                    if (app.IsSelected)
+                    wrapper.Applications.Add(new ProjectsData.ApplicationWrapper
                     {
-                        wrapper.Applications.Add(new ProjectsData.ApplicationWrapper
+                        Application = app.AppName,
+                        ApplicationPath = app.AppPath,
+                        Title = app.AppTitle,
+                        PackageFullName = app.PackageFullName,
+                        CommandLineArguments = app.CommandLineArguments,
+                        Maximized = app.Maximized,
+                        Minimized = app.Minimized,
+                        Position = new ProjectsData.ApplicationWrapper.WindowPositionWrapper
                         {
-                            Application = app.AppName,
+                            X = app.Position.X,
-                            ApplicationPath = app.AppPath,
+                            Y = app.Position.Y,
-                            Title = app.AppTitle,
+                            Height = app.Position.Height,
-                            PackageFullName = app.PackageFullName,
+                            Width = app.Position.Width,
-                            CommandLineArguments = app.CommandLineArguments,
+                        },
-                            Maximized = app.Maximized,
+                        Monitor = app.MonitorNumber,
-                            Minimized = app.Minimized,
+                    });
-                            Position = new ProjectsData.ApplicationWrapper.WindowPositionWrapper
-                            {
-                                X = app.Position.X,
-                                Y = app.Position.Y,
-                                Height = app.Position.Height,
-                                Width = app.Position.Width,
-                            },
-                            Monitor = app.MonitorNumber,
-                        });
-                    }
                 }
 
                 foreach (var monitor in project.Monitors)

src/modules/Projects/ProjectsEditor/ViewModels/MainViewModel.cs

@@ -88,7 +88,7 @@ namespace ProjectsEditor.ViewModels
                     return false;
                 }
 
-                return x.Applications.Any(app => app.IsSelected && app.AppName.Contains(_searchTerm, StringComparison.InvariantCultureIgnoreCase));
+                return x.Applications.Any(app => app.AppName.Contains(_searchTerm, StringComparison.InvariantCultureIgnoreCase));
             });
         }
 
@@ -159,18 +159,7 @@ namespace ProjectsEditor.ViewModels
             editedProject.IsShortcutNeeded = projectToSave.IsShortcutNeeded;
             editedProject.PreviewIcons = projectToSave.PreviewIcons;
             editedProject.PreviewImage = projectToSave.PreviewImage;
-            for (int appIndex = editedProject.Applications.Count - 1; appIndex >= 0; appIndex--)
+            editedProject.Applications = projectToSave.Applications;
-            {
-                if (!projectToSave.Applications[appIndex].IsSelected)
-                {
-                    editedProject.Applications.RemoveAt(appIndex);
-                }
-                else
-                {
-                    editedProject.Applications[appIndex].IsSelected = true;
-                    editedProject.Applications[appIndex].CommandLineArguments = projectToSave.Applications[appIndex].CommandLineArguments;
-                }
-            }
 
             editedProject.OnPropertyChanged(new System.ComponentModel.PropertyChangedEventArgs("AppsCountString"));
             editedProject.Initialize();
@@ -360,5 +349,23 @@ namespace ProjectsEditor.ViewModels
                 project.IsPopupVisible = false;
             }
         }
+
+        internal void UpdateIsSelectedStates(Project project, bool newValue)
+        {
+            foreach (Application app in project.Applications)
+            {
+                app.IsSelected = newValue;
+            }
+
+            project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.IsAnySelected)));
+        }
+
+        internal void RemoveSelectedApps(Project project)
+        {
+            project.Applications.RemoveAll(app => app.IsSelected);
+            project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.ApplicationsListed)));
+            project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.IsAnySelected)));
+            project.OnPropertyChanged(new PropertyChangedEventArgs(nameof(Project.CanBeSaved)));
+        }
     }
 }