diff --git a/guinget/App.config b/guinget/App.config
index caad1e72..59cd2de0 100644
--- a/guinget/App.config
+++ b/guinget/App.config
@@ -53,7 +53,7 @@
True
- True
+ False
diff --git a/guinget/MainWindow.Designer.vb b/guinget/MainWindow.Designer.vb
index 685a4c35..10329302 100644
--- a/guinget/MainWindow.Designer.vb
+++ b/guinget/MainWindow.Designer.vb
@@ -60,14 +60,6 @@ Partial Class aaformMainWindow
Me.splitcontainerMainWindow = New System.Windows.Forms.SplitContainer()
Me.panelPackageListHolder = New System.Windows.Forms.Panel()
Me.datagridviewPackageList = New System.Windows.Forms.DataGridView()
- Me.PkgAction = New System.Windows.Forms.DataGridViewComboBoxColumn()
- Me.PkgStatus = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.PkgName = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.FriendlyName = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.AvailableVersion = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.LatestVersion = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.PkgDescription = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.Manifest = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.labelUpdatingPackageList = New System.Windows.Forms.Label()
Me.textboxPackageDetails = New System.Windows.Forms.TextBox()
Me.panelMainPkgArea = New System.Windows.Forms.Panel()
@@ -110,6 +102,14 @@ Partial Class aaformMainWindow
Me.SelectedPackageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.zCantFindThisPackagePropertiesMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.zSeparatorNoIdeaWhereThisIs = New System.Windows.Forms.ToolStripSeparator()
+ Me.PkgAction = New System.Windows.Forms.DataGridViewComboBoxColumn()
+ Me.PkgStatus = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.PkgName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.FriendlyName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.AvailableVersion = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.LatestVersion = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.PkgDescription = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.Manifest = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.menustripMainWindow.SuspendLayout()
Me.contextmenustripPackageMenu.SuspendLayout()
CType(Me.splitcontainerMainWindow, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -412,71 +412,6 @@ Partial Class aaformMainWindow
Me.datagridviewPackageList.StandardTab = True
Me.datagridviewPackageList.TabIndex = 0
'
- 'PkgAction
- '
- Me.PkgAction.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
- Me.PkgAction.HeaderText = "Action"
- Me.PkgAction.Items.AddRange(New Object() {"Do nothing", "Install"})
- Me.PkgAction.MinimumWidth = 6
- Me.PkgAction.Name = "PkgAction"
- Me.PkgAction.ReadOnly = True
- Me.PkgAction.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
- Me.PkgAction.Width = 76
- '
- 'PkgStatus
- '
- Me.PkgStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
- Me.PkgStatus.HeaderText = "Status"
- Me.PkgStatus.MinimumWidth = 6
- Me.PkgStatus.Name = "PkgStatus"
- Me.PkgStatus.ReadOnly = True
- Me.PkgStatus.Width = 77
- '
- 'PkgName
- '
- Me.PkgName.HeaderText = "Package"
- Me.PkgName.MinimumWidth = 6
- Me.PkgName.Name = "PkgName"
- Me.PkgName.ReadOnly = True
- '
- 'FriendlyName
- '
- Me.FriendlyName.HeaderText = "Name"
- Me.FriendlyName.MinimumWidth = 6
- Me.FriendlyName.Name = "FriendlyName"
- Me.FriendlyName.ReadOnly = True
- '
- 'AvailableVersion
- '
- Me.AvailableVersion.HeaderText = "Version"
- Me.AvailableVersion.MinimumWidth = 6
- Me.AvailableVersion.Name = "AvailableVersion"
- Me.AvailableVersion.ReadOnly = True
- Me.AvailableVersion.ToolTipText = "(will eventually only display latest version and have all older versions in a win" &
- "dow like Synaptic)"
- '
- 'LatestVersion
- '
- Me.LatestVersion.HeaderText = "Latest version"
- Me.LatestVersion.MinimumWidth = 6
- Me.LatestVersion.Name = "LatestVersion"
- Me.LatestVersion.ReadOnly = True
- '
- 'PkgDescription
- '
- Me.PkgDescription.HeaderText = "Description"
- Me.PkgDescription.MinimumWidth = 6
- Me.PkgDescription.Name = "PkgDescription"
- Me.PkgDescription.ReadOnly = True
- '
- 'Manifest
- '
- Me.Manifest.HeaderText = "Manifest"
- Me.Manifest.MinimumWidth = 6
- Me.Manifest.Name = "Manifest"
- Me.Manifest.ReadOnly = True
- Me.Manifest.Visible = False
- '
'labelUpdatingPackageList
'
Me.labelUpdatingPackageList.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -898,6 +833,72 @@ Partial Class aaformMainWindow
Me.zSeparatorNoIdeaWhereThisIs.Name = "zSeparatorNoIdeaWhereThisIs"
Me.zSeparatorNoIdeaWhereThisIs.Size = New System.Drawing.Size(210, 6)
'
+ 'PkgAction
+ '
+ Me.PkgAction.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
+ Me.PkgAction.HeaderText = "Action"
+ Me.PkgAction.Items.AddRange(New Object() {"Do nothing", "Install"})
+ Me.PkgAction.MinimumWidth = 6
+ Me.PkgAction.Name = "PkgAction"
+ Me.PkgAction.ReadOnly = True
+ Me.PkgAction.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
+ Me.PkgAction.Width = 76
+ '
+ 'PkgStatus
+ '
+ Me.PkgStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
+ Me.PkgStatus.HeaderText = "Status"
+ Me.PkgStatus.MinimumWidth = 6
+ Me.PkgStatus.Name = "PkgStatus"
+ Me.PkgStatus.ReadOnly = True
+ Me.PkgStatus.Width = 77
+ '
+ 'PkgName
+ '
+ Me.PkgName.HeaderText = "Package"
+ Me.PkgName.MinimumWidth = 6
+ Me.PkgName.Name = "PkgName"
+ Me.PkgName.ReadOnly = True
+ '
+ 'FriendlyName
+ '
+ Me.FriendlyName.HeaderText = "Name"
+ Me.FriendlyName.MinimumWidth = 6
+ Me.FriendlyName.Name = "FriendlyName"
+ Me.FriendlyName.ReadOnly = True
+ '
+ 'AvailableVersion
+ '
+ Me.AvailableVersion.HeaderText = "Version"
+ Me.AvailableVersion.MinimumWidth = 6
+ Me.AvailableVersion.Name = "AvailableVersion"
+ Me.AvailableVersion.ReadOnly = True
+ Me.AvailableVersion.ToolTipText = "(will eventually only display latest version and have all older versions in a win" &
+ "dow like Synaptic)"
+ '
+ 'LatestVersion
+ '
+ Me.LatestVersion.HeaderText = "Latest version"
+ Me.LatestVersion.MinimumWidth = 6
+ Me.LatestVersion.Name = "LatestVersion"
+ Me.LatestVersion.ReadOnly = True
+ Me.LatestVersion.Visible = False
+ '
+ 'PkgDescription
+ '
+ Me.PkgDescription.HeaderText = "Description"
+ Me.PkgDescription.MinimumWidth = 6
+ Me.PkgDescription.Name = "PkgDescription"
+ Me.PkgDescription.ReadOnly = True
+ '
+ 'Manifest
+ '
+ Me.Manifest.HeaderText = "Manifest"
+ Me.Manifest.MinimumWidth = 6
+ Me.Manifest.Name = "Manifest"
+ Me.Manifest.ReadOnly = True
+ Me.Manifest.Visible = False
+ '
'aaformMainWindow
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!)
diff --git a/guinget/MainWindow.vb b/guinget/MainWindow.vb
index 90a64a0f..cbb3744d 100644
--- a/guinget/MainWindow.vb
+++ b/guinget/MainWindow.vb
@@ -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
@@ -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()