From 2fc8273f6741c80e546f75e0a8f49f33089b3275 Mon Sep 17 00:00:00 2001 From: Drew Naylor Date: Mon, 5 Oct 2020 03:25:02 -0400 Subject: [PATCH] Only add package to the list if the version matches... the latest version. This makes it so that we don't have to delete rows from the datagridview afterward, but the actual newest version isn't being shown for packages like AdoptOpenJDK.OpenJDK yet. --- guinget/App.config | 4 ++-- guinget/MainWindow.vb | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/guinget/App.config b/guinget/App.config index 2cbaddbb..caad1e72 100644 --- a/guinget/App.config +++ b/guinget/App.config @@ -50,10 +50,10 @@ True - False + True - False + True diff --git a/guinget/MainWindow.vb b/guinget/MainWindow.vb index 54b3cef3..59d6be11 100644 --- a/guinget/MainWindow.vb +++ b/guinget/MainWindow.vb @@ -114,8 +114,13 @@ Public Class aaformMainWindow 'MessageBox.Show(SqliteList.Rows.Item(0).ToString) 'aaformMainWindow.datagridviewPackageList.DataSource = SqliteList For Each PackageRow As DataRow In SqliteList.Rows - aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...") - + If My.Settings.OnlyDisplayLatestPackageVersion = True Then + If PackageRow.Item(2).ToString = PackageRow.Item(3).ToString Then + aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...") + End If + Else + aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", PackageRow.Item(0), PackageRow.Item(1), PackageRow.Item(2), PackageRow.Item(3), "Loading...", "Loading...") + End If ' Make the progress bar progress. aaformMainWindow.toolstripprogressbarLoadingPackages.PerformStep() ' Update the statusbar to show the current info. @@ -188,19 +193,22 @@ Public Class aaformMainWindow ' Reset progress bar to 0. aaformMainWindow.toolstripprogressbarLoadingPackages.Value = 0 - If My.Settings.OnlyDisplayLatestPackageVersion = True Then + 'If My.Settings.OnlyDisplayLatestPackageVersion = True Then - For Each column As DataGridViewColumn In aaformMainWindow.datagridviewPackageList.Columns - column.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet - Next + ' For Each column As DataGridViewColumn In aaformMainWindow.datagridviewPackageList.Columns + ' column.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet + ' Next - For Each PackageRow As DataGridViewRow In aaformMainWindow.datagridviewPackageList.Rows - If Not PackageRow.Cells.Item(4).Value.ToString = PackageRow.Cells.Item(5).Value.ToString Then - aaformMainWindow.datagridviewPackageList.Rows.Remove(PackageRow) - End If - Next + ' For Each PackageRow As DataGridViewRow In aaformMainWindow.datagridviewPackageList.Rows + ' If Not PackageRow.Cells.Item(4).Value.ToString = PackageRow.Cells.Item(5).Value.ToString Then + ' 'MessageBox.Show(PackageRow.Cells.Item(2).Value.ToString & ":" & vbCrLf & + ' ' "Outdated version: " & PackageRow.Cells.Item(4).Value.ToString & vbCrLf & + ' ' "Latest version: " & PackageRow.Cells.Item(5).Value.ToString) + ' aaformMainWindow.datagridviewPackageList.Rows.Remove(PackageRow) + ' End If + ' Next - End If + 'End If ' Update the main window again. aaformMainWindow.Update()