diff --git a/guinget/OptionsWindow.Designer.vb b/guinget/OptionsWindow.Designer.vb index ddb04fb7..ed0ccbd7 100644 --- a/guinget/OptionsWindow.Designer.vb +++ b/guinget/OptionsWindow.Designer.vb @@ -30,6 +30,7 @@ Partial Class OptionsWindow Me.checkboxRerunSearch = New System.Windows.Forms.CheckBox() Me.buttonCancel = New System.Windows.Forms.Button() Me.buttonOk = New System.Windows.Forms.Button() + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch = New System.Windows.Forms.CheckBox() Me.tablelayoutpanelOptions.SuspendLayout() Me.tabcontrolOptions.SuspendLayout() Me.tabpageSearch.SuspendLayout() @@ -38,30 +39,32 @@ Partial Class OptionsWindow 'tablelayoutpanelOptions ' Me.tablelayoutpanelOptions.ColumnCount = 4 - Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 106.0!)) + Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85.0!)) Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 106.0!)) - Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 106.0!)) + Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85.0!)) + Me.tablelayoutpanelOptions.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85.0!)) Me.tablelayoutpanelOptions.Controls.Add(Me.buttonDefaults, 0, 1) Me.tablelayoutpanelOptions.Controls.Add(Me.tabcontrolOptions, 0, 0) Me.tablelayoutpanelOptions.Controls.Add(Me.buttonCancel, 2, 1) Me.tablelayoutpanelOptions.Controls.Add(Me.buttonOk, 3, 1) Me.tablelayoutpanelOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.tablelayoutpanelOptions.Location = New System.Drawing.Point(0, 0) + Me.tablelayoutpanelOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.tablelayoutpanelOptions.Name = "tablelayoutpanelOptions" Me.tablelayoutpanelOptions.RowCount = 2 Me.tablelayoutpanelOptions.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 92.94991!)) Me.tablelayoutpanelOptions.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 7.050093!)) - Me.tablelayoutpanelOptions.Size = New System.Drawing.Size(465, 539) + Me.tablelayoutpanelOptions.Size = New System.Drawing.Size(372, 431) Me.tablelayoutpanelOptions.TabIndex = 0 ' 'buttonDefaults ' Me.buttonDefaults.Dock = System.Windows.Forms.DockStyle.Fill - Me.buttonDefaults.Location = New System.Drawing.Point(3, 503) + Me.buttonDefaults.Location = New System.Drawing.Point(2, 402) + Me.buttonDefaults.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.buttonDefaults.Name = "buttonDefaults" - Me.buttonDefaults.Size = New System.Drawing.Size(100, 33) - Me.buttonDefaults.TabIndex = 3 + Me.buttonDefaults.Size = New System.Drawing.Size(81, 27) + Me.buttonDefaults.TabIndex = 6 Me.buttonDefaults.Text = "Defaults" Me.buttonDefaults.UseVisualStyleBackColor = True ' @@ -70,20 +73,23 @@ Partial Class OptionsWindow Me.tablelayoutpanelOptions.SetColumnSpan(Me.tabcontrolOptions, 4) Me.tabcontrolOptions.Controls.Add(Me.tabpageSearch) Me.tabcontrolOptions.Dock = System.Windows.Forms.DockStyle.Fill - Me.tabcontrolOptions.Location = New System.Drawing.Point(3, 3) + Me.tabcontrolOptions.Location = New System.Drawing.Point(2, 2) + Me.tabcontrolOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.tabcontrolOptions.Name = "tabcontrolOptions" Me.tabcontrolOptions.SelectedIndex = 0 - Me.tabcontrolOptions.Size = New System.Drawing.Size(459, 494) + Me.tabcontrolOptions.Size = New System.Drawing.Size(368, 396) Me.tabcontrolOptions.TabIndex = 0 ' 'tabpageSearch ' + Me.tabpageSearch.Controls.Add(Me.checkboxUseExactMatchForLastSelectedPackageIDSearch) Me.tabpageSearch.Controls.Add(Me.checkboxShowSidebar) Me.tabpageSearch.Controls.Add(Me.checkboxRerunSearch) - Me.tabpageSearch.Location = New System.Drawing.Point(4, 25) + Me.tabpageSearch.Location = New System.Drawing.Point(4, 22) + Me.tabpageSearch.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.tabpageSearch.Name = "tabpageSearch" - Me.tabpageSearch.Padding = New System.Windows.Forms.Padding(3) - Me.tabpageSearch.Size = New System.Drawing.Size(451, 465) + Me.tabpageSearch.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.tabpageSearch.Size = New System.Drawing.Size(360, 370) Me.tabpageSearch.TabIndex = 0 Me.tabpageSearch.Text = "Search" Me.tabpageSearch.UseVisualStyleBackColor = True @@ -91,9 +97,10 @@ Partial Class OptionsWindow 'checkboxShowSidebar ' Me.checkboxShowSidebar.AutoSize = True - Me.checkboxShowSidebar.Location = New System.Drawing.Point(7, 35) + Me.checkboxShowSidebar.Location = New System.Drawing.Point(6, 28) + Me.checkboxShowSidebar.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.checkboxShowSidebar.Name = "checkboxShowSidebar" - Me.checkboxShowSidebar.Size = New System.Drawing.Size(115, 21) + Me.checkboxShowSidebar.Size = New System.Drawing.Size(90, 17) Me.checkboxShowSidebar.TabIndex = 1 Me.checkboxShowSidebar.Text = "Show sidebar" Me.checkboxShowSidebar.UseVisualStyleBackColor = True @@ -101,9 +108,10 @@ Partial Class OptionsWindow 'checkboxRerunSearch ' Me.checkboxRerunSearch.AutoSize = True - Me.checkboxRerunSearch.Location = New System.Drawing.Point(7, 7) + Me.checkboxRerunSearch.Location = New System.Drawing.Point(6, 6) + Me.checkboxRerunSearch.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.checkboxRerunSearch.Name = "checkboxRerunSearch" - Me.checkboxRerunSearch.Size = New System.Drawing.Size(244, 21) + Me.checkboxRerunSearch.Size = New System.Drawing.Size(186, 17) Me.checkboxRerunSearch.TabIndex = 0 Me.checkboxRerunSearch.Text = "Re-run search after cache update" Me.checkboxRerunSearch.UseVisualStyleBackColor = True @@ -112,31 +120,44 @@ Partial Class OptionsWindow ' Me.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.buttonCancel.Dock = System.Windows.Forms.DockStyle.Fill - Me.buttonCancel.Location = New System.Drawing.Point(256, 503) + Me.buttonCancel.Location = New System.Drawing.Point(204, 402) + Me.buttonCancel.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.buttonCancel.Name = "buttonCancel" - Me.buttonCancel.Size = New System.Drawing.Size(100, 33) - Me.buttonCancel.TabIndex = 2 + Me.buttonCancel.Size = New System.Drawing.Size(81, 27) + Me.buttonCancel.TabIndex = 5 Me.buttonCancel.Text = "Cancel" Me.buttonCancel.UseVisualStyleBackColor = True ' 'buttonOk ' Me.buttonOk.Dock = System.Windows.Forms.DockStyle.Fill - Me.buttonOk.Location = New System.Drawing.Point(362, 503) + Me.buttonOk.Location = New System.Drawing.Point(289, 402) + Me.buttonOk.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.buttonOk.Name = "buttonOk" - Me.buttonOk.Size = New System.Drawing.Size(100, 33) - Me.buttonOk.TabIndex = 1 + Me.buttonOk.Size = New System.Drawing.Size(81, 27) + Me.buttonOk.TabIndex = 4 Me.buttonOk.Text = "OK" Me.buttonOk.UseVisualStyleBackColor = True ' + 'checkboxUseExactMatchForLastSelectedPackageIDSearch + ' + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.AutoSize = True + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.Location = New System.Drawing.Point(6, 51) + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.Name = "checkboxUseExactMatchForLastSelectedPackageIDSearch" + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.Size = New System.Drawing.Size(277, 17) + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.TabIndex = 3 + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.Text = "Use exact match for last-selected package ID search" + Me.checkboxUseExactMatchForLastSelectedPackageIDSearch.UseVisualStyleBackColor = True + ' 'OptionsWindow ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.CancelButton = Me.buttonCancel - Me.ClientSize = New System.Drawing.Size(465, 539) + Me.ClientSize = New System.Drawing.Size(372, 431) Me.Controls.Add(Me.tablelayoutpanelOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "OptionsWindow" @@ -160,4 +181,5 @@ Partial Class OptionsWindow Friend WithEvents tabpageSearch As TabPage Friend WithEvents checkboxRerunSearch As CheckBox Friend WithEvents checkboxShowSidebar As CheckBox + Friend WithEvents checkboxUseExactMatchForLastSelectedPackageIDSearch As CheckBox End Class diff --git a/guinget/OptionsWindow.vb b/guinget/OptionsWindow.vb index 63014e01..6b302d00 100644 --- a/guinget/OptionsWindow.vb +++ b/guinget/OptionsWindow.vb @@ -35,6 +35,8 @@ Public Class OptionsWindow checkboxRerunSearch.Checked = My.Settings.RerunSearchAfterCacheUpdate ' Show sidebar. checkboxShowSidebar.Checked = My.Settings.ShowSidebar + ' Exact match for last-selected package ID. + checkboxUseExactMatchForLastSelectedPackageIDSearch.Checked = My.Settings.ExactMatchForLastSelectedIDSearch End Sub Private Sub buttonCancel_Click(sender As Object, e As EventArgs) Handles buttonCancel.Click @@ -58,6 +60,8 @@ Public Class OptionsWindow My.Settings.RerunSearchAfterCacheUpdate = checkboxRerunSearch.Checked ' Show sidebar checkbox. My.Settings.ShowSidebar = checkboxShowSidebar.Checked + ' Exact match for last-selected package ID checkbox. + My.Settings.ExactMatchForLastSelectedIDSearch = checkboxUseExactMatchForLastSelectedPackageIDSearch.Checked My.Settings.Save() My.Settings.Reload() @@ -73,8 +77,10 @@ Public Class OptionsWindow Private Sub ReloadDefaults() ' Re-run search checkbox. - checkboxRerunSearch.Checked = False + checkboxRerunSearch.Checked = True ' Show sidebar checkbox. - checkboxShowSidebar.Checked = False + checkboxShowSidebar.Checked = True + ' Exact match for last-selected package ID checkbox. + checkboxUseExactMatchForLastSelectedPackageIDSearch.Checked = True End Sub End Class \ No newline at end of file