Skip to content

Commit

Permalink
Fix manifest-only loading + hide latest version column for now.
Browse files Browse the repository at this point in the history
  • Loading branch information
DrewNaylor committed Oct 5, 2020
1 parent 6f3dd9d commit c909399
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 79 deletions.
2 changes: 1 addition & 1 deletion guinget/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<value>True</value>
</setting>
<setting name="OnlyDisplayLatestPackageVersion" serializeAs="String">
<value>True</value>
<value>False</value>
</setting>
</guinget.My.MySettings>
</userSettings>
Expand Down
147 changes: 74 additions & 73 deletions guinget/MainWindow.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions guinget/MainWindow.vb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Public Class aaformMainWindow
For i As Integer = 0 To ManifestPaths.Count - 2

' Read the file into the manifest column and make a new row with it.
aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", "Loading...", "Loading...", "Loading...", "Loading...", ManifestPaths(i))
aaformMainWindow.datagridviewPackageList.Rows.Add("Do nothing", "Unknown", "Loading...", "Loading...", "Loading...", "Unknown", "Loading...", ManifestPaths(i))

' Make the progress bar progress.
aaformMainWindow.toolstripprogressbarLoadingPackages.Value = i
Expand Down Expand Up @@ -149,13 +149,13 @@ Public Class aaformMainWindow
If My.Settings.LoadFromSqliteDb = False Then
For Each Row As DataGridViewRow In aaformMainWindow.datagridviewPackageList.Rows
' Load package ID column.
Row.Cells.Item(2).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(6).Value.ToString, "Id")
Row.Cells.Item(2).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(7).Value.ToString, "Id")
' Load package name column.
Row.Cells.Item(3).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(6).Value.ToString, "Name")
Row.Cells.Item(3).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(7).Value.ToString, "Name")
' Load package version column.
Row.Cells.Item(4).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(6).Value.ToString, "Version")
Row.Cells.Item(4).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(7).Value.ToString, "Version")
' Load package description column.
Row.Cells.Item(5).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(6).Value.ToString, "Description")
Row.Cells.Item(6).Value = Await PackageTools.GetPackageInfoFromYamlAsync(Row.Cells.Item(7).Value.ToString, "Description")
' Update the progressbar so it doesn't look frozen.
aaformMainWindow.toolstripprogressbarLoadingPackages.Value = Row.Index
aaformMainWindow.statusbarMainWindow.Update()
Expand Down

0 comments on commit c909399

Please sign in to comment.