diff --git a/CarManagerV3/Forms/MainForm.Designer.cs b/CarManagerV3/Forms/MainForm.Designer.cs
index 52d8aad..72958aa 100644
--- a/CarManagerV3/Forms/MainForm.Designer.cs
+++ b/CarManagerV3/Forms/MainForm.Designer.cs
@@ -28,12 +28,16 @@
///
private void InitializeComponent()
{
+ components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
flpCars = new System.Windows.Forms.FlowLayoutPanel();
- tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
- tbxSearch = new System.Windows.Forms.TextBox();
+ tlpControls = new System.Windows.Forms.TableLayoutPanel();
btnNewCar = new System.Windows.Forms.Button();
+ imageList1 = new System.Windows.Forms.ImageList(components);
+ tlpSearch = new System.Windows.Forms.TableLayoutPanel();
+ tbxSearch = new System.Windows.Forms.TextBox();
+ pbxSearch = new System.Windows.Forms.PictureBox();
menuStrip1 = new System.Windows.Forms.MenuStrip();
fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -43,7 +47,9 @@
recentFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
revealInFileExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
tableLayoutPanel1.SuspendLayout();
- tableLayoutPanel2.SuspendLayout();
+ tlpControls.SuspendLayout();
+ tlpSearch.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pbxSearch).BeginInit();
menuStrip1.SuspendLayout();
SuspendLayout();
//
@@ -52,7 +58,7 @@
tableLayoutPanel1.ColumnCount = 1;
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.Controls.Add(flpCars, 0, 2);
- tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 0, 1);
+ tableLayoutPanel1.Controls.Add(tlpControls, 0, 1);
tableLayoutPanel1.Controls.Add(menuStrip1, 0, 0);
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
@@ -77,44 +83,91 @@
flpCars.Size = new System.Drawing.Size(796, 515);
flpCars.TabIndex = 1;
//
- // tableLayoutPanel2
+ // tlpControls
//
- tableLayoutPanel2.ColumnCount = 2;
- tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
- tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
- tableLayoutPanel2.Controls.Add(tbxSearch, 0, 0);
- tableLayoutPanel2.Controls.Add(btnNewCar, 1, 0);
- tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- tableLayoutPanel2.Location = new System.Drawing.Point(3, 32);
- tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- tableLayoutPanel2.Name = "tableLayoutPanel2";
- tableLayoutPanel2.RowCount = 1;
- tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F));
- tableLayoutPanel2.Size = new System.Drawing.Size(796, 42);
- tableLayoutPanel2.TabIndex = 2;
- //
- // tbxSearch
- //
- tbxSearch.Dock = System.Windows.Forms.DockStyle.Fill;
- tbxSearch.Location = new System.Drawing.Point(3, 4);
- tbxSearch.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- tbxSearch.Name = "tbxSearch";
- tbxSearch.Size = new System.Drawing.Size(392, 27);
- tbxSearch.TabIndex = 3;
- tbxSearch.TextChanged += tbxSearch_TextChanged;
+ tlpControls.ColumnCount = 2;
+ tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+ tlpControls.Controls.Add(btnNewCar, 1, 0);
+ tlpControls.Controls.Add(tlpSearch, 0, 0);
+ tlpControls.Dock = System.Windows.Forms.DockStyle.Fill;
+ tlpControls.Location = new System.Drawing.Point(3, 28);
+ tlpControls.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+ tlpControls.Name = "tlpControls";
+ tlpControls.RowCount = 1;
+ tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ tlpControls.Size = new System.Drawing.Size(796, 50);
+ tlpControls.TabIndex = 2;
//
// btnNewCar
//
- btnNewCar.Location = new System.Drawing.Point(401, 4);
- btnNewCar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ btnNewCar.BackColor = System.Drawing.SystemColors.MenuHighlight;
+ btnNewCar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ btnNewCar.Cursor = System.Windows.Forms.Cursors.Hand;
+ btnNewCar.Dock = System.Windows.Forms.DockStyle.Fill;
+ btnNewCar.FlatAppearance.BorderSize = 0;
+ btnNewCar.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ btnNewCar.ImageKey = "Icon_Add.png";
+ btnNewCar.ImageList = imageList1;
+ btnNewCar.Location = new System.Drawing.Point(716, 0);
+ btnNewCar.Margin = new System.Windows.Forms.Padding(0);
btnNewCar.Name = "btnNewCar";
- btnNewCar.Size = new System.Drawing.Size(75, 29);
+ btnNewCar.Size = new System.Drawing.Size(80, 50);
btnNewCar.TabIndex = 4;
- btnNewCar.Text = "Add Car";
- btnNewCar.UseVisualStyleBackColor = true;
+ btnNewCar.UseVisualStyleBackColor = false;
btnNewCar.Click += btnNewCar_Click;
//
+ // imageList1
+ //
+ imageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+ imageList1.ImageStream = (System.Windows.Forms.ImageListStreamer)resources.GetObject("imageList1.ImageStream");
+ imageList1.TransparentColor = System.Drawing.Color.Transparent;
+ imageList1.Images.SetKeyName(0, "Icon_Search.png");
+ imageList1.Images.SetKeyName(1, "Icon_Add.png");
+ //
+ // tlpSearch
+ //
+ tlpSearch.BackColor = System.Drawing.SystemColors.Window;
+ tlpSearch.ColumnCount = 2;
+ tlpSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F));
+ tlpSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ tlpSearch.Controls.Add(tbxSearch, 1, 0);
+ tlpSearch.Controls.Add(pbxSearch, 0, 0);
+ tlpSearch.Dock = System.Windows.Forms.DockStyle.Fill;
+ tlpSearch.Location = new System.Drawing.Point(0, 0);
+ tlpSearch.Margin = new System.Windows.Forms.Padding(0);
+ tlpSearch.Name = "tlpSearch";
+ tlpSearch.RowCount = 1;
+ tlpSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());
+ tlpSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ tlpSearch.Size = new System.Drawing.Size(716, 50);
+ tlpSearch.TabIndex = 5;
+ //
+ // tbxSearch
+ //
+ tbxSearch.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+ tbxSearch.BackColor = System.Drawing.SystemColors.Window;
+ tbxSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ tbxSearch.Font = new System.Drawing.Font("Segoe UI", 9F);
+ tbxSearch.Location = new System.Drawing.Point(53, 15);
+ tbxSearch.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ tbxSearch.Name = "tbxSearch";
+ tbxSearch.Size = new System.Drawing.Size(660, 20);
+ tbxSearch.TabIndex = 3;
+ tbxSearch.TextChanged += tbxSearch_TextChanged;
+ //
+ // pbxSearch
+ //
+ pbxSearch.Dock = System.Windows.Forms.DockStyle.Fill;
+ pbxSearch.Image = (System.Drawing.Image)resources.GetObject("pbxSearch.Image");
+ pbxSearch.Location = new System.Drawing.Point(0, 0);
+ pbxSearch.Margin = new System.Windows.Forms.Padding(0);
+ pbxSearch.Name = "pbxSearch";
+ pbxSearch.Size = new System.Drawing.Size(50, 50);
+ pbxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ pbxSearch.TabIndex = 0;
+ pbxSearch.TabStop = false;
+ //
// menuStrip1
//
menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -188,8 +241,10 @@
Text = "Carmanager 3";
tableLayoutPanel1.ResumeLayout(false);
tableLayoutPanel1.PerformLayout();
- tableLayoutPanel2.ResumeLayout(false);
- tableLayoutPanel2.PerformLayout();
+ tlpControls.ResumeLayout(false);
+ tlpSearch.ResumeLayout(false);
+ tlpSearch.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pbxSearch).EndInit();
menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout();
ResumeLayout(false);
@@ -200,7 +255,7 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.FlowLayoutPanel flpCars;
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+ private System.Windows.Forms.TableLayoutPanel tlpControls;
private System.Windows.Forms.TextBox tbxSearch;
private System.Windows.Forms.Button btnNewCar;
private System.Windows.Forms.MenuStrip menuStrip1;
@@ -211,5 +266,8 @@
private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem recentFilesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem revealInFileExplorerToolStripMenuItem;
+ private System.Windows.Forms.TableLayoutPanel tlpSearch;
+ private System.Windows.Forms.PictureBox pbxSearch;
+ private System.Windows.Forms.ImageList imageList1;
}
}
\ No newline at end of file
diff --git a/CarManagerV3/Forms/MainForm.resx b/CarManagerV3/Forms/MainForm.resx
index aaace22..2e5c153 100644
--- a/CarManagerV3/Forms/MainForm.resx
+++ b/CarManagerV3/Forms/MainForm.resx
@@ -117,10 +117,52 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 153, 17
+
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
+ LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
+ SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAACAUAAAJNU0Z0AUkBTAIBAQIB
+ AAEYAQABGAEAARQBAAEUAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABUAMAARQDAAEBAQABIAYAARn/
+ AP8AzAADCAEKAyMBMgMuAUYDFgEe/wAtAAMIAQoDIwEyAVEBTwFNAZcBVwFWAVQBqwMuAUb/AC0AAyMB
+ MgFRAU8BTQGXAf8BmQEzAf8BUAJOAZYDIwEyLAADoAHMBP/0AAMoATwBUgFQAU0BlwGCAWcBTwHTAVAC
+ TgGWAyMBMgMIAQosAAOgAcwE/9QAAwMBBAMPARMBRgFFAUQBewFWAVIBTQGXAVIBTwFMAZIDQAFuAwYB
+ BwMpAT0BUwFQAU0BmAFtAWABVAHAAVIBUAFNAZcDIwEyAwgBCjAAA6ABzAT/0AADEwEaAzEBTQFGAUUB
+ RAF5AWwBYAFUAcEBfQFoAVUBzwFzAWQBVgHKAV4BWgFVAbQCQAE/AW0BWQFVAVEBowFtAWEBVAHAAVMB
+ UAFNAZgDKAE8OAADoAHMBP/MAAMDAQQDMQFNAWQBWwFVAbwBiwFvAVIBzgFMAksBjANAAW8DQAFvAUwC
+ SwGMAYsBbwFSAc4B0wGNAUAB9AFYAVQBUQGiAykBPTwAA6ABzAT/zAADDwETAUYBRQFEAXkBiwFvAVIB
+ zgMGAQgEAggABAIDBgEIAYsBbwFSAc4CPwE+AWsDBAEFKAADoAHMLP+4AAFGAUUBRAF5AWoBYAFVAb8B
+ TAJLAYwEAhAABAIBTAJLAYwBYQFbAVYBtwFCAkEBcSgAA28BowOgAcwDoAHMA6ABzAOgAcwD6AH1BP8D
+ oAHMA6ABzAOgAcwDoAHMA6ABzLgAAVUBUQFNAZcBewFnAVUBzgNAAW8YAANAAW8BdAFlAVUBywFUAVAB
+ TQGUPAADoAHMBP/MAAFVAVEBTQGXAXsBZwFVAc4DQAFvGAADQAFvAXcBZQFUAc0BVAFRAU4BljwAA6AB
+ zAT/zAABRgFFAUQBegFqAWABVQHAAUwCSwGMBAIQAAQCAUwCSwGMAWkBXwFXAb0BRQFEAUMBdzwAA6AB
+ zAT/zAADDgESAUUCRAF4AYsBbwFSAc4DBgEIBAIIAAQCAwYBCAGLAW8BUgHOAkMBQgF1AwwBDzwAA6AB
+ zAT/zAADAwEEAzEBTQFkAVsBVQG8AYsBbwFSAc4BTAJLAYwDQAFvA0ABbwFMAksBjAGLAW8BUgHOAWQB
+ XAFWAboDMQFMAwIBAzwAA28BowOgAczQAAMTARoDMQFMAkMBQgF1AWoBYAFWAb4BewFnAVUBzgF7AWcB
+ VQHOAWkBXwFWAb0BQwJCAXQDMAFLAxMBGv8AHQADAgEDAwwBDwFFAkQBeAFUAVEBTgGWAVQBUQFOAZYB
+ RQFEAUMBdwMLAQ4DAgED/wD/AP8AkwABQgFNAT4HAAE+AwABKAMAAVADAAEUAwABAQEAAQEFAAHwFwAD
+ /wEABf8HAAX/BwAB/wH8AT8C/wcAAf8B+AE/Av8HAAH/AfgBPwH5Af8HAAH/AfABPwH5Af8HAAHwAQAB
+ fwH5Af8HAAHgAQEB/wH5Af8HAAHAAQMB/wH5Af8HAAHBAYMB/wEAAQ8HAALDAf8BAAEPBwABxwHjAf8B
+ +QH/BwABxwHjAf8B+QH/BwACwwH/AfkB/wcAAcEBgwH/AfkB/wcAAcABAwH/AfkB/wcAAeABBwP/BwAB
+ 8AEPA/8HAAX/BwAF/wcACw==
+
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAQZJREFUSEvt
+ ks1KQkEYht0EhRcQgtTZJ5HzXZdeQ/tAXATOt+pmIi1w4zUIIrpoV0rwysiZw9eLnHOmXIkPzGLm+X7m
+ r9E481dE0XIeS1HAjEVniGuOTcYpPqjw7+Hxyjm1EY/3WKir6FsX5tE5j7F1tbhT3MQC2Qsu2QfCujlN
+ i30p4rHe79yjx84SfH6KObtS4s54/RApsQUpSSmxBSlJKbEFoljt34B+DxN/k1PM2JXyMEIWd5Y9Vv+i
+ 9gBX7CsRxTQWEDpJmBv3Y10STjExhQ6NbX5FG86tTfcZt6L4tIWd4u3+Cc3gQ/F/N6miaOLxze5onE6T
+ +PCi+GJ3NPImF7x+ppQd20EWjpfS29AAAAAASUVORK5CYII=
+
+
17, 17
-
AAABAAEAZGQAAAEAIACoogAAFgAAACgAAABkAAAAyAAAAAEAIAAAAAAAQJwAABMLAAATCwAAAAAAAAAA
diff --git a/CarManagerV3/Properties/Resources.resx b/CarManagerV3/Properties/Resources.resx
index af7dbeb..bf438d0 100644
--- a/CarManagerV3/Properties/Resources.resx
+++ b/CarManagerV3/Properties/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
+
@@ -68,9 +69,10 @@
-
+
+
@@ -85,9 +87,10 @@
-
+
+
@@ -109,9 +112,16 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Icon_Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Icon_Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/CarManagerV3/Resources/Icon_Add.png b/CarManagerV3/Resources/Icon_Add.png
new file mode 100644
index 0000000..d8e1711
Binary files /dev/null and b/CarManagerV3/Resources/Icon_Add.png differ
diff --git a/CarManagerV3/Resources/Icon_Search.png b/CarManagerV3/Resources/Icon_Search.png
new file mode 100644
index 0000000..5fc017a
Binary files /dev/null and b/CarManagerV3/Resources/Icon_Search.png differ
diff --git a/CarManagerV3/Resources/add_24dp_FFFFFF_FILL0_wght400_GRAD0_opsz24.png b/CarManagerV3/Resources/add_24dp_FFFFFF_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 0000000..d8e1711
Binary files /dev/null and b/CarManagerV3/Resources/add_24dp_FFFFFF_FILL0_wght400_GRAD0_opsz24.png differ
diff --git a/CarManagerV3/Resources/search_24dp_3399FF_FILL0_wght400_GRAD0_opsz24.png b/CarManagerV3/Resources/search_24dp_3399FF_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 0000000..5fc017a
Binary files /dev/null and b/CarManagerV3/Resources/search_24dp_3399FF_FILL0_wght400_GRAD0_opsz24.png differ