From 8e366610f4e04eb440945fa45625e9948d3d1023 Mon Sep 17 00:00:00 2001 From: Mark Hedrick Date: Mon, 6 Apr 2020 22:21:57 -0600 Subject: [PATCH] Bug Fixes, Improved Search Capabilities CHANGED - Updated Assembly version ADDED - Ability to search in any field for record searches CHANGED - Updated forms to correctly resize CHANGED - Disabled maximize and minimize on Options form --- .../Forms/ManageRecordTypes.Designer.cs | 55 +++++++++--------- DataWrangler/Forms/ManageRecords.cs | 27 ++++++++- .../Forms/ManageUserAccounts.Designer.cs | 57 ++++++++++--------- DataWrangler/Forms/Options.Designer.cs | 2 + DataWrangler/Properties/AssemblyInfo.cs | 3 +- 5 files changed, 85 insertions(+), 59 deletions(-) diff --git a/DataWrangler/Forms/ManageRecordTypes.Designer.cs b/DataWrangler/Forms/ManageRecordTypes.Designer.cs index 64ef169..fa59578 100644 --- a/DataWrangler/Forms/ManageRecordTypes.Designer.cs +++ b/DataWrangler/Forms/ManageRecordTypes.Designer.cs @@ -28,9 +28,9 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ManageRecordTypes)); this.gridRecordTypes = new MetroFramework.Controls.MetroGrid(); this.btnBack = new System.Windows.Forms.Button(); @@ -53,23 +53,23 @@ private void InitializeComponent() this.gridRecordTypes.BorderStyle = System.Windows.Forms.BorderStyle.None; this.gridRecordTypes.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.gridRecordTypes.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridRecordTypes.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridRecordTypes.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.gridRecordTypes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(136)))), ((int)(((byte)(136))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gridRecordTypes.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(136)))), ((int)(((byte)(136))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.gridRecordTypes.DefaultCellStyle = dataGridViewCellStyle2; this.gridRecordTypes.EnableHeadersVisualStyles = false; this.gridRecordTypes.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); this.gridRecordTypes.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); @@ -77,14 +77,14 @@ private void InitializeComponent() this.gridRecordTypes.Name = "gridRecordTypes"; this.gridRecordTypes.ReadOnly = true; this.gridRecordTypes.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); - dataGridViewCellStyle6.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridRecordTypes.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridRecordTypes.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.gridRecordTypes.RowHeadersVisible = false; this.gridRecordTypes.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.gridRecordTypes.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -176,6 +176,7 @@ private void InitializeComponent() this.Controls.Add(this.txtRowCnt); this.Controls.Add(this.btnBack); this.Controls.Add(this.gridRecordTypes); + this.MinimumSize = new System.Drawing.Size(800, 450); this.Name = "ManageRecordTypes"; this.Text = " Manage Record Types"; this.Load += new System.EventHandler(this.ManageRecordTypes_Load); diff --git a/DataWrangler/Forms/ManageRecords.cs b/DataWrangler/Forms/ManageRecords.cs index 1ff46ab..555dfc4 100644 --- a/DataWrangler/Forms/ManageRecords.cs +++ b/DataWrangler/Forms/ManageRecords.cs @@ -23,6 +23,7 @@ public partial class ManageRecords : MetroForm private RecordType _recordTypeSel; private IDataRetriever _retriever; private int _rowIdxSel; + private bool _gridIsFiltered; public ManageRecords(Dictionary dbSettings, UserAccount user) { @@ -66,6 +67,12 @@ private void comboRecType_SelectedIndexChanged(object sender, EventArgs e) comboField.Items.Add(comboBoxItem); } + if(comboField.Items.Count > 0) + { + var comboBoxItem = new TextValueItem { Text = "(all fields)", Value = "*" }; + comboField.Items.Add(comboBoxItem); + } + LoadRecordsByType(_recordTypeSel); gridRecords.Enabled = true; comboField.Enabled = true; @@ -240,16 +247,30 @@ public void SwitchFormStyle() private void txtFieldSearch_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) + if (e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) { - if (string.IsNullOrEmpty(comboField.SelectedItem.ToString()) || - string.IsNullOrEmpty(txtFieldSearch.Text)) + if (!_gridIsFiltered && comboField.SelectedItem != null && (string.IsNullOrEmpty(comboField.SelectedItem.ToString()) || + string.IsNullOrEmpty(txtFieldSearch.Text))) return; + if(_gridIsFiltered && string.IsNullOrEmpty(txtFieldSearch.Text)) + { + comboField.SelectedIndex = -1; + txtFieldSearch.Text = ""; + txtFieldSearch.Enabled = false; + LoadRecordsByType(_recordTypeSel); + _gridIsFiltered = false; + return; + } + var searchField = ((TextValueItem) comboField.SelectedItem).Value.ToString(); var searchValue = txtFieldSearch.Text; + var searchValueLen = txtFieldSearch.Text.Replace(" ", "").Length; + + if (searchValueLen < 1) return; LoadRecordsByType(_recordTypeSel, searchField, searchValue); + _gridIsFiltered = true; } } } diff --git a/DataWrangler/Forms/ManageUserAccounts.Designer.cs b/DataWrangler/Forms/ManageUserAccounts.Designer.cs index ec5e145..49403e0 100644 --- a/DataWrangler/Forms/ManageUserAccounts.Designer.cs +++ b/DataWrangler/Forms/ManageUserAccounts.Designer.cs @@ -28,9 +28,9 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ManageUserAccounts)); this.gridUsers = new MetroFramework.Controls.MetroGrid(); this.txtRowCnt = new MetroFramework.Controls.MetroTextBox(); @@ -54,23 +54,23 @@ private void InitializeComponent() this.gridUsers.BorderStyle = System.Windows.Forms.BorderStyle.None; this.gridUsers.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.gridUsers.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); - dataGridViewCellStyle19.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridUsers.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridUsers.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.gridUsers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle20.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle20.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(136)))), ((int)(((byte)(136))))); - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gridUsers.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(136)))), ((int)(((byte)(136))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.gridUsers.DefaultCellStyle = dataGridViewCellStyle2; this.gridUsers.EnableHeadersVisualStyles = false; this.gridUsers.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); this.gridUsers.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); @@ -78,14 +78,14 @@ private void InitializeComponent() this.gridUsers.Name = "gridUsers"; this.gridUsers.ReadOnly = true; this.gridUsers.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); - dataGridViewCellStyle21.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - dataGridViewCellStyle21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridUsers.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(219))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(198)))), ((int)(((byte)(247))))); + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridUsers.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.gridUsers.RowHeadersVisible = false; this.gridUsers.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.gridUsers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -103,7 +103,7 @@ private void InitializeComponent() // // this.txtRowCnt.CustomButton.Image = null; - this.txtRowCnt.CustomButton.Location = new System.Drawing.Point(53, 1); + this.txtRowCnt.CustomButton.Location = new System.Drawing.Point(62, 1); this.txtRowCnt.CustomButton.Name = ""; this.txtRowCnt.CustomButton.Size = new System.Drawing.Size(21, 21); this.txtRowCnt.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; @@ -184,6 +184,7 @@ private void InitializeComponent() this.Controls.Add(this.metroLabel1); this.Controls.Add(this.txtRowCnt); this.Controls.Add(this.gridUsers); + this.MinimumSize = new System.Drawing.Size(800, 450); this.Name = "ManageUserAccounts"; this.Text = " Manage User Accounts"; this.Load += new System.EventHandler(this.ManageUserAccounts_Load_1); diff --git a/DataWrangler/Forms/Options.Designer.cs b/DataWrangler/Forms/Options.Designer.cs index 9fe274e..7131480 100644 --- a/DataWrangler/Forms/Options.Designer.cs +++ b/DataWrangler/Forms/Options.Designer.cs @@ -206,6 +206,8 @@ private void InitializeComponent() this.Controls.Add(this.lblDatabaseSize); this.Controls.Add(this.DatabasePathLabel); this.Controls.Add(this.lblDatabasePath); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "Options"; this.Resizable = false; this.Text = "Options"; diff --git a/DataWrangler/Properties/AssemblyInfo.cs b/DataWrangler/Properties/AssemblyInfo.cs index 2420a1a..1fcc1bf 100644 --- a/DataWrangler/Properties/AssemblyInfo.cs +++ b/DataWrangler/Properties/AssemblyInfo.cs @@ -31,4 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.*")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.1")] +[assembly: AssemblyFileVersion("1.0.1")] \ No newline at end of file