Move buttons for icons to bottom

Author: MattEqualsCoder

MSUScripter/Services/ControlServices/MsuProjectWindowService.cs

@@ -286,7 +286,7 @@ public void FilterTree()
     {
         var hasFilterToggle = _viewModel.FilterOnlyTracksMissingSongs || _viewModel.FilterOnlyIncomplete ||
                               _viewModel.FilterOnlyMissingAudio || _viewModel.FilterOnlyCopyrightUntested;
-        _viewModel.FilterEyeIcon = hasFilterToggle ? MaterialIconKind.EyeCheck : MaterialIconKind.Eye;
+        _viewModel.FilterEyeIcon = hasFilterToggle ? MaterialIconKind.FilterCheck : MaterialIconKind.Filter;
         List<MsuProjectWindowViewModelTreeData> parentTreeItems = [];
         var filterText = string.IsNullOrEmpty(_viewModel.FilterText) ? null : _viewModel.FilterText.ToLower();
         foreach (var treeData in _viewModel.TreeItems)

MSUScripter/ViewModels/MsuProjectWindowViewModel.cs

@@ -330,16 +330,20 @@ public class MsuProjectWindowViewModel : TranslatedViewModelBase
     public bool IsDraggingItem { get; set; }
 
     public bool IsViewingSongData => MsuSongViewModel.IsEnabled;
-    [Reactive] public bool DisplayHasSongIcon { get; set; }
-    [Reactive] public bool DisplayCheckCopyrightIcon { get; set; }
-    [Reactive] public bool DisplayCopyrightSafeIcon { get; set; }
-    [Reactive] public bool DisplayIsCompleteIcon { get; set; }
+    [Reactive, ReactiveLinkedProperties(nameof(HasSongButtonOpacity))] public bool DisplayHasSongIcon { get; set; }
+    [Reactive, ReactiveLinkedProperties(nameof(CheckCopyrightButtonOpacity))] public bool DisplayCheckCopyrightIcon { get; set; }
+    [Reactive, ReactiveLinkedProperties(nameof(CopyrightSafeButtonOpacity))] public bool DisplayCopyrightSafeIcon { get; set; }
+    [Reactive, ReactiveLinkedProperties(nameof(IsCompleteButtonOpacity))] public bool DisplayIsCompleteIcon { get; set; }
+    public double IsCompleteButtonOpacity => DisplayIsCompleteIcon ? 1 : 0.5;
+    public double HasSongButtonOpacity => DisplayHasSongIcon ? 1 : 0.5;
+    public double CheckCopyrightButtonOpacity => DisplayCheckCopyrightIcon ? 1 : 0.5;
+    public double CopyrightSafeButtonOpacity => DisplayCopyrightSafeIcon ? 1 : 0.5;
     [Reactive] public MsuProjectWindowViewModelTreeData? SelectedTreeItem { get; set; }
     [Reactive] public bool FilterOnlyTracksMissingSongs { get; set; }
     [Reactive] public bool FilterOnlyIncomplete { get; set; }
     [Reactive] public bool FilterOnlyMissingAudio { get; set; }
     [Reactive] public bool FilterOnlyCopyrightUntested { get; set; }
-    [Reactive] public MaterialIconKind FilterEyeIcon { get; set; } = MaterialIconKind.Eye;
+    [Reactive] public MaterialIconKind FilterEyeIcon { get; set; } = MaterialIconKind.Filter;
     [Reactive] public string StatusBarText { get; set; } = "Loaded Project";
     [Reactive] public string WindowTitle { get; set; } = "MSU Scripter";
 

MSUScripter/Views/MsuProjectWindow.axaml

@@ -206,34 +206,63 @@
                                             Header="Reapply Filters"
                                             Click="ReapplyFiltersMenuItem_OnClick"
                                         />
-                                        <Separator />
-                                        <controls:CheckedMenuItem 
-                                            Header="{Binding Text.ProjectWindowDisplayIsCompleteIcon}"
-                                            IsChecked="{Binding DisplayIsCompleteIcon}"
-                                            Click="DisplayIsCompleteMenuItem_OnClick"
-                                        />
-                                        <controls:CheckedMenuItem 
-                                            Header="{Binding Text.ProjectWindowDisplayHasSongIcon}"
-                                            IsChecked="{Binding DisplayHasSongIcon}"
-                                            Click="DisplayHasAudioMenuItem_OnClick"
-                                        />
-                                        <controls:CheckedMenuItem 
-                                            Header="{Binding Text.ProjectWindowDisplayCheckCopyrightIcon}" 
-                                            IsChecked="{Binding DisplayCheckCopyrightIcon}"
-                                            Click="DisplayCopyrightTestMenuItem_OnClick"
-                                        />
-                                        <controls:CheckedMenuItem 
-                                            Header="{Binding Text.ProjectWindowDisplayCopyrightSafeIcon}" 
-                                            IsChecked="{Binding DisplayCopyrightSafeIcon}"
-                                            Click="DisplayCopyrightStatusMenuItem_OnClick"
-                                        />
                                     </ContextMenu>
 
                                 </Button.ContextMenu>
                                 <avalonia:MaterialIcon Kind="{Binding FilterEyeIcon}" Width="14"></avalonia:MaterialIcon>
                             </controls:ContextMenuButton>
                         </Grid>
 
+                        <Grid ColumnDefinitions="*, *, *, *" DockPanel.Dock="Bottom">
+                            <Button 
+                                Grid.Column="0" 
+                                Padding="3" 
+                                Click="DisplayIsCompleteMenuItem_OnClick" 
+                                Opacity="{Binding IsCompleteButtonOpacity}"
+                                ToolTip.Tip="Toggle song completion status icons"
+                            >
+                                <avalonia:MaterialIcon 
+                                    Kind="Flag"
+                                    Height="14"
+                                />
+                            </Button>
+                            <Button 
+                                Grid.Column="1" 
+                                Padding="3" 
+                                Click="DisplayCopyrightStatusMenuItem_OnClick" 
+                                Opacity="{Binding CopyrightSafeButtonOpacity}"
+                                ToolTip.Tip="Toggle copyright safe status icons"
+                            >
+                                <avalonia:MaterialIcon 
+                                    Kind="Copyright"
+                                    Height="14"
+                                />
+                            </Button>
+                            <Button 
+                                Grid.Column="2" 
+                                Padding="3" 
+                                Click="DisplayCopyrightTestMenuItem_OnClick" 
+                                Opacity="{Binding CheckCopyrightButtonOpacity}"
+                                ToolTip.Tip="Toggle add to copyright check video status icons"
+                            >
+                                <avalonia:MaterialIcon 
+                                    Kind="Video"
+                                    Height="14"
+                                />
+                            </Button>
+                            <Button 
+                                Grid.Column="3" 
+                                Padding="3" 
+                                Click="DisplayHasAudioMenuItem_OnClick" 
+                                Opacity="{Binding HasSongButtonOpacity}"
+                                ToolTip.Tip="Toggle has audio file status icons"
+                            >
+                                <avalonia:MaterialIcon 
+                                    Kind="VolumeSource"
+                                    Height="14"
+                                />
+                            </Button>
+                        </Grid>
                         <ListBox
                             BorderThickness="0"
                             ItemsSource="{Binding TreeItems}"
@@ -393,7 +422,6 @@
                         </ListBox>
                     </DockPanel>
 
-                    
                     <Border Grid.Row="2" Background="{DynamicResource CardBorderColor}" Name="SummaryBorder">
                         <StackPanel Margin="5" Orientation="Vertical">
                             <TextBlock Text="{Binding SongSummary}" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis"/>