diff --git a/FuelAccounting/FuelAccounting/Forms/FormCar.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormCar.Designer.cs index fd30abf..675f937 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormCar.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormCar.Designer.cs @@ -123,6 +123,7 @@ Controls.Add(label2); Controls.Add(label1); Name = "FormCar"; + StartPosition = FormStartPosition.CenterScreen; Text = "Автомобиль"; ResumeLayout(false); PerformLayout(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormCars.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormCars.Designer.cs index 346af6f..7856eb6 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormCars.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormCars.Designer.cs @@ -106,6 +106,7 @@ Controls.Add(dataGridViewData); Controls.Add(panelButtons); Name = "FormCars"; + StartPosition = FormStartPosition.CenterScreen; Text = "Автомобили"; Load += FormCars_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormDriver.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormDriver.Designer.cs index 324c49a..e05f637 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormDriver.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormDriver.Designer.cs @@ -121,6 +121,7 @@ Controls.Add(label1); Controls.Add(checkedListBoxDriverLicenceCategory); Name = "FormDriver"; + StartPosition = FormStartPosition.CenterScreen; Text = "FormDriver"; ResumeLayout(false); PerformLayout(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormDriver.cs b/FuelAccounting/FuelAccounting/Forms/FormDriver.cs index defd109..ffed2db 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormDriver.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormDriver.cs @@ -1,7 +1,6 @@ using FuelAccounting.Entities; using FuelAccounting.Entities.Enums; using FuelAccounting.Repositories; -using FuelAccounting.Repositories.Implementations; namespace FuelAccounting.Forms { diff --git a/FuelAccounting/FuelAccounting/Forms/FormDrivers.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormDrivers.Designer.cs index 48cbea3..cb2119d 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormDrivers.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormDrivers.Designer.cs @@ -106,6 +106,7 @@ Controls.Add(dataGridViewData); Controls.Add(panelButtons); Name = "FormDrivers"; + StartPosition = FormStartPosition.CenterScreen; Text = "Водители"; Load += FormDrivers_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormDrivers.cs b/FuelAccounting/FuelAccounting/Forms/FormDrivers.cs index 7a0f242..30164fa 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormDrivers.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormDrivers.cs @@ -1,14 +1,4 @@ using FuelAccounting.Repositories; -using FuelAccounting.Repositories.Implementations; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace FuelAccounting.Forms diff --git a/FuelAccounting/FuelAccounting/Forms/FormEquipage.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormEquipage.Designer.cs index 4e65e01..d8d735d 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormEquipage.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormEquipage.Designer.cs @@ -169,6 +169,7 @@ Controls.Add(comboBoxCar); Controls.Add(label1); Name = "FormEquipage"; + StartPosition = FormStartPosition.CenterScreen; Text = "Выезд"; groupBoxRoutes.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormEquipage.cs b/FuelAccounting/FuelAccounting/Forms/FormEquipage.cs index cca29ff..ebdc54a 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormEquipage.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormEquipage.cs @@ -1,15 +1,5 @@ using FuelAccounting.Entities; using FuelAccounting.Repositories; -using FuelAccounting.Repositories.Implementations; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace FuelAccounting.Forms { diff --git a/FuelAccounting/FuelAccounting/Forms/FormEquipages.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormEquipages.Designer.cs index ace13f1..a82be81 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormEquipages.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormEquipages.Designer.cs @@ -30,8 +30,8 @@ { dataGridViewData = new DataGridView(); panelButtons = new Panel(); - buttonAdd = new Button(); buttonDelete = new Button(); + buttonAdd = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit(); panelButtons.SuspendLayout(); SuspendLayout(); @@ -63,17 +63,6 @@ panelButtons.Size = new Size(160, 450); panelButtons.TabIndex = 10; // - // buttonAdd - // - buttonAdd.BackgroundImage = Properties.Resources.pngimg_com___plus_PNG84; - buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; - buttonAdd.Location = new Point(18, 12); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(130, 130); - buttonAdd.TabIndex = 2; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; - // // buttonDelete // buttonDelete.BackgroundImage = Properties.Resources.images; @@ -85,6 +74,17 @@ buttonDelete.UseVisualStyleBackColor = true; buttonDelete.Click += ButtonDelete_Click; // + // buttonAdd + // + buttonAdd.BackgroundImage = Properties.Resources.pngimg_com___plus_PNG84; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; + buttonAdd.Location = new Point(18, 12); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(130, 130); + buttonAdd.TabIndex = 2; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // // FormEquipages // AutoScaleDimensions = new SizeF(7F, 15F); @@ -93,6 +93,7 @@ Controls.Add(dataGridViewData); Controls.Add(panelButtons); Name = "FormEquipages"; + StartPosition = FormStartPosition.CenterScreen; Text = "Выезды"; Load += FormEquipages_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormEquipages.cs b/FuelAccounting/FuelAccounting/Forms/FormEquipages.cs index 161d777..022554e 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormEquipages.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormEquipages.cs @@ -1,14 +1,4 @@ using FuelAccounting.Repositories; -using FuelAccounting.Repositories.Implementations; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace FuelAccounting.Forms diff --git a/FuelAccounting/FuelAccounting/Forms/FormRefueling.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormRefueling.Designer.cs index cae9385..f1d0166 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRefueling.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRefueling.Designer.cs @@ -74,7 +74,7 @@ label4.AutoSize = true; label4.Location = new Point(12, 126); label4.Name = "label4"; - label4.Size = new Size(75, 15); + label4.Size = new Size(76, 15); label4.TabIndex = 3; label4.Text = "Тип топлива"; // @@ -149,6 +149,7 @@ Controls.Add(label2); Controls.Add(label1); Name = "FormRefueling"; + StartPosition = FormStartPosition.CenterScreen; Text = "FormRefueling"; ((System.ComponentModel.ISupportInitialize)numericUpDownKm).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownLiters).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormRefueling.cs b/FuelAccounting/FuelAccounting/Forms/FormRefueling.cs index ddb7714..fb5c0e9 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRefueling.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRefueling.cs @@ -1,14 +1,5 @@ using FuelAccounting.Entities; using FuelAccounting.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace FuelAccounting.Forms { diff --git a/FuelAccounting/FuelAccounting/Forms/FormRefuelings.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormRefuelings.Designer.cs index d998f5b..4c8966d 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRefuelings.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRefuelings.Designer.cs @@ -80,6 +80,7 @@ Controls.Add(dataGridViewData); Controls.Add(panelButtons); Name = "FormRefuelings"; + StartPosition = FormStartPosition.CenterScreen; Text = "Заправки"; Load += FormRefuelings_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Forms/FormRefuelings.cs b/FuelAccounting/FuelAccounting/Forms/FormRefuelings.cs index 3426de7..8bcd753 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRefuelings.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRefuelings.cs @@ -1,14 +1,4 @@ using FuelAccounting.Repositories; -using FuelAccounting.Repositories.Implementations; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace FuelAccounting.Forms diff --git a/FuelAccounting/FuelAccounting/Forms/FormRoute.cs b/FuelAccounting/FuelAccounting/Forms/FormRoute.cs index 76a5d8f..5a26022 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRoute.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRoute.cs @@ -1,14 +1,5 @@ using FuelAccounting.Entities; using FuelAccounting.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace FuelAccounting.Forms { diff --git a/FuelAccounting/FuelAccounting/Forms/FormRoutes.cs b/FuelAccounting/FuelAccounting/Forms/FormRoutes.cs index 89e625a..4736935 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormRoutes.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormRoutes.cs @@ -1,13 +1,4 @@ using FuelAccounting.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using Unity; namespace FuelAccounting.Forms diff --git a/FuelAccounting/FuelAccounting/Forms/FormShift.cs b/FuelAccounting/FuelAccounting/Forms/FormShift.cs index 2c1a5d4..6895e70 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormShift.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormShift.cs @@ -1,14 +1,5 @@ using FuelAccounting.Entities; using FuelAccounting.Repositories; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace FuelAccounting.Forms { diff --git a/FuelAccounting/FuelAccounting/Forms/FormShifts.Designer.cs b/FuelAccounting/FuelAccounting/Forms/FormShifts.Designer.cs index 151e14d..9af648b 100644 --- a/FuelAccounting/FuelAccounting/Forms/FormShifts.Designer.cs +++ b/FuelAccounting/FuelAccounting/Forms/FormShifts.Designer.cs @@ -106,6 +106,7 @@ Controls.Add(dataGridViewData); Controls.Add(panelButtons); Name = "FormShifts"; + StartPosition = FormStartPosition.CenterScreen; Text = "Смены"; Load += FormShifts_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); diff --git a/FuelAccounting/FuelAccounting/Properties/Resources.Designer.cs b/FuelAccounting/FuelAccounting/Properties/Resources.Designer.cs index 261c0cc..0928cc5 100644 --- a/FuelAccounting/FuelAccounting/Properties/Resources.Designer.cs +++ b/FuelAccounting/FuelAccounting/Properties/Resources.Designer.cs @@ -80,16 +80,6 @@ namespace FuelAccounting.Properties { } } - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Cancel { - get { - object obj = ResourceManager.GetObject("Cancel", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -100,37 +90,6 @@ namespace FuelAccounting.Properties { } } - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap png_clipart_plus_plus { - get { - object obj = ResourceManager.GetObject("png-clipart-plus-plus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap png_clipart_plus_plus__1_ { - get { - object obj = ResourceManager.GetObject("png-clipart-plus-plus (1)", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap png_transparent_pencil_illustration_hand_painted_pencil_material_watercolor_painting_text_color_pencil { - get { - object obj = ResourceManager.GetObject("png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-paint" + - "ing-text-color-pencil", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// diff --git a/FuelAccounting/FuelAccounting/Properties/Resources.resx b/FuelAccounting/FuelAccounting/Properties/Resources.resx index d11221e..593f957 100644 --- a/FuelAccounting/FuelAccounting/Properties/Resources.resx +++ b/FuelAccounting/FuelAccounting/Properties/Resources.resx @@ -118,15 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\png-clipart-plus-plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pngimg.com - plus_PNG84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -136,9 +127,6 @@ ..\Resources\4298.jpeg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\png-clipart-plus-plus (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\images.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/FuelAccounting/FuelAccounting/Repositories/IConnectionString.cs b/FuelAccounting/FuelAccounting/Repositories/IConnectionString.cs index 52da1f4..c2f5691 100644 --- a/FuelAccounting/FuelAccounting/Repositories/IConnectionString.cs +++ b/FuelAccounting/FuelAccounting/Repositories/IConnectionString.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FuelAccounting.Repositories; +namespace FuelAccounting.Repositories; public interface IConnectionString { diff --git a/FuelAccounting/FuelAccounting/Repositories/Implementations/ConnectionString.cs b/FuelAccounting/FuelAccounting/Repositories/Implementations/ConnectionString.cs index 2defd79..7e06d3b 100644 --- a/FuelAccounting/FuelAccounting/Repositories/Implementations/ConnectionString.cs +++ b/FuelAccounting/FuelAccounting/Repositories/Implementations/ConnectionString.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FuelAccounting.Repositories.Implementations; +namespace FuelAccounting.Repositories.Implementations; internal class ConnectionString : IConnectionString { diff --git a/FuelAccounting/FuelAccounting/Repositories/Implementations/DriverRepository.cs b/FuelAccounting/FuelAccounting/Repositories/Implementations/DriverRepository.cs index f94d5d3..8e16453 100644 --- a/FuelAccounting/FuelAccounting/Repositories/Implementations/DriverRepository.cs +++ b/FuelAccounting/FuelAccounting/Repositories/Implementations/DriverRepository.cs @@ -1,6 +1,5 @@ using Dapper; using FuelAccounting.Entities; -using FuelAccounting.Entities.Enums; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Npgsql; diff --git a/FuelAccounting/FuelAccounting/Resources/Cancel.png b/FuelAccounting/FuelAccounting/Resources/Cancel.png deleted file mode 100644 index cd4f606..0000000 Binary files a/FuelAccounting/FuelAccounting/Resources/Cancel.png and /dev/null differ diff --git a/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus (1).png b/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus (1).png deleted file mode 100644 index ec53f2e..0000000 Binary files a/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus (1).png and /dev/null differ diff --git a/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus.png b/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus.png deleted file mode 100644 index b64bb1f..0000000 Binary files a/FuelAccounting/FuelAccounting/Resources/png-clipart-plus-plus.png and /dev/null differ diff --git a/FuelAccounting/FuelAccounting/Resources/png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil.png b/FuelAccounting/FuelAccounting/Resources/png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil.png deleted file mode 100644 index 5581ebc..0000000 Binary files a/FuelAccounting/FuelAccounting/Resources/png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil.png and /dev/null differ