Merge pull request #41 from burninrubber0/vehiclelist-update

Add VehicleList entry deletion
burninrubber0 · Jun 29, 2023 · 968b013 · 968b013
2 parents 29163f2 + ff35690
commit 968b013
Show file tree

Hide file tree

Showing 6 changed files with 266 additions and 218 deletions.
diff --git a/VehicleList/Properties/Resources.Designer.cs b/VehicleList/Properties/Resources.Designer.cs
diff --git a/VehicleList/Properties/Resources.resx b/VehicleList/Properties/Resources.resx
@@ -127,4 +127,7 @@
   <data name="CopyHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CopyHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="remove_xform" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\remove_xform.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/VehicleList/Resources/remove_xform.png b/VehicleList/Resources/remove_xform.png
diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj
@@ -11,6 +11,19 @@
     <ProjectReference Include="..\BundleUtilities\BundleUtilities.csproj" />
     <ProjectReference Include="..\PluginAPI\PluginAPI.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BundleManager\bin\$(ConfigurationName)\$(TargetFramework)\plugins\&quot; /s /e /y" />
   </Target>

diff --git a/VehicleList/VehicleListForm.cs b/VehicleList/VehicleListForm.cs
@@ -80,6 +80,12 @@ private void UpdateDisplay()
 
             lstVehicles.ListViewItemSorter = new VehicleSorter(0);
             lstVehicles.Sort();
+
+            stlStatusLabel.Text = "";
+            copyItemToolStripMenuItem.Enabled = false;
+            deleteItemToolStripMenuItem.Enabled = false;
+            tsbCopyItem.Enabled = false;
+            tsbDeleteItem.Enabled = false;
         }
 
         private void EditSelectedEntry()
@@ -118,7 +124,7 @@ private void AddItem()
 
         private void CopyItem()
         {
-            if (List == null || lstVehicles.SelectedItems.Count > 1
+            if (List == null || lstVehicles.SelectedItems.Count != 1
                 || lstVehicles.SelectedIndices.Count <= 0)
                 return;
 
@@ -133,6 +139,22 @@ private void CopyItem()
             editor.ShowDialog(this);
         }
 
+        private void DeleteItem()
+        {
+            if (List == null || lstVehicles.SelectedItems.Count != 1
+                || lstVehicles.SelectedIndices.Count <= 0)
+                return;
+
+            if (!int.TryParse(lstVehicles.SelectedItems[0].Text, out int index))
+                return;
+            List.Entries.RemoveAt(index);
+            for (int i = index; i < List.Entries.Count; ++i)
+                List.Entries[i].Index--;
+
+            Edit?.Invoke();
+            UpdateDisplay();
+        }
+
         private void Editor_OnDone1(Vehicle vehicle)
         {
             // Insert if not at end, else add
@@ -176,11 +198,14 @@ private void lstVehicles_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             EditSelectedEntry();
         }
-        
+
         private void lstVehicles_SelectedIndexChanged(object sender, EventArgs e)
         {
             stlStatusLabel.Text = lstVehicles.SelectedItems.Count + " Item(s) Selected";
+            copyItemToolStripMenuItem.Enabled = true;
+            deleteItemToolStripMenuItem.Enabled = true;
             tsbCopyItem.Enabled = true;
+            tsbDeleteItem.Enabled = true;
         }
 
         private void lstVehicles_ColumnClick(object sender, ColumnClickEventArgs e)
@@ -277,5 +302,15 @@ private void tsbCopyItem_Click(object sender, EventArgs e)
         {
             CopyItem();
         }
+
+        private void deleteItemToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            DeleteItem();
+        }
+
+        private void tsbDeleteItem_Click(object sender, EventArgs e)
+        {
+            DeleteItem();
+        }
     }
 }