0.75:

- Upgrade to most recent Avalonia version. - Support for nwn_retail.key (necessary for recent preview versions)
Cjreek · Jul 9, 2024 · b3e3d19 · b3e3d19
1 parent 0bb6ff8
commit b3e3d19
Show file tree

Hide file tree

Showing 94 changed files with 294 additions and 264 deletions.
diff --git a/eos-edit/Services/WindowService.cs b/eos-edit/Services/WindowService.cs
@@ -33,7 +33,7 @@ private static Window NewWindow(DialogViewModel viewModel)
                 window.Content = viewModel;
                 window.DataContext = viewModel;
                 window.CanResize = viewModel.CanResize;
-                window.PlatformImpl?.ShowTaskbarIcon(false);
+                window.ShowInTaskbar = false;
             }
 
             return window;

diff --git a/eos-edit/Usercontrols/AttackBonusTableComboBox.axaml b/eos-edit/Usercontrols/AttackBonusTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbAbTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.AttackBonusTables}}" SelectedItem="{Binding ElementName=ucAttackBonusTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbAbTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.AttackBonusTables}}" SelectedItem="{Binding ElementName=ucAttackBonusTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/BonusFeatTableComboBox.axaml b/eos-edit/Usercontrols/BonusFeatTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbBonusFeatTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.BonusFeatTables}}" SelectedItem="{Binding ElementName=ucBonusFeatTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbBonusFeatTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.BonusFeatTables}}" SelectedItem="{Binding ElementName=ucBonusFeatTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/CustomEnumComboBox.axaml b/eos-edit/Usercontrols/CustomEnumComboBox.axaml
@@ -27,7 +27,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbEnum" Grid.Column="0" Items="{Binding Path=CustomEnum.Items}" SelectedItem="{Binding Path=SelectedValue, Mode=TwoWay}" DisplayMemberBinding="{Binding Label}"/>
+    <ComboBox x:Name="cbEnum" Grid.Column="0" ItemsSource="{Binding Path=CustomEnum.Items}" SelectedItem="{Binding Path=SelectedValue, Mode=TwoWay}" DisplayMemberBinding="{Binding Label}"/>
     <Button x:Name="btClear" Grid.Column="1" Content="🞪" Click="btClear_Click" Margin="2,0,0,0"
             Height="{Binding ElementName=cbEnum, Path=Bounds.Height}" Width="{Binding ElementName=cbEnum, Path=Bounds.Height}"
             IsVisible="{Binding Path=IsNullable}"/>

diff --git a/eos-edit/Usercontrols/DataTypeComboBox.axaml b/eos-edit/Usercontrols/DataTypeComboBox.axaml
@@ -27,7 +27,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbDataTypes" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.DataTypes}}" SelectedItem="{Binding ElementName=ucDataTypeComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Label}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbDataTypes" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.DataTypes}}" SelectedItem="{Binding ElementName=ucDataTypeComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Label}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/EnumComboBox.axaml b/eos-edit/Usercontrols/EnumComboBox.axaml
@@ -21,13 +21,13 @@
     </DataTemplate>
   </UserControl.DataTemplates>
 
-  <Grid Margin="0" VerticalAlignment="Stretch" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:EnumComboBox}}}">
+  <Grid Margin="0" VerticalAlignment="Stretch" DataContext="{Binding ElementName=ucEnumComboBox}">
     <Grid.ColumnDefinitions>
       <ColumnDefinition Width="*"/>
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbEnum" HorizontalAlignment="Stretch" SelectedIndex="{Binding ElementName=ucEnumComboBox, Path=SelectedIndex}" Grid.Column="0" Items="{Binding Path=ItemsSource}" DisplayMemberBinding="{Binding DisplayName}"
+    <ComboBox x:Name="cbEnum" HorizontalAlignment="Stretch" SelectedIndex="{Binding ElementName=ucEnumComboBox, Path=SelectedIndex}" Grid.Column="0" ItemsSource="{Binding Path=ItemsSource}" DisplayMemberBinding="{Binding DisplayName}"
               SelectedItem="{Binding Path=SelectedItem, Mode=TwoWay}" SelectedValueBinding="{Binding Value}" SelectedValue="{Binding SelectedValue, Mode=TwoWay}"
               VerticalContentAlignment="Stretch" Padding="3,2,2,2"/>
     <Button x:Name="btClear" Grid.Column="1" Content="🞪" Click="btClear_Click" Margin="2,0,0,0"

diff --git a/eos-edit/Usercontrols/FeatPreferencesTableComboBox.axaml b/eos-edit/Usercontrols/FeatPreferencesTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbFeatPreferencesTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.FeatPreferencesTables}}" SelectedItem="{Binding ElementName=ucFeatPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbFeatPreferencesTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.FeatPreferencesTables}}" SelectedItem="{Binding ElementName=ucFeatPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/FeatTableComboBox.axaml b/eos-edit/Usercontrols/FeatTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbFeatTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.FeatTables}}" SelectedItem="{Binding ElementName=ucFeatTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbFeatTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.FeatTables}}" SelectedItem="{Binding ElementName=ucFeatTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/FlagListbox.axaml b/eos-edit/Usercontrols/FlagListbox.axaml
@@ -17,7 +17,7 @@
     </ResourceDictionary>
   </UserControl.Resources>
 
-  <ListBox Items="{Binding ElementName=ucFlagListbox, Path=ItemsSource}" BorderBrush="Silver" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" Padding="0">
+  <ListBox ItemsSource="{Binding ElementName=ucFlagListbox, Path=ItemsSource}" BorderBrush="Silver" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" Padding="0">
     <ListBox.ItemsPanel>
       <ItemsPanelTemplate>
         <VirtualizingStackPanel Orientation="{Binding ElementName=ucFlagListbox, Path=Orientation}"/>

diff --git a/eos-edit/Usercontrols/ItemPropertyCostTableComboBox.axaml b/eos-edit/Usercontrols/ItemPropertyCostTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbItemPropertyCostTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.ItemPropertyCostTables}}" SelectedItem="{Binding ElementName=ucItemPropertyCostTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbItemPropertyCostTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.ItemPropertyCostTables}}" SelectedItem="{Binding ElementName=ucItemPropertyCostTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/ItemPropertyTableComboBox.axaml b/eos-edit/Usercontrols/ItemPropertyTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbItemPropertyTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.ItemPropertyTables}}" SelectedItem="{Binding ElementName=ucItemPropertyTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbItemPropertyTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.ItemPropertyTables}}" SelectedItem="{Binding ElementName=ucItemPropertyTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/KnownSpellsTableComboBox.axaml b/eos-edit/Usercontrols/KnownSpellsTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbKnownSpellsTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.KnownSpellsTables}}" SelectedItem="{Binding ElementName=ucKnownSpellsTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbKnownSpellsTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.KnownSpellsTables}}" SelectedItem="{Binding ElementName=ucKnownSpellsTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/PackageEquipmentTableComboBox.axaml b/eos-edit/Usercontrols/PackageEquipmentTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbPackageEquipmentTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.PackageEquipmentTables}}" SelectedItem="{Binding ElementName=ucPackageEquipmentTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbPackageEquipmentTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.PackageEquipmentTables}}" SelectedItem="{Binding ElementName=ucPackageEquipmentTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/PolymorphComboBox.axaml b/eos-edit/Usercontrols/PolymorphComboBox.axaml
@@ -20,7 +20,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbPolymorphs" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.Polymorphs}}" SelectedItem="{Binding ElementName=ucPolymorphComboBox, Path=SelectedValue}">
+    <ComboBox x:Name="cbPolymorphs" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.Polymorphs}}" SelectedItem="{Binding ElementName=ucPolymorphComboBox, Path=SelectedValue}">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/PortraitComboBox.axaml b/eos-edit/Usercontrols/PortraitComboBox.axaml
@@ -27,7 +27,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbPortraits" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.Portraits}}" SelectedItem="{Binding ElementName=ucPortraitComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding ResRef}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbPortraits" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.Portraits}}" SelectedItem="{Binding ElementName=ucPortraitComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding ResRef}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/PrerequisiteComboBox.axaml b/eos-edit/Usercontrols/PrerequisiteComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbRequTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.PrerequisiteTables}}" SelectedItem="{Binding ElementName=ucPrerequisiteComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbRequTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.PrerequisiteTables}}" SelectedItem="{Binding ElementName=ucPrerequisiteComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/RacialFeatsTableComboBox.axaml b/eos-edit/Usercontrols/RacialFeatsTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbRacialFeatTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.RacialFeatsTables}}" SelectedItem="{Binding ElementName=ucRacialFeatsTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbRacialFeatTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.RacialFeatsTables}}" SelectedItem="{Binding ElementName=ucRacialFeatsTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SavingThrowTableComboBox.axaml b/eos-edit/Usercontrols/SavingThrowTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSavesTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.SavingThrowTables}}" SelectedItem="{Binding ElementName=ucSavingThrowTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSavesTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.SavingThrowTables}}" SelectedItem="{Binding ElementName=ucSavingThrowTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SkillPreferencesTableComboBox.axaml b/eos-edit/Usercontrols/SkillPreferencesTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSkillPreferencesTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.SkillPreferencesTables}}" SelectedItem="{Binding ElementName=ucSkillPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSkillPreferencesTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.SkillPreferencesTables}}" SelectedItem="{Binding ElementName=ucSkillPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SkillTableComboBox.axaml b/eos-edit/Usercontrols/SkillTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSkillTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.SkillTables}}" SelectedItem="{Binding ElementName=ucSkillTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSkillTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.SkillTables}}" SelectedItem="{Binding ElementName=ucSkillTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SoundsetComboBox.axaml b/eos-edit/Usercontrols/SoundsetComboBox.axaml
@@ -21,7 +21,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSoundsets" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.Soundsets}}" SelectedItem="{Binding ElementName=ucSoundsetComboBox, Path=SelectedValue}">
+    <ComboBox x:Name="cbSoundsets" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.Soundsets}}" SelectedItem="{Binding ElementName=ucSoundsetComboBox, Path=SelectedValue}">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel />

diff --git a/eos-edit/Usercontrols/SpellPreferencesTableComboBox.axaml b/eos-edit/Usercontrols/SpellPreferencesTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSpellPreferencesTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.SpellPreferencesTables}}" SelectedItem="{Binding ElementName=ucSpellPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSpellPreferencesTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.SpellPreferencesTables}}" SelectedItem="{Binding ElementName=ucSpellPreferencesTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SpellSlotTableComboBox.axaml b/eos-edit/Usercontrols/SpellSlotTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSpellSlotTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.SpellSlotTables}}" SelectedItem="{Binding ElementName=ucSpellSlotTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSpellSlotTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.SpellSlotTables}}" SelectedItem="{Binding ElementName=ucSpellSlotTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/SpellbookComboBox.axaml b/eos-edit/Usercontrols/SpellbookComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbSpellbooks" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.Spellbooks}}" SelectedItem="{Binding ElementName=ucSpellbookComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbSpellbooks" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.Spellbooks}}" SelectedItem="{Binding ElementName=ucSpellbookComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/StatGainTableComboBox.axaml b/eos-edit/Usercontrols/StatGainTableComboBox.axaml
@@ -28,7 +28,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbStatGainTables" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.StatGainTables}}" SelectedItem="{Binding ElementName=ucStatGainTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbStatGainTables" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.StatGainTables}}" SelectedItem="{Binding ElementName=ucStatGainTableComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Usercontrols/VisualEffectComboBox.axaml b/eos-edit/Usercontrols/VisualEffectComboBox.axaml
@@ -27,7 +27,7 @@
       <ColumnDefinition Width="auto"/>
     </Grid.ColumnDefinitions>
 
-    <ComboBox x:Name="cbVisualEffects" Grid.Column="0" Items="{Binding Source={x:Static repo:MasterRepository.VisualEffects}}" SelectedItem="{Binding ElementName=ucVisualEffectComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
+    <ComboBox x:Name="cbVisualEffects" Grid.Column="0" ItemsSource="{Binding Source={x:Static repo:MasterRepository.VisualEffects}}" SelectedItem="{Binding ElementName=ucVisualEffectComboBox, Path=SelectedValue}" DisplayMemberBinding="{Binding Name}" Padding="3,0,0,0">
       <ComboBox.ItemsPanel>
         <ItemsPanelTemplate>
           <VirtualizingStackPanel/>

diff --git a/eos-edit/Views/AppearanceSoundsetView.axaml b/eos-edit/Views/AppearanceSoundsetView.axaml
@@ -130,7 +130,7 @@
 
             <TextBlock Text="Extension Fields" HorizontalAlignment="Center" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" FontSize="22" Margin="0,0,0,10" FontWeight="Bold"/>
 
-            <ItemsRepeater Grid.Row="1" Grid.ColumnSpan="2" Items="{Binding Data.ExtensionValues}" ElementPrepared="ItemsRepeater_ElementPrepared">
+            <ItemsRepeater Grid.Row="1" Grid.ColumnSpan="2" ItemsSource="{Binding Data.ExtensionValues}" ElementPrepared="ItemsRepeater_ElementPrepared">
               <ItemsRepeater.Layout>
                 <UniformGridLayout ItemsStretch="Fill" Orientation="Horizontal" MaximumRowsOrColumns="2" MinItemHeight="25"/>
               </ItemsRepeater.Layout>

diff --git a/eos-edit/Views/AppearanceView.axaml b/eos-edit/Views/AppearanceView.axaml
@@ -197,7 +197,7 @@
 
             <TextBlock Text="Extension Fields" HorizontalAlignment="Center" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" FontSize="22" Margin="0,0,0,10" FontWeight="Bold"/>
 
-            <ItemsRepeater Grid.Row="1" Grid.ColumnSpan="2" Items="{Binding Data.ExtensionValues}" ElementPrepared="ItemsRepeater_ElementPrepared">
+            <ItemsRepeater Grid.Row="1" Grid.ColumnSpan="2" ItemsSource="{Binding Data.ExtensionValues}" ElementPrepared="ItemsRepeater_ElementPrepared">
               <ItemsRepeater.Layout>
                 <UniformGridLayout ItemsStretch="Fill" Orientation="Horizontal" MaximumRowsOrColumns="2" MinItemHeight="25"/>
               </ItemsRepeater.Layout>