Index: /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs =================================================================== --- /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 565) +++ /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 570) @@ -8,4 +8,5 @@ using System.Text.RegularExpressions; using Baza_Reklam.Classes; +using Baza_Reklam.Classes.Helpers; namespace Baza_Reklam @@ -124,4 +125,5 @@ { wyroznienie_exportedCheckBox.Enabled = User.getUser().St_produkcja; + cbLocation.SelectedIndex = 0; } @@ -211,4 +213,10 @@ private void dodajButton_Click(object sender, EventArgs e) { + if (!ValidateChildren()) + { + MessageBox.Show("Proszê uzupe³niæ wymagane pola."); + return; + } + Cursor = Cursors.WaitCursor; @@ -238,5 +246,5 @@ reklama_Info_DodTableAdapter.Update(rEKLAMADataSet.Reklama_Info_Dod); zmianyEmisjiTableAdapter.Update(rEKLAMADataSet.zmianyEmisji); - + zmiany(); @@ -409,15 +417,17 @@ rEKLAMAUKAZESIEWNRBindingSource.EndEdit(); + if (rEKLAMABindingSource.Current == null) return; + liczbaEmisjiLabel.Text = rEKLAMAUKAZESIEWNRBindingSource.List.Count.ToString(); - - if (rEKLAMABindingSource.Current != null) - { - DataRowView row = (DataRowView)rEKLAMABindingSource.Current; - - if (row["ID_FAKTURY"] == DBNull.Value) - { - kROTNOSCTextBox.Text = rEKLAMAUKAZESIEWNRBindingSource.List.Count.ToString(); - } - } + kROTNOSCTextBox.Text = rEKLAMAUKAZESIEWNRBindingSource.List.Count.ToString(); + + //if (rEKLAMABindingSource.Current != null) + //{ + // DataRowView row = (DataRowView)rEKLAMABindingSource.Current; + // if (row["ID_FAKTURY"] == DBNull.Value) + // { + + // } + //} } @@ -1659,4 +1669,9 @@ } } + + private void cbLocation_Validating(object sender, CancelEventArgs e) + { + ValidationHelper.IsComboValueSelected(cbLocation, 0, "Proszê wybraæ lokalizacjê reklamy.", e, errProvider); + } } } Index: /branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ValidationHelper.cs =================================================================== --- /branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ValidationHelper.cs (revision 539) +++ /branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ValidationHelper.cs (revision 570) @@ -78,4 +78,19 @@ return cancelEventArgs.Cancel; } + + public static bool IsComboValueSelected(ComboBox comboBox, int defaultIndex, string errorMessage, CancelEventArgs cancelEventArgs, ErrorProvider errorProvider) + { + StringBuilder sb = new StringBuilder(); + if (comboBox.SelectedIndex <= defaultIndex || comboBox.SelectedItem == null) + { + cancelEventArgs.Cancel = true; + sb.Append(errorMessage); + } + else + cancelEventArgs.Cancel = false; + + errorProvider.SetError(comboBox, sb.ToString()); + return cancelEventArgs.Cancel; + } } } Index: /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs =================================================================== --- /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs (revision 337) +++ /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs (revision 570) @@ -64,8 +64,9 @@ System.Windows.Forms.Label ogl_dzialLabel; System.Windows.Forms.Label ogl_rozdzialLabel; - 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrderDetails)); + System.Windows.Forms.Label label1; this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet(); this.rEKLAMABindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -118,5 +119,4 @@ this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components); this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.button3 = new System.Windows.Forms.Button(); @@ -185,4 +185,7 @@ this.deleteItem = new System.Windows.Forms.ToolStripMenuItem(); this.editItem = new System.Windows.Forms.ToolStripMenuItem(); + this.label9 = new System.Windows.Forms.Label(); + this.cbLocation = new System.Windows.Forms.ComboBox(); + this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); sYMBOL_AKWIZYTORALabel = new System.Windows.Forms.Label(); tYTULLabel = new System.Windows.Forms.Label(); @@ -219,4 +222,5 @@ ogl_dzialLabel = new System.Windows.Forms.Label(); ogl_rozdzialLabel = new System.Windows.Forms.Label(); + label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.rEKLAMADataSet)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rEKLAMABindingSource)).BeginInit(); @@ -250,4 +254,5 @@ this.emisjeContextMenuStrip.SuspendLayout(); this.advertSiteContext.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); this.SuspendLayout(); // @@ -264,5 +269,5 @@ // tYTULLabel.AutoSize = true; - tYTULLabel.Location = new System.Drawing.Point(6, 16); + tYTULLabel.Location = new System.Drawing.Point(6, 11); tYTULLabel.Name = "tYTULLabel"; tYTULLabel.Size = new System.Drawing.Size(35, 13); @@ -273,5 +278,5 @@ // tYPLabel.AutoSize = true; - tYPLabel.Location = new System.Drawing.Point(8, 98); + tYPLabel.Location = new System.Drawing.Point(6, 90); tYPLabel.Name = "tYPLabel"; tYPLabel.Size = new System.Drawing.Size(28, 13); @@ -282,5 +287,5 @@ // iD_REKLAMYLabel.AutoSize = true; - iD_REKLAMYLabel.Location = new System.Drawing.Point(148, 14); + iD_REKLAMYLabel.Location = new System.Drawing.Point(148, 11); iD_REKLAMYLabel.Name = "iD_REKLAMYLabel"; iD_REKLAMYLabel.Size = new System.Drawing.Size(83, 13); @@ -291,5 +296,5 @@ // nICK_NAMELabel.AutoSize = true; - nICK_NAMELabel.Location = new System.Drawing.Point(147, 59); + nICK_NAMELabel.Location = new System.Drawing.Point(147, 51); nICK_NAMELabel.Name = "nICK_NAMELabel"; nICK_NAMELabel.Size = new System.Drawing.Size(92, 13); @@ -300,5 +305,5 @@ // dATA_ZAMOWIENIALabel.AutoSize = true; - dATA_ZAMOWIENIALabel.Location = new System.Drawing.Point(9, 59); + dATA_ZAMOWIENIALabel.Location = new System.Drawing.Point(6, 51); dATA_ZAMOWIENIALabel.Name = "dATA_ZAMOWIENIALabel"; dATA_ZAMOWIENIALabel.Size = new System.Drawing.Size(91, 13); @@ -309,5 +314,5 @@ // sZERLabel.AutoSize = true; - sZERLabel.Location = new System.Drawing.Point(145, 59); + sZERLabel.Location = new System.Drawing.Point(146, 51); sZERLabel.Name = "sZERLabel"; sZERLabel.Size = new System.Drawing.Size(31, 13); @@ -318,5 +323,5 @@ // wYSLabel.AutoSize = true; - wYSLabel.Location = new System.Drawing.Point(209, 60); + wYSLabel.Location = new System.Drawing.Point(216, 51); wYSLabel.Name = "wYSLabel"; wYSLabel.Size = new System.Drawing.Size(31, 13); @@ -327,23 +332,24 @@ // kROTNOSCLabel.AutoSize = true; - kROTNOSCLabel.Location = new System.Drawing.Point(280, 59); + kROTNOSCLabel.Location = new System.Drawing.Point(435, 575); kROTNOSCLabel.Name = "kROTNOSCLabel"; - kROTNOSCLabel.Size = new System.Drawing.Size(32, 13); + kROTNOSCLabel.Size = new System.Drawing.Size(69, 13); kROTNOSCLabel.TabIndex = 19; - kROTNOSCLabel.Text = "Iloœæ:"; + kROTNOSCLabel.Text = "Liczba emisji:"; // // oDSTÊPLabel // oDSTÊPLabel.AutoSize = true; - oDSTÊPLabel.Location = new System.Drawing.Point(347, 59); + oDSTÊPLabel.Location = new System.Drawing.Point(736, 565); oDSTÊPLabel.Name = "oDSTÊPLabel"; oDSTÊPLabel.Size = new System.Drawing.Size(23, 13); oDSTÊPLabel.TabIndex = 21; oDSTÊPLabel.Text = "Co:"; + oDSTÊPLabel.Visible = false; // // rABATLabel // rABATLabel.AutoSize = true; - rABATLabel.Location = new System.Drawing.Point(5, 42); + rABATLabel.Location = new System.Drawing.Point(5, 54); rABATLabel.Name = "rABATLabel"; rABATLabel.Size = new System.Drawing.Size(39, 13); @@ -356,12 +362,12 @@ zATWIERDZONO_DO_DRUKULabel.Location = new System.Drawing.Point(3, 5); zATWIERDZONO_DO_DRUKULabel.Name = "zATWIERDZONO_DO_DRUKULabel"; - zATWIERDZONO_DO_DRUKULabel.Size = new System.Drawing.Size(160, 13); + zATWIERDZONO_DO_DRUKULabel.Size = new System.Drawing.Size(119, 13); zATWIERDZONO_DO_DRUKULabel.TabIndex = 27; - zATWIERDZONO_DO_DRUKULabel.Text = "ZATWIERDZONO DO DRUKU:"; + zATWIERDZONO_DO_DRUKULabel.Text = "Zatwierdzono do druku:"; // // cENA_JEDNLabel // cENA_JEDNLabel.AutoSize = true; - cENA_JEDNLabel.Location = new System.Drawing.Point(5, 20); + cENA_JEDNLabel.Location = new System.Drawing.Point(5, 29); cENA_JEDNLabel.Name = "cENA_JEDNLabel"; cENA_JEDNLabel.Size = new System.Drawing.Size(58, 13); @@ -372,5 +378,5 @@ // nETTOLabel.AutoSize = true; - nETTOLabel.Location = new System.Drawing.Point(5, 124); + nETTOLabel.Location = new System.Drawing.Point(5, 132); nETTOLabel.Name = "nETTOLabel"; nETTOLabel.Size = new System.Drawing.Size(36, 13); @@ -381,5 +387,5 @@ // vATLabel.AutoSize = true; - vATLabel.Location = new System.Drawing.Point(6, 175); + vATLabel.Location = new System.Drawing.Point(5, 184); vATLabel.Name = "vATLabel"; vATLabel.Size = new System.Drawing.Size(31, 13); @@ -390,5 +396,5 @@ // pVATLabel.AutoSize = true; - pVATLabel.Location = new System.Drawing.Point(5, 201); + pVATLabel.Location = new System.Drawing.Point(5, 210); pVATLabel.Name = "pVATLabel"; pVATLabel.Size = new System.Drawing.Size(39, 13); @@ -399,5 +405,5 @@ // bRUTTOLabel.AutoSize = true; - bRUTTOLabel.Location = new System.Drawing.Point(6, 149); + bRUTTOLabel.Location = new System.Drawing.Point(5, 158); bRUTTOLabel.Name = "bRUTTOLabel"; bRUTTOLabel.Size = new System.Drawing.Size(38, 13); @@ -408,5 +414,5 @@ // pROWIZJALabel.AutoSize = true; - pROWIZJALabel.Location = new System.Drawing.Point(5, 228); + pROWIZJALabel.Location = new System.Drawing.Point(5, 237); pROWIZJALabel.Name = "pROWIZJALabel"; pROWIZJALabel.Size = new System.Drawing.Size(49, 13); @@ -426,5 +432,5 @@ // pROMOCJALabel.AutoSize = true; - pROMOCJALabel.Location = new System.Drawing.Point(280, 16); + pROMOCJALabel.Location = new System.Drawing.Point(286, 91); pROMOCJALabel.Name = "pROMOCJALabel"; pROMOCJALabel.Size = new System.Drawing.Size(54, 13); @@ -435,5 +441,5 @@ // gRZBIETLabel.AutoSize = true; - gRZBIETLabel.Location = new System.Drawing.Point(6, 59); + gRZBIETLabel.Location = new System.Drawing.Point(146, 11); gRZBIETLabel.Name = "gRZBIETLabel"; gRZBIETLabel.Size = new System.Drawing.Size(43, 13); @@ -444,5 +450,5 @@ // kier_notatkaLabel.AutoSize = true; - kier_notatkaLabel.Location = new System.Drawing.Point(39, 400); + kier_notatkaLabel.Location = new System.Drawing.Point(29, 405); kier_notatkaLabel.Name = "kier_notatkaLabel"; kier_notatkaLabel.Size = new System.Drawing.Size(102, 13); @@ -462,14 +468,14 @@ // zablokuj_prowizjeLabel.AutoSize = true; - zablokuj_prowizjeLabel.Location = new System.Drawing.Point(117, 251); + zablokuj_prowizjeLabel.Location = new System.Drawing.Point(141, 259); zablokuj_prowizjeLabel.Name = "zablokuj_prowizjeLabel"; - zablokuj_prowizjeLabel.Size = new System.Drawing.Size(93, 13); - zablokuj_prowizjeLabel.TabIndex = 53; - zablokuj_prowizjeLabel.Text = "ZABLOKOWANA:"; + zablokuj_prowizjeLabel.Size = new System.Drawing.Size(75, 13); + zablokuj_prowizjeLabel.TabIndex = 29; + zablokuj_prowizjeLabel.Text = "Zablokowana:"; // // kOLORLabel // kOLORLabel.AutoSize = true; - kOLORLabel.Location = new System.Drawing.Point(8, 99); + kOLORLabel.Location = new System.Drawing.Point(6, 51); kOLORLabel.Name = "kOLORLabel"; kOLORLabel.Size = new System.Drawing.Size(34, 13); @@ -480,5 +486,5 @@ // mOD_TYPLabel.AutoSize = true; - mOD_TYPLabel.Location = new System.Drawing.Point(141, 16); + mOD_TYPLabel.Location = new System.Drawing.Point(286, 11); mOD_TYPLabel.Name = "mOD_TYPLabel"; mOD_TYPLabel.Size = new System.Drawing.Size(67, 13); @@ -489,9 +495,9 @@ // sTRONALabel.AutoSize = true; - sTRONALabel.Location = new System.Drawing.Point(145, 99); + sTRONALabel.Location = new System.Drawing.Point(6, 131); sTRONALabel.Name = "sTRONALabel"; - sTRONALabel.Size = new System.Drawing.Size(63, 13); + sTRONALabel.Size = new System.Drawing.Size(103, 13); sTRONALabel.TabIndex = 57; - sTRONALabel.Text = "Lokalizacja:"; + sTRONALabel.Text = "Uwagi do lokalizacji:"; // // fAKTURA_WYSTAWIONOLabel @@ -500,16 +506,16 @@ fAKTURA_WYSTAWIONOLabel.Location = new System.Drawing.Point(268, 638); fAKTURA_WYSTAWIONOLabel.Name = "fAKTURA_WYSTAWIONOLabel"; - fAKTURA_WYSTAWIONOLabel.Size = new System.Drawing.Size(140, 13); + fAKTURA_WYSTAWIONOLabel.Size = new System.Drawing.Size(46, 13); fAKTURA_WYSTAWIONOLabel.TabIndex = 70; - fAKTURA_WYSTAWIONOLabel.Text = "FAKTURA WYSTAWIONO:"; + fAKTURA_WYSTAWIONOLabel.Text = "Faktura:"; // // zAP£ACONOLabel // zAP£ACONOLabel.AutoSize = true; - zAP£ACONOLabel.Location = new System.Drawing.Point(451, 638); + zAP£ACONOLabel.Location = new System.Drawing.Point(346, 638); zAP£ACONOLabel.Name = "zAP£ACONOLabel"; - zAP£ACONOLabel.Size = new System.Drawing.Size(76, 13); + zAP£ACONOLabel.Size = new System.Drawing.Size(63, 13); zAP£ACONOLabel.TabIndex = 71; - zAP£ACONOLabel.Text = "ZAP£ACONO:"; + zAP£ACONOLabel.Text = "Zap³acono:"; // // wyroznienieLabel @@ -525,5 +531,5 @@ // wyroznienie_exportedLabel.AutoSize = true; - wyroznienie_exportedLabel.Location = new System.Drawing.Point(558, 638); + wyroznienie_exportedLabel.Location = new System.Drawing.Point(437, 638); wyroznienie_exportedLabel.Name = "wyroznienie_exportedLabel"; wyroznienie_exportedLabel.Size = new System.Drawing.Size(126, 13); @@ -534,5 +540,5 @@ // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(6, 97); + label7.Location = new System.Drawing.Point(5, 106); label7.Name = "label7"; label7.Size = new System.Drawing.Size(61, 13); @@ -543,5 +549,5 @@ // ogl_dzialLabel.AutoSize = true; - ogl_dzialLabel.Location = new System.Drawing.Point(6, 139); + ogl_dzialLabel.Location = new System.Drawing.Point(6, 91); ogl_dzialLabel.Name = "ogl_dzialLabel"; ogl_dzialLabel.Size = new System.Drawing.Size(35, 13); @@ -552,5 +558,5 @@ // ogl_rozdzialLabel.AutoSize = true; - ogl_rozdzialLabel.Location = new System.Drawing.Point(145, 139); + ogl_rozdzialLabel.Location = new System.Drawing.Point(146, 91); ogl_rozdzialLabel.Name = "ogl_rozdzialLabel"; ogl_rozdzialLabel.Size = new System.Drawing.Size(52, 13); @@ -579,9 +585,9 @@ this.tYTULComboBox.DataSource = this.lISTATYTULOWBindingSource; this.tYTULComboBox.DisplayMember = "SYMB"; - this.tYTULComboBox.Location = new System.Drawing.Point(7, 31); + this.tYTULComboBox.Location = new System.Drawing.Point(6, 26); this.tYTULComboBox.Name = "tYTULComboBox"; this.tYTULComboBox.RightToLeft = System.Windows.Forms.RightToLeft.No; this.tYTULComboBox.Size = new System.Drawing.Size(124, 21); - this.tYTULComboBox.TabIndex = 6; + this.tYTULComboBox.TabIndex = 5; this.tYTULComboBox.ValueMember = "SYMB"; this.tYTULComboBox.SelectedIndexChanged += new System.EventHandler(this.tYTULComboBox_SelectedIndexChanged); @@ -609,9 +615,8 @@ this.tYPComboBox.DisplayMember = "SYMB"; this.tYPComboBox.FormattingEnabled = true; - this.tYPComboBox.Location = new System.Drawing.Point(9, 114); + this.tYPComboBox.Location = new System.Drawing.Point(6, 105); this.tYPComboBox.Name = "tYPComboBox"; this.tYPComboBox.Size = new System.Drawing.Size(126, 21); - this.tYPComboBox.TabIndex = 5; - this.tYPComboBox.TabStop = false; + this.tYPComboBox.TabIndex = 3; this.tYPComboBox.ValueMember = "SYMB"; // @@ -629,9 +634,9 @@ this.iD_REKLAMYTextBox.BackColor = System.Drawing.SystemColors.Window; this.iD_REKLAMYTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "ID REKLAMY", true)); - this.iD_REKLAMYTextBox.Location = new System.Drawing.Point(151, 30); + this.iD_REKLAMYTextBox.Location = new System.Drawing.Point(151, 26); this.iD_REKLAMYTextBox.MaxLength = 10; this.iD_REKLAMYTextBox.Name = "iD_REKLAMYTextBox"; this.iD_REKLAMYTextBox.Size = new System.Drawing.Size(126, 20); - this.iD_REKLAMYTextBox.TabIndex = 2; + this.iD_REKLAMYTextBox.TabIndex = 0; // // nICK_NAMETextBox @@ -639,9 +644,9 @@ this.nICK_NAMETextBox.BackColor = System.Drawing.SystemColors.Window; this.nICK_NAMETextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "NICK NAME", true)); - this.nICK_NAMETextBox.Location = new System.Drawing.Point(150, 75); + this.nICK_NAMETextBox.Location = new System.Drawing.Point(150, 66); this.nICK_NAMETextBox.MaxLength = 50; this.nICK_NAMETextBox.Name = "nICK_NAMETextBox"; this.nICK_NAMETextBox.Size = new System.Drawing.Size(240, 20); - this.nICK_NAMETextBox.TabIndex = 4; + this.nICK_NAMETextBox.TabIndex = 2; // // dATA_ZAMOWIENIADateTimePicker @@ -650,8 +655,8 @@ this.dATA_ZAMOWIENIADateTimePicker.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right; this.dATA_ZAMOWIENIADateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dATA_ZAMOWIENIADateTimePicker.Location = new System.Drawing.Point(10, 75); + this.dATA_ZAMOWIENIADateTimePicker.Location = new System.Drawing.Point(6, 66); this.dATA_ZAMOWIENIADateTimePicker.Name = "dATA_ZAMOWIENIADateTimePicker"; this.dATA_ZAMOWIENIADateTimePicker.Size = new System.Drawing.Size(126, 20); - this.dATA_ZAMOWIENIADateTimePicker.TabIndex = 3; + this.dATA_ZAMOWIENIADateTimePicker.TabIndex = 1; // // sZERTextBox @@ -659,8 +664,8 @@ this.sZERTextBox.BackColor = System.Drawing.SystemColors.Window; this.sZERTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "SZER", true)); - this.sZERTextBox.Location = new System.Drawing.Point(144, 75); + this.sZERTextBox.Location = new System.Drawing.Point(146, 66); this.sZERTextBox.Name = "sZERTextBox"; - this.sZERTextBox.Size = new System.Drawing.Size(41, 20); - this.sZERTextBox.TabIndex = 10; + this.sZERTextBox.Size = new System.Drawing.Size(54, 20); + this.sZERTextBox.TabIndex = 9; this.sZERTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.sZERTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.sZERTextBox_Validating); @@ -670,8 +675,8 @@ this.wYSTextBox.BackColor = System.Drawing.SystemColors.Window; this.wYSTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "WYS", true)); - this.wYSTextBox.Location = new System.Drawing.Point(212, 75); + this.wYSTextBox.Location = new System.Drawing.Point(216, 66); this.wYSTextBox.Name = "wYSTextBox"; - this.wYSTextBox.Size = new System.Drawing.Size(39, 20); - this.wYSTextBox.TabIndex = 11; + this.wYSTextBox.Size = new System.Drawing.Size(54, 20); + this.wYSTextBox.TabIndex = 10; this.wYSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.wYSTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.wYSTextBox_Validating); @@ -681,9 +686,9 @@ this.kROTNOSCTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.kROTNOSCTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "KROTNOŒÆ", true)); - this.kROTNOSCTextBox.Location = new System.Drawing.Point(283, 75); + this.kROTNOSCTextBox.Location = new System.Drawing.Point(510, 571); this.kROTNOSCTextBox.Name = "kROTNOSCTextBox"; this.kROTNOSCTextBox.ReadOnly = true; this.kROTNOSCTextBox.Size = new System.Drawing.Size(36, 20); - this.kROTNOSCTextBox.TabIndex = 12; + this.kROTNOSCTextBox.TabIndex = 39; this.kROTNOSCTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -692,9 +697,10 @@ this.oDSTEPTextBox.BackColor = System.Drawing.SystemColors.Window; this.oDSTEPTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "ODSTÊP", true)); - this.oDSTEPTextBox.Location = new System.Drawing.Point(341, 75); + this.oDSTEPTextBox.Location = new System.Drawing.Point(730, 581); this.oDSTEPTextBox.Name = "oDSTEPTextBox"; this.oDSTEPTextBox.Size = new System.Drawing.Size(43, 20); this.oDSTEPTextBox.TabIndex = 13; this.oDSTEPTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.oDSTEPTextBox.Visible = false; // // rABATTextBox @@ -702,8 +708,8 @@ this.rABATTextBox.BackColor = System.Drawing.SystemColors.Window; this.rABATTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "RABAT", true)); - this.rABATTextBox.Location = new System.Drawing.Point(91, 42); + this.rABATTextBox.Location = new System.Drawing.Point(91, 50); this.rABATTextBox.Name = "rABATTextBox"; this.rABATTextBox.Size = new System.Drawing.Size(46, 20); - this.rABATTextBox.TabIndex = 24; + this.rABATTextBox.TabIndex = 18; this.rABATTextBox.Text = "0"; this.rABATTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -714,9 +720,9 @@ this.rABAT_WARTOSCTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.rABAT_WARTOSCTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "RABAT WARTOŒÆ", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.rABAT_WARTOSCTextBox.Location = new System.Drawing.Point(144, 42); + this.rABAT_WARTOSCTextBox.Location = new System.Drawing.Point(144, 50); this.rABAT_WARTOSCTextBox.Name = "rABAT_WARTOSCTextBox"; this.rABAT_WARTOSCTextBox.ReadOnly = true; this.rABAT_WARTOSCTextBox.Size = new System.Drawing.Size(89, 20); - this.rABAT_WARTOSCTextBox.TabIndex = 26; + this.rABAT_WARTOSCTextBox.TabIndex = 19; this.rABAT_WARTOSCTextBox.Text = "0"; this.rABAT_WARTOSCTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -724,10 +730,11 @@ // zATWIERDZONO_DO_DRUKUCheckBox // + this.zATWIERDZONO_DO_DRUKUCheckBox.AutoSize = true; this.zATWIERDZONO_DO_DRUKUCheckBox.BackColor = System.Drawing.Color.Transparent; this.zATWIERDZONO_DO_DRUKUCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "ZATWIERDZONO DO DRUKU", true)); - this.zATWIERDZONO_DO_DRUKUCheckBox.Location = new System.Drawing.Point(166, 0); + this.zATWIERDZONO_DO_DRUKUCheckBox.Location = new System.Drawing.Point(124, 4); this.zATWIERDZONO_DO_DRUKUCheckBox.Name = "zATWIERDZONO_DO_DRUKUCheckBox"; - this.zATWIERDZONO_DO_DRUKUCheckBox.Size = new System.Drawing.Size(26, 24); - this.zATWIERDZONO_DO_DRUKUCheckBox.TabIndex = 28; + this.zATWIERDZONO_DO_DRUKUCheckBox.Size = new System.Drawing.Size(15, 14); + this.zATWIERDZONO_DO_DRUKUCheckBox.TabIndex = 41; this.zATWIERDZONO_DO_DRUKUCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.zATWIERDZONO_DO_DRUKUCheckBox.UseVisualStyleBackColor = false; @@ -738,8 +745,8 @@ this.cENA_JEDNTextBox.BackColor = System.Drawing.SystemColors.Window; this.cENA_JEDNTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "CENA JEDN", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.cENA_JEDNTextBox.Location = new System.Drawing.Point(91, 17); + this.cENA_JEDNTextBox.Location = new System.Drawing.Point(91, 25); this.cENA_JEDNTextBox.Name = "cENA_JEDNTextBox"; this.cENA_JEDNTextBox.Size = new System.Drawing.Size(142, 20); - this.cENA_JEDNTextBox.TabIndex = 30; + this.cENA_JEDNTextBox.TabIndex = 17; this.cENA_JEDNTextBox.Text = "0"; this.cENA_JEDNTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -750,9 +757,9 @@ this.nETTOTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.nETTOTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "NETTO", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.nETTOTextBox.Location = new System.Drawing.Point(91, 120); + this.nETTOTextBox.Location = new System.Drawing.Point(91, 128); this.nETTOTextBox.Name = "nETTOTextBox"; this.nETTOTextBox.ReadOnly = true; this.nETTOTextBox.Size = new System.Drawing.Size(142, 20); - this.nETTOTextBox.TabIndex = 32; + this.nETTOTextBox.TabIndex = 23; this.nETTOTextBox.Text = "0"; this.nETTOTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -762,9 +769,9 @@ this.vATTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.vATTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "PVAT", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.vATTextBox.Location = new System.Drawing.Point(91, 172); + this.vATTextBox.Location = new System.Drawing.Point(91, 180); this.vATTextBox.Name = "vATTextBox"; this.vATTextBox.ReadOnly = true; this.vATTextBox.Size = new System.Drawing.Size(142, 20); - this.vATTextBox.TabIndex = 34; + this.vATTextBox.TabIndex = 25; this.vATTextBox.Text = "0"; this.vATTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -778,8 +785,8 @@ "22%", "0%"}); - this.pVATComboBox.Location = new System.Drawing.Point(91, 198); + this.pVATComboBox.Location = new System.Drawing.Point(91, 206); this.pVATComboBox.Name = "pVATComboBox"; this.pVATComboBox.Size = new System.Drawing.Size(142, 21); - this.pVATComboBox.TabIndex = 36; + this.pVATComboBox.TabIndex = 26; this.pVATComboBox.SelectedIndexChanged += new System.EventHandler(this.pVATComboBox_SelectedIndexChanged); // @@ -788,9 +795,9 @@ this.bRUTTOTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.bRUTTOTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "BRUTTO", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.bRUTTOTextBox.Location = new System.Drawing.Point(91, 146); + this.bRUTTOTextBox.Location = new System.Drawing.Point(91, 154); this.bRUTTOTextBox.Name = "bRUTTOTextBox"; this.bRUTTOTextBox.ReadOnly = true; this.bRUTTOTextBox.Size = new System.Drawing.Size(142, 20); - this.bRUTTOTextBox.TabIndex = 37; + this.bRUTTOTextBox.TabIndex = 24; this.bRUTTOTextBox.Text = "0"; this.bRUTTOTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -800,8 +807,8 @@ this.pROCENT_PROWIZJITextBox.BackColor = System.Drawing.SystemColors.Window; this.pROCENT_PROWIZJITextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "PROCENT PROWIZJI", true)); - this.pROCENT_PROWIZJITextBox.Location = new System.Drawing.Point(91, 225); + this.pROCENT_PROWIZJITextBox.Location = new System.Drawing.Point(91, 233); this.pROCENT_PROWIZJITextBox.Name = "pROCENT_PROWIZJITextBox"; this.pROCENT_PROWIZJITextBox.Size = new System.Drawing.Size(47, 20); - this.pROCENT_PROWIZJITextBox.TabIndex = 38; + this.pROCENT_PROWIZJITextBox.TabIndex = 27; this.pROCENT_PROWIZJITextBox.Text = "0"; this.pROCENT_PROWIZJITextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -812,9 +819,9 @@ this.pROWIZJATextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.pROWIZJATextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "PROWIZJA", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.pROWIZJATextBox.Location = new System.Drawing.Point(144, 225); + this.pROWIZJATextBox.Location = new System.Drawing.Point(144, 233); this.pROWIZJATextBox.Name = "pROWIZJATextBox"; this.pROWIZJATextBox.ReadOnly = true; this.pROWIZJATextBox.Size = new System.Drawing.Size(89, 20); - this.pROWIZJATextBox.TabIndex = 40; + this.pROWIZJATextBox.TabIndex = 28; this.pROWIZJATextBox.Text = "0"; this.pROWIZJATextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -828,5 +835,5 @@ this.iNFOTextBox.Name = "iNFOTextBox"; this.iNFOTextBox.Size = new System.Drawing.Size(240, 252); - this.iNFOTextBox.TabIndex = 42; + this.iNFOTextBox.TabIndex = 52; // // pROMOCJEBindingSource @@ -857,13 +864,14 @@ this.kier_notatkaTextBox.Name = "kier_notatkaTextBox"; this.kier_notatkaTextBox.Size = new System.Drawing.Size(240, 104); - this.kier_notatkaTextBox.TabIndex = 48; + this.kier_notatkaTextBox.TabIndex = 54; // // kier_zatwierdzilCheckBox // + this.kier_zatwierdzilCheckBox.AutoSize = true; this.kier_zatwierdzilCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "kier_zatwierdzil", true)); - this.kier_zatwierdzilCheckBox.Location = new System.Drawing.Point(9, 398); + this.kier_zatwierdzilCheckBox.Location = new System.Drawing.Point(9, 404); this.kier_zatwierdzilCheckBox.Name = "kier_zatwierdzilCheckBox"; - this.kier_zatwierdzilCheckBox.Size = new System.Drawing.Size(20, 19); - this.kier_zatwierdzilCheckBox.TabIndex = 50; + this.kier_zatwierdzilCheckBox.Size = new System.Drawing.Size(15, 14); + this.kier_zatwierdzilCheckBox.TabIndex = 53; // // zam_notatkaTextBox @@ -876,13 +884,14 @@ this.zam_notatkaTextBox.Name = "zam_notatkaTextBox"; this.zam_notatkaTextBox.Size = new System.Drawing.Size(240, 105); - this.zam_notatkaTextBox.TabIndex = 52; + this.zam_notatkaTextBox.TabIndex = 51; // // zablokuj_prowizjeCheckBox // + this.zablokuj_prowizjeCheckBox.AutoSize = true; this.zablokuj_prowizjeCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "zablokuj_prowizje", true)); - this.zablokuj_prowizjeCheckBox.Location = new System.Drawing.Point(216, 246); + this.zablokuj_prowizjeCheckBox.Location = new System.Drawing.Point(218, 258); this.zablokuj_prowizjeCheckBox.Name = "zablokuj_prowizjeCheckBox"; - this.zablokuj_prowizjeCheckBox.Size = new System.Drawing.Size(18, 24); - this.zablokuj_prowizjeCheckBox.TabIndex = 54; + this.zablokuj_prowizjeCheckBox.Size = new System.Drawing.Size(15, 14); + this.zablokuj_prowizjeCheckBox.TabIndex = 29; this.zablokuj_prowizjeCheckBox.CheckedChanged += new System.EventHandler(this.zablokuj_prowizjeCheckBox_CheckedChanged); // @@ -894,12 +903,12 @@ this.ukazeSieDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.ukazeSieDataGridView.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.ukazeSieDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.ukazeSieDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.ukazeSieDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ukazeSieDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -915,5 +924,5 @@ this.ukazeSieDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.ukazeSieDataGridView.Size = new System.Drawing.Size(204, 556); - this.ukazeSieDataGridView.TabIndex = 16; + this.ukazeSieDataGridView.TabIndex = 46; this.ukazeSieDataGridView.Leave += new System.EventHandler(this.ukazeSieDataGridView_Leave); this.ukazeSieDataGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.ukazeSieDataGridView_CellContextMenuStripNeeded); @@ -926,6 +935,6 @@ // this.nrWydaniaDataGridViewTextBoxColumn.DataPropertyName = "Nr Wydania"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; this.nrWydaniaDataGridViewTextBoxColumn.FillWeight = 149.2386F; this.nrWydaniaDataGridViewTextBoxColumn.HeaderText = "Nr wyd."; @@ -948,7 +957,7 @@ this.netto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.netto.DataPropertyName = "netto"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle3.Format = "C"; - this.netto.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "C"; + this.netto.DefaultCellStyle = dataGridViewCellStyle9; this.netto.HeaderText = "Wartoœæ"; this.netto.Name = "netto"; @@ -974,8 +983,8 @@ "SPOT", "FULL"}); - this.kOLORComboBox.Location = new System.Drawing.Point(7, 115); + this.kOLORComboBox.Location = new System.Drawing.Point(6, 66); this.kOLORComboBox.Name = "kOLORComboBox"; - this.kOLORComboBox.Size = new System.Drawing.Size(123, 21); - this.kOLORComboBox.TabIndex = 14; + this.kOLORComboBox.Size = new System.Drawing.Size(124, 21); + this.kOLORComboBox.TabIndex = 8; // // mOD_TYPComboBox @@ -985,7 +994,7 @@ this.mOD_TYPComboBox.DataSource = this.nAZWYMODULOWBindingSource; this.mOD_TYPComboBox.DisplayMember = "MOD_TYP"; - this.mOD_TYPComboBox.Location = new System.Drawing.Point(144, 31); + this.mOD_TYPComboBox.Location = new System.Drawing.Point(286, 26); this.mOD_TYPComboBox.Name = "mOD_TYPComboBox"; - this.mOD_TYPComboBox.Size = new System.Drawing.Size(121, 21); + this.mOD_TYPComboBox.Size = new System.Drawing.Size(124, 21); this.mOD_TYPComboBox.TabIndex = 7; this.mOD_TYPComboBox.ValueMember = "MOD_TYP"; @@ -1002,7 +1011,7 @@ // groupBox1 // + this.groupBox1.Controls.Add(label1); this.groupBox1.Controls.Add(this.sYMBOL_AKWIZYTORAComboBox); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(sYMBOL_AKWIZYTORALabel); this.groupBox1.Controls.Add(iD_REKLAMYLabel); @@ -1014,8 +1023,8 @@ this.groupBox1.Controls.Add(tYPLabel); this.groupBox1.Controls.Add(this.tYPComboBox); - this.groupBox1.Location = new System.Drawing.Point(12, 2); + this.groupBox1.Location = new System.Drawing.Point(5, 2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(414, 139); - this.groupBox1.TabIndex = 58; + this.groupBox1.Size = new System.Drawing.Size(424, 139); + this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; // @@ -1027,8 +1036,8 @@ this.sYMBOL_AKWIZYTORAComboBox.DisplayMember = "Symbol"; this.sYMBOL_AKWIZYTORAComboBox.FormattingEnabled = true; - this.sYMBOL_AKWIZYTORAComboBox.Location = new System.Drawing.Point(9, 30); + this.sYMBOL_AKWIZYTORAComboBox.Location = new System.Drawing.Point(6, 26); this.sYMBOL_AKWIZYTORAComboBox.Name = "sYMBOL_AKWIZYTORAComboBox"; this.sYMBOL_AKWIZYTORAComboBox.Size = new System.Drawing.Size(128, 21); - this.sYMBOL_AKWIZYTORAComboBox.TabIndex = 15; + this.sYMBOL_AKWIZYTORAComboBox.TabIndex = 0; this.sYMBOL_AKWIZYTORAComboBox.ValueMember = "Symbol"; // @@ -1042,31 +1051,25 @@ this.label2.AutoSize = true; this.label2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "ReklamaID", true)); - this.label2.Location = new System.Drawing.Point(152, 117); + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label2.Location = new System.Drawing.Point(288, 29); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.Size = new System.Drawing.Size(47, 15); this.label2.TabIndex = 14; this.label2.Text = "label2"; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(321, 14); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(46, 13); - this.label1.TabIndex = 13; - this.label1.Text = "Agencja"; - // // groupBox2 // - this.groupBox2.Controls.Add(this.button3); + this.groupBox2.Controls.Add(this.cbLocation); + this.groupBox2.Controls.Add(this.label9); this.groupBox2.Controls.Add(ogl_rozdzialLabel); this.groupBox2.Controls.Add(this.ogl_rozdzialComboBox); this.groupBox2.Controls.Add(ogl_dzialLabel); this.groupBox2.Controls.Add(this.ogl_dzialComboBox); + this.groupBox2.Controls.Add(this.promocjaComboBox); this.groupBox2.Controls.Add(this.grzbietComboBox); - this.groupBox2.Controls.Add(this.promocjaComboBox); this.groupBox2.Controls.Add(sTRONALabel); + this.groupBox2.Controls.Add(pROMOCJALabel); + this.groupBox2.Controls.Add(tYTULLabel); this.groupBox2.Controls.Add(this.sTRONATextBox); - this.groupBox2.Controls.Add(tYTULLabel); this.groupBox2.Controls.Add(this.tYTULComboBox); this.groupBox2.Controls.Add(mOD_TYPLabel); @@ -1075,22 +1078,17 @@ this.groupBox2.Controls.Add(kOLORLabel); this.groupBox2.Controls.Add(this.kOLORComboBox); - this.groupBox2.Controls.Add(pROMOCJALabel); this.groupBox2.Controls.Add(sZERLabel); this.groupBox2.Controls.Add(this.sZERTextBox); this.groupBox2.Controls.Add(wYSLabel); this.groupBox2.Controls.Add(this.wYSTextBox); - this.groupBox2.Controls.Add(this.kROTNOSCTextBox); - this.groupBox2.Controls.Add(kROTNOSCLabel); - this.groupBox2.Controls.Add(this.oDSTEPTextBox); - this.groupBox2.Controls.Add(oDSTÊPLabel); - this.groupBox2.Location = new System.Drawing.Point(11, 143); + this.groupBox2.Location = new System.Drawing.Point(5, 143); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(415, 180); - this.groupBox2.TabIndex = 59; + this.groupBox2.Size = new System.Drawing.Size(424, 180); + this.groupBox2.TabIndex = 4; this.groupBox2.TabStop = false; // // button3 // - this.button3.Location = new System.Drawing.Point(325, 153); + this.button3.Location = new System.Drawing.Point(792, 576); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(68, 23); @@ -1098,4 +1096,5 @@ this.button3.Text = "Dowolny"; this.button3.UseVisualStyleBackColor = true; + this.button3.Visible = false; this.button3.Click += new System.EventHandler(this.button3_Click); // @@ -1106,8 +1105,8 @@ this.ogl_rozdzialComboBox.DisplayMember = "ROZDZIA£_TXT"; this.ogl_rozdzialComboBox.FormattingEnabled = true; - this.ogl_rozdzialComboBox.Location = new System.Drawing.Point(144, 155); + this.ogl_rozdzialComboBox.Location = new System.Drawing.Point(146, 106); this.ogl_rozdzialComboBox.Name = "ogl_rozdzialComboBox"; - this.ogl_rozdzialComboBox.Size = new System.Drawing.Size(168, 21); - this.ogl_rozdzialComboBox.TabIndex = 59; + this.ogl_rozdzialComboBox.Size = new System.Drawing.Size(124, 21); + this.ogl_rozdzialComboBox.TabIndex = 13; this.ogl_rozdzialComboBox.ValueMember = "id"; // @@ -1123,8 +1122,8 @@ this.ogl_dzialComboBox.DisplayMember = "DZIA£_TXT"; this.ogl_dzialComboBox.FormattingEnabled = true; - this.ogl_dzialComboBox.Location = new System.Drawing.Point(7, 155); + this.ogl_dzialComboBox.Location = new System.Drawing.Point(6, 106); this.ogl_dzialComboBox.Name = "ogl_dzialComboBox"; this.ogl_dzialComboBox.Size = new System.Drawing.Size(124, 21); - this.ogl_dzialComboBox.TabIndex = 58; + this.ogl_dzialComboBox.TabIndex = 12; this.ogl_dzialComboBox.ValueMember = "DZIA£_NR"; this.ogl_dzialComboBox.SelectedValueChanged += new System.EventHandler(this.ogl_dzialComboBox_SelectedValueChanged); @@ -1142,8 +1141,8 @@ this.grzbietComboBox.DisplayMember = "Nazwa"; this.grzbietComboBox.FormattingEnabled = true; - this.grzbietComboBox.Location = new System.Drawing.Point(7, 75); + this.grzbietComboBox.Location = new System.Drawing.Point(146, 26); this.grzbietComboBox.Name = "grzbietComboBox"; this.grzbietComboBox.Size = new System.Drawing.Size(124, 21); - this.grzbietComboBox.TabIndex = 9; + this.grzbietComboBox.TabIndex = 6; this.grzbietComboBox.ValueMember = "ID"; this.grzbietComboBox.SelectedIndexChanged += new System.EventHandler(this.grzbietComboBox_SelectedIndexChanged); @@ -1154,8 +1153,8 @@ this.promocjaComboBox.DataSource = this.pROMOCJEBindingSource; this.promocjaComboBox.DisplayMember = "Nazwa"; - this.promocjaComboBox.Location = new System.Drawing.Point(283, 31); + this.promocjaComboBox.Location = new System.Drawing.Point(286, 106); this.promocjaComboBox.Name = "promocjaComboBox"; - this.promocjaComboBox.Size = new System.Drawing.Size(101, 21); - this.promocjaComboBox.TabIndex = 8; + this.promocjaComboBox.Size = new System.Drawing.Size(124, 21); + this.promocjaComboBox.TabIndex = 14; this.promocjaComboBox.ValueMember = "id"; this.promocjaComboBox.TextChanged += new System.EventHandler(this.promocjaComboBox_TextChanged); @@ -1165,8 +1164,8 @@ this.sTRONATextBox.BackColor = System.Drawing.SystemColors.Window; this.sTRONATextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "STRONA", true)); - this.sTRONATextBox.Location = new System.Drawing.Point(144, 115); + this.sTRONATextBox.Location = new System.Drawing.Point(6, 146); this.sTRONATextBox.MaxLength = 25; this.sTRONATextBox.Name = "sTRONATextBox"; - this.sTRONATextBox.Size = new System.Drawing.Size(253, 20); + this.sTRONATextBox.Size = new System.Drawing.Size(404, 20); this.sTRONATextBox.TabIndex = 15; // @@ -1198,8 +1197,8 @@ this.groupBox3.Controls.Add(this.pROCENT_PROWIZJITextBox); this.groupBox3.Controls.Add(this.pROWIZJATextBox); - this.groupBox3.Location = new System.Drawing.Point(11, 324); + this.groupBox3.Location = new System.Drawing.Point(5, 324); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(244, 303); - this.groupBox3.TabIndex = 60; + this.groupBox3.TabIndex = 16; this.groupBox3.TabStop = false; // @@ -1207,5 +1206,5 @@ // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(5, 72); + this.label8.Location = new System.Drawing.Point(5, 81); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(85, 13); @@ -1216,9 +1215,9 @@ // this.nettoBezBOTextBox.BackColor = System.Drawing.Color.WhiteSmoke; - this.nettoBezBOTextBox.Location = new System.Drawing.Point(91, 69); + this.nettoBezBOTextBox.Location = new System.Drawing.Point(91, 77); this.nettoBezBOTextBox.Name = "nettoBezBOTextBox"; this.nettoBezBOTextBox.ReadOnly = true; this.nettoBezBOTextBox.Size = new System.Drawing.Size(142, 20); - this.nettoBezBOTextBox.TabIndex = 78; + this.nettoBezBOTextBox.TabIndex = 20; this.nettoBezBOTextBox.Text = "0"; this.nettoBezBOTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -1228,9 +1227,9 @@ this.wyroznienie_kwotaTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.wyroznienie_kwotaTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "wyroznienie_kwota", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "C2")); - this.wyroznienie_kwotaTextBox.Location = new System.Drawing.Point(144, 94); + this.wyroznienie_kwotaTextBox.Location = new System.Drawing.Point(144, 102); this.wyroznienie_kwotaTextBox.Name = "wyroznienie_kwotaTextBox"; this.wyroznienie_kwotaTextBox.ReadOnly = true; this.wyroznienie_kwotaTextBox.Size = new System.Drawing.Size(89, 20); - this.wyroznienie_kwotaTextBox.TabIndex = 77; + this.wyroznienie_kwotaTextBox.TabIndex = 22; this.wyroznienie_kwotaTextBox.Text = "0"; this.wyroznienie_kwotaTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -1239,5 +1238,5 @@ // this.cenaModuluLabel.AutoSize = true; - this.cenaModuluLabel.Location = new System.Drawing.Point(6, 274); + this.cenaModuluLabel.Location = new System.Drawing.Point(6, 282); this.cenaModuluLabel.Name = "cenaModuluLabel"; this.cenaModuluLabel.Size = new System.Drawing.Size(16, 13); @@ -1248,5 +1247,5 @@ // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(5, 257); + this.label3.Location = new System.Drawing.Point(5, 265); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 13); @@ -1258,9 +1257,9 @@ this.wyroznienie_procentTextBox.BackColor = System.Drawing.Color.WhiteSmoke; this.wyroznienie_procentTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "wyroznienie_procent", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "P")); - this.wyroznienie_procentTextBox.Location = new System.Drawing.Point(91, 94); + this.wyroznienie_procentTextBox.Location = new System.Drawing.Point(91, 102); this.wyroznienie_procentTextBox.Name = "wyroznienie_procentTextBox"; this.wyroznienie_procentTextBox.ReadOnly = true; this.wyroznienie_procentTextBox.Size = new System.Drawing.Size(47, 20); - this.wyroznienie_procentTextBox.TabIndex = 76; + this.wyroznienie_procentTextBox.TabIndex = 21; this.wyroznienie_procentTextBox.Text = "0"; this.wyroznienie_procentTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -1268,5 +1267,5 @@ // cenaEmisjiButton // - this.cenaEmisjiButton.Location = new System.Drawing.Point(548, 604); + this.cenaEmisjiButton.Location = new System.Drawing.Point(645, 571); this.cenaEmisjiButton.Name = "cenaEmisjiButton"; this.cenaEmisjiButton.Size = new System.Drawing.Size(75, 23); @@ -1274,4 +1273,5 @@ this.cenaEmisjiButton.Text = "Cena em."; this.cenaEmisjiButton.UseVisualStyleBackColor = true; + this.cenaEmisjiButton.Visible = false; this.cenaEmisjiButton.Click += new System.EventHandler(this.cenaEmisjiButton_Click); // @@ -1280,8 +1280,8 @@ this.brutto_EuroTextBox.BackColor = System.Drawing.SystemColors.Window; this.brutto_EuroTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "Brutto_Euro", true)); - this.brutto_EuroTextBox.Location = new System.Drawing.Point(29, 65); + this.brutto_EuroTextBox.Location = new System.Drawing.Point(6, 25); this.brutto_EuroTextBox.Name = "brutto_EuroTextBox"; this.brutto_EuroTextBox.Size = new System.Drawing.Size(111, 20); - this.brutto_EuroTextBox.TabIndex = 62; + this.brutto_EuroTextBox.TabIndex = 6231; this.brutto_EuroTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.brutto_EuroTextBox.Leave += new System.EventHandler(this.brutto_EuroTextBox_Leave); @@ -1296,8 +1296,8 @@ "USD", "GBP"}); - this.walutyComboBox.Location = new System.Drawing.Point(29, 16); + this.walutyComboBox.Location = new System.Drawing.Point(6, 50); this.walutyComboBox.Name = "walutyComboBox"; this.walutyComboBox.Size = new System.Drawing.Size(111, 21); - this.walutyComboBox.TabIndex = 59; + this.walutyComboBox.TabIndex = 32; this.walutyComboBox.SelectedIndexChanged += new System.EventHandler(this.walutyComboBox_SelectedIndexChanged); // @@ -1308,5 +1308,5 @@ this.dodajButton.Name = "dodajButton"; this.dodajButton.Size = new System.Drawing.Size(76, 36); - this.dodajButton.TabIndex = 61; + this.dodajButton.TabIndex = 60; this.dodajButton.Text = "Zapisz"; this.dodajButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1320,5 +1320,5 @@ this.anulujButton.Name = "anulujButton"; this.anulujButton.Size = new System.Drawing.Size(74, 36); - this.anulujButton.TabIndex = 62; + this.anulujButton.TabIndex = 61; this.anulujButton.Text = "Anuluj"; this.anulujButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1338,18 +1338,20 @@ // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(432, 581); + this.label4.Location = new System.Drawing.Point(435, 599); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 13); this.label4.TabIndex = 67; this.label4.Text = "Liczba emisji:"; + this.label4.Visible = false; // // liczbaEmisjiLabel // this.liczbaEmisjiLabel.AutoSize = true; - this.liczbaEmisjiLabel.Location = new System.Drawing.Point(507, 581); + this.liczbaEmisjiLabel.Location = new System.Drawing.Point(510, 599); this.liczbaEmisjiLabel.Name = "liczbaEmisjiLabel"; this.liczbaEmisjiLabel.Size = new System.Drawing.Size(10, 13); this.liczbaEmisjiLabel.TabIndex = 68; this.liczbaEmisjiLabel.Text = "-"; + this.liczbaEmisjiLabel.Visible = false; // // kursy_WalutTableAdapter @@ -1374,6 +1376,6 @@ this.groupBox4.Location = new System.Drawing.Point(262, 325); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(164, 247); - this.groupBox4.TabIndex = 66; + this.groupBox4.Size = new System.Drawing.Size(167, 247); + this.groupBox4.TabIndex = 30; this.groupBox4.TabStop = false; // @@ -1381,9 +1383,9 @@ // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(7, 173); + this.label5.Location = new System.Drawing.Point(7, 178); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(62, 13); + this.label5.Size = new System.Drawing.Size(56, 13); this.label5.TabIndex = 74; - this.label5.Text = "KURS NBP"; + this.label5.Text = "Kurs NBP:"; // // brutto_Euro_MianoTextBox @@ -1391,9 +1393,9 @@ this.brutto_Euro_MianoTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.brutto_Euro_MianoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "Brutto_Euro_Miano", true)); - this.brutto_Euro_MianoTextBox.Location = new System.Drawing.Point(98, 193); + this.brutto_Euro_MianoTextBox.Location = new System.Drawing.Point(91, 193); this.brutto_Euro_MianoTextBox.Name = "brutto_Euro_MianoTextBox"; this.brutto_Euro_MianoTextBox.ReadOnly = true; this.brutto_Euro_MianoTextBox.Size = new System.Drawing.Size(60, 20); - this.brutto_Euro_MianoTextBox.TabIndex = 73; + this.brutto_Euro_MianoTextBox.TabIndex = 34; // // waluta_kursTextBox @@ -1401,9 +1403,9 @@ this.waluta_kursTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.waluta_kursTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "waluta_kurs", true)); - this.waluta_kursTextBox.Location = new System.Drawing.Point(48, 220); + this.waluta_kursTextBox.Location = new System.Drawing.Point(41, 220); this.waluta_kursTextBox.Name = "waluta_kursTextBox"; this.waluta_kursTextBox.ReadOnly = true; this.waluta_kursTextBox.Size = new System.Drawing.Size(110, 20); - this.waluta_kursTextBox.TabIndex = 71; + this.waluta_kursTextBox.TabIndex = 36; // // waluta_PrzelicznikTextBox @@ -1411,9 +1413,9 @@ this.waluta_PrzelicznikTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.waluta_PrzelicznikTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "waluta_Przelicznik", true)); - this.waluta_PrzelicznikTextBox.Location = new System.Drawing.Point(9, 220); + this.waluta_PrzelicznikTextBox.Location = new System.Drawing.Point(6, 220); this.waluta_PrzelicznikTextBox.Name = "waluta_PrzelicznikTextBox"; this.waluta_PrzelicznikTextBox.ReadOnly = true; this.waluta_PrzelicznikTextBox.Size = new System.Drawing.Size(29, 20); - this.waluta_PrzelicznikTextBox.TabIndex = 70; + this.waluta_PrzelicznikTextBox.TabIndex = 35; // // waluta_kurs_z_dniaTextBox @@ -1421,38 +1423,40 @@ this.waluta_kurs_z_dniaTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.waluta_kurs_z_dniaTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "waluta_kurs_z_dnia", true)); - this.waluta_kurs_z_dniaTextBox.Location = new System.Drawing.Point(9, 193); + this.waluta_kurs_z_dniaTextBox.Location = new System.Drawing.Point(6, 193); this.waluta_kurs_z_dniaTextBox.Name = "waluta_kurs_z_dniaTextBox"; this.waluta_kurs_z_dniaTextBox.ReadOnly = true; this.waluta_kurs_z_dniaTextBox.Size = new System.Drawing.Size(79, 20); - this.waluta_kurs_z_dniaTextBox.TabIndex = 72; + this.waluta_kurs_z_dniaTextBox.TabIndex = 33; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(29, 45); + this.label6.Location = new System.Drawing.Point(6, 10); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(72, 13); + this.label6.Size = new System.Drawing.Size(130, 13); this.label6.TabIndex = 69; - this.label6.Text = "Brutto waluta:"; + this.label6.Text = "Wartoœæ brutto w walucie:"; // // fAKTURA_WYSTAWIONOCheckBox // + this.fAKTURA_WYSTAWIONOCheckBox.AutoSize = true; this.fAKTURA_WYSTAWIONOCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "FAKTURA WYSTAWIONO", true)); this.fAKTURA_WYSTAWIONOCheckBox.Enabled = false; this.fAKTURA_WYSTAWIONOCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.fAKTURA_WYSTAWIONOCheckBox.Location = new System.Drawing.Point(415, 633); + this.fAKTURA_WYSTAWIONOCheckBox.Location = new System.Drawing.Point(316, 637); this.fAKTURA_WYSTAWIONOCheckBox.Name = "fAKTURA_WYSTAWIONOCheckBox"; - this.fAKTURA_WYSTAWIONOCheckBox.Size = new System.Drawing.Size(20, 24); - this.fAKTURA_WYSTAWIONOCheckBox.TabIndex = 71; + this.fAKTURA_WYSTAWIONOCheckBox.Size = new System.Drawing.Size(15, 14); + this.fAKTURA_WYSTAWIONOCheckBox.TabIndex = 43; // // zAP£ACONOCheckBox // + this.zAP£ACONOCheckBox.AutoSize = true; this.zAP£ACONOCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "ZAP£ACONO", true)); this.zAP£ACONOCheckBox.Enabled = false; this.zAP£ACONOCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.zAP£ACONOCheckBox.Location = new System.Drawing.Point(533, 633); + this.zAP£ACONOCheckBox.Location = new System.Drawing.Point(412, 637); this.zAP£ACONOCheckBox.Name = "zAP£ACONOCheckBox"; - this.zAP£ACONOCheckBox.Size = new System.Drawing.Size(16, 24); - this.zAP£ACONOCheckBox.TabIndex = 72; + this.zAP£ACONOCheckBox.Size = new System.Drawing.Size(15, 14); + this.zAP£ACONOCheckBox.TabIndex = 44; // // tabControl1 @@ -1465,5 +1469,5 @@ this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(263, 556); - this.tabControl1.TabIndex = 73; + this.tabControl1.TabIndex = 50; // // notatkiTabPage @@ -1515,5 +1519,5 @@ this.ukazaloSieDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.ukazaloSieDataGridView.Size = new System.Drawing.Size(141, 524); - this.ukazaloSieDataGridView.TabIndex = 65; + this.ukazaloSieDataGridView.TabIndex = 55; this.ukazaloSieDataGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.ukazaloSieDataGridView_CellContextMenuStripNeeded); this.ukazaloSieDataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.ukazaloSieDataGridView_CellEndEdit); @@ -1570,5 +1574,5 @@ this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dataGridView1.Size = new System.Drawing.Size(249, 524); - this.dataGridView1.TabIndex = 1; + this.dataGridView1.TabIndex = 56; this.dataGridView1.Leave += new System.EventHandler(this.dataGridView1_Leave); this.dataGridView1.RowLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_RowLeave); @@ -1619,8 +1623,8 @@ this.ZDpanel.Controls.Add(zATWIERDZONO_DO_DRUKULabel); this.ZDpanel.Controls.Add(this.zATWIERDZONO_DO_DRUKUCheckBox); - this.ZDpanel.Location = new System.Drawing.Point(11, 633); + this.ZDpanel.Location = new System.Drawing.Point(5, 633); this.ZDpanel.Name = "ZDpanel"; - this.ZDpanel.Size = new System.Drawing.Size(195, 24); - this.ZDpanel.TabIndex = 74; + this.ZDpanel.Size = new System.Drawing.Size(150, 24); + this.ZDpanel.TabIndex = 40; // // groupBox5 @@ -1628,26 +1632,28 @@ this.groupBox5.Controls.Add(this.wyroznienieCheckBox); this.groupBox5.Controls.Add(wyroznienieLabel); - this.groupBox5.Location = new System.Drawing.Point(263, 578); + this.groupBox5.Location = new System.Drawing.Point(262, 578); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(163, 49); - this.groupBox5.TabIndex = 75; + this.groupBox5.Size = new System.Drawing.Size(167, 49); + this.groupBox5.TabIndex = 37; this.groupBox5.TabStop = false; // // wyroznienieCheckBox // + this.wyroznienieCheckBox.AutoSize = true; this.wyroznienieCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "wyroznienie", true)); - this.wyroznienieCheckBox.Location = new System.Drawing.Point(122, 15); + this.wyroznienieCheckBox.Location = new System.Drawing.Point(122, 19); this.wyroznienieCheckBox.Name = "wyroznienieCheckBox"; - this.wyroznienieCheckBox.Size = new System.Drawing.Size(21, 24); - this.wyroznienieCheckBox.TabIndex = 76; + this.wyroznienieCheckBox.Size = new System.Drawing.Size(15, 14); + this.wyroznienieCheckBox.TabIndex = 38; this.wyroznienieCheckBox.Click += new System.EventHandler(this.wyroznienieCheckBox_Click); // // wyroznienie_exportedCheckBox // + this.wyroznienie_exportedCheckBox.AutoSize = true; this.wyroznienie_exportedCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.rEKLAMABindingSource, "wyroznienie_exported", true)); - this.wyroznienie_exportedCheckBox.Location = new System.Drawing.Point(689, 633); + this.wyroznienie_exportedCheckBox.Location = new System.Drawing.Point(565, 637); this.wyroznienie_exportedCheckBox.Name = "wyroznienie_exportedCheckBox"; - this.wyroznienie_exportedCheckBox.Size = new System.Drawing.Size(18, 24); - this.wyroznienie_exportedCheckBox.TabIndex = 76; + this.wyroznienie_exportedCheckBox.Size = new System.Drawing.Size(15, 14); + this.wyroznienie_exportedCheckBox.TabIndex = 45; // // ogl_dzialyTableAdapter @@ -1662,8 +1668,8 @@ // this.EmailButton.Image = ((System.Drawing.Image)(resources.GetObject("EmailButton.Image"))); - this.EmailButton.Location = new System.Drawing.Point(213, 633); + this.EmailButton.Location = new System.Drawing.Point(211, 633); this.EmailButton.Name = "EmailButton"; this.EmailButton.Size = new System.Drawing.Size(38, 30); - this.EmailButton.TabIndex = 77; + this.EmailButton.TabIndex = 42; this.EmailButton.UseVisualStyleBackColor = true; this.EmailButton.Click += new System.EventHandler(this.EmailButton_Click); @@ -1671,8 +1677,8 @@ // kalendarzButton // - this.kalendarzButton.Location = new System.Drawing.Point(548, 576); + this.kalendarzButton.Location = new System.Drawing.Point(564, 571); this.kalendarzButton.Name = "kalendarzButton"; this.kalendarzButton.Size = new System.Drawing.Size(75, 23); - this.kalendarzButton.TabIndex = 78; + this.kalendarzButton.TabIndex = 47; this.kalendarzButton.Text = "Kalendarz"; this.kalendarzButton.UseVisualStyleBackColor = true; @@ -1728,4 +1734,41 @@ this.editItem.Click += new System.EventHandler(this.editItem_Click); // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(286, 51); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(63, 13); + this.label9.TabIndex = 60; + this.label9.Text = "Lokalizacja:"; + // + // cbLocation + // + this.cbLocation.FormattingEnabled = true; + this.cbLocation.Items.AddRange(new object[] { + "[proszê wybraæ]", + "prawa-góra", + "prawa-dó³", + "lewa-góra", + "lewa-dól"}); + this.cbLocation.Location = new System.Drawing.Point(286, 66); + this.cbLocation.Name = "cbLocation"; + this.cbLocation.Size = new System.Drawing.Size(124, 21); + this.cbLocation.TabIndex = 11; + this.cbLocation.Validating += new System.ComponentModel.CancelEventHandler(this.cbLocation_Validating); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(288, 11); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(58, 13); + label1.TabIndex = 16; + label1.Text = "Id reklamy:"; + // + // errorProvider + // + this.errorProvider.ContainerControl = this; + // // OrderDetails // @@ -1733,18 +1776,19 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(920, 669); + this.Controls.Add(this.button3); + this.Controls.Add(this.EmailButton); this.Controls.Add(this.cenaEmisjiButton); this.Controls.Add(this.kalendarzButton); - this.Controls.Add(this.EmailButton); - this.Controls.Add(wyroznienie_exportedLabel); - this.Controls.Add(this.wyroznienie_exportedCheckBox); this.Controls.Add(this.ZDpanel); this.Controls.Add(this.groupBox5); + this.Controls.Add(this.tabControl1); + this.Controls.Add(wyroznienie_exportedLabel); this.Controls.Add(zAP£ACONOLabel); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.zAP£ACONOCheckBox); + this.Controls.Add(this.wyroznienie_exportedCheckBox); this.Controls.Add(fAKTURA_WYSTAWIONOLabel); - this.Controls.Add(this.fAKTURA_WYSTAWIONOCheckBox); this.Controls.Add(this.liczbaEmisjiLabel); this.Controls.Add(this.groupBox4); + this.Controls.Add(this.fAKTURA_WYSTAWIONOCheckBox); + this.Controls.Add(this.zAP£ACONOCheckBox); this.Controls.Add(this.label4); this.Controls.Add(this.anulujButton); @@ -1754,4 +1798,8 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.ukazeSieDataGridView); + this.Controls.Add(this.oDSTEPTextBox); + this.Controls.Add(oDSTÊPLabel); + this.Controls.Add(this.kROTNOSCTextBox); + this.Controls.Add(kROTNOSCLabel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; @@ -1800,4 +1848,5 @@ this.emisjeContextMenuStrip.ResumeLayout(false); this.advertSiteContext.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1858,5 +1907,4 @@ private System.Windows.Forms.BindingSource rEKLAMAREKLAMASTRONABindingSource; private Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMA_STRONATableAdapter rEKLAMA_STRONATableAdapter; - private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox grzbietComboBox; @@ -1924,4 +1972,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn NR_WYDANIA; private System.Windows.Forms.DataGridViewTextBoxColumn sTRONADataGridViewTextBoxColumn; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.ComboBox cbLocation; + private System.Windows.Forms.ErrorProvider errorProvider; Index: /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx =================================================================== --- /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx (revision 337) +++ /branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx (revision 570) @@ -230,20 +230,29 @@ - 409, 91 + 195, 91 + + + 195, 91 804, 54 + + 804, 54 + - 17, 128 + 953, 91 17, 54 + + 17, 54 + - 218, 128 + 17, 128 - 231, 91 + 17, 91 @@ -251,8 +260,8 @@ - 993, 91 + 779, 91 - 609, 91 + 395, 91 @@ -266,20 +275,35 @@ - 644, 128 + 443, 128 - 17, 91 + 1114, 54 + + + 1114, 54 - 777, 91 + 563, 91 + + + False - 267, 165 + 1113, 128 + + + 1113, 128 - 922, 165 + 511, 165 + + + 511, 165 - 584, 165 + 173, 165 + + + 173, 165 @@ -346,23 +370,29 @@ - 460, 128 + 259, 128 True + + True + + 863, 128 + + + 863, 128 + + + 653, 128 + + 17, 165 - - 854, 128 - - - 428, 165 - - 755, 165 + 344, 165 - 17, 202 + 692, 165 @@ -394,6 +424,12 @@ 17, 17 + + False + + + 1133, 17 + - 136 + 155