Skip to content

Commit 22bc290

Browse files
committed
[Enhance] Add multi-package removal in AppX addition queue
1 parent af87ea0 commit 22bc290

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

Panels/Img_Ops/AppxPkgs/AddProvAppxPackage.vb

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,13 +1808,24 @@ Public Class AddProvAppxPackage
18081808
End Sub
18091809

18101810
Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
1811-
If ListView1.FocusedItem.Text <> "" Then
1812-
Packages.RemoveAt(ListView1.FocusedItem.Index)
1813-
ListView1.Items.Remove(ListView1.FocusedItem)
1814-
NoAppxFilePanel.Visible = If(ListView1.SelectedItems.Count <= 0, True, False)
1815-
AppxFilePanel.Visible = If(ListView1.SelectedItems.Count <= 0, False, True)
1811+
If ListView1.SelectedItems.Count > 0 Then
1812+
If ListView1.SelectedItems.Count > 1 Then
1813+
For x = ListView1.Items.Count - 1 To 0 Step -1
1814+
If ListView1.Items(x).Selected Then
1815+
Packages.RemoveAt(x)
1816+
ListView1.Items(x).Remove()
1817+
End If
1818+
Next
1819+
Else
1820+
Packages.RemoveAt(ListView1.FocusedItem.Index)
1821+
ListView1.Items.Remove(ListView1.FocusedItem)
1822+
End If
1823+
1824+
1825+
NoAppxFilePanel.Visible = (ListView1.SelectedItems.Count <= 0)
1826+
AppxFilePanel.Visible = Not (ListView1.SelectedItems.Count <= 0)
18161827
AppxDetailsPanel.Height = If(ListView1.SelectedItems.Count <= 0, 520, 83)
1817-
FlowLayoutPanel1.Visible = If(ListView1.SelectedItems.Count <= 0, False, True)
1828+
FlowLayoutPanel1.Visible = Not (ListView1.SelectedItems.Count <= 0)
18181829
End If
18191830
End Sub
18201831

@@ -1856,11 +1867,7 @@ Public Class AddProvAppxPackage
18561867

18571868
Private Sub ListView1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListView1.SelectedIndexChanged
18581869
Try
1859-
If ListView1.SelectedItems.Count <> 1 Then
1860-
Button9.Enabled = False
1861-
Else
1862-
Button9.Enabled = True
1863-
End If
1870+
Button9.Enabled = (ListView1.SelectedItems.Count > 0)
18641871
If ListView1.SelectedItems.Count > 1 Then
18651872
DetectMultiSelectionCommonProperties()
18661873
Else

0 commit comments

Comments
 (0)