Index: branches/Emisje/BazaReklam/OrderDetails.Designer.cs =================================================================== --- branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 750) +++ branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 775) @@ -70,7 +70,7 @@ System.Windows.Forms.Label label14; System.Windows.Forms.Label label15; - 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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrderDetails)); this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet(); @@ -109,5 +109,5 @@ this.zafakturowana = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.netto = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.reklamaIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ReklamaId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rEKLAMAUKAZESIEWNRBindingSource = new System.Windows.Forms.BindingSource(this.components); this.uKAZE_SIE_W_NRTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.UKAZE_SIE_W_NRTableAdapter(); @@ -163,13 +163,7 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.ukazaloSieDataGridView = new System.Windows.Forms.DataGridView(); - this.nRWYDANIADataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.NR_WYDANIA = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sTRONADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.dataDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.reklamaInfoDodDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rEKLAMAReklamaInfoDodBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.reklama_Info_DodDataGridView = new System.Windows.Forms.DataGridView(); this.reklama_Info_DodTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.Reklama_Info_DodTableAdapter(); this.aGENCITableAdapter = new Baza_Reklam.SLOWNIKDataSetTableAdapters.AGENCITableAdapter(); @@ -189,4 +183,9 @@ this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); this.btnSaveClose = new System.Windows.Forms.Button(); + this.nRWYDANIADataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.NR_WYDANIA = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.sTRONADataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.reklamaInfoDodDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); sYMBOL_AKWIZYTORALabel = new System.Windows.Forms.Label(); tYTULLabel = new System.Windows.Forms.Label(); @@ -251,5 +250,4 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rEKLAMAReklamaInfoDodBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.reklama_Info_DodDataGridView)).BeginInit(); this.ZDpanel.SuspendLayout(); this.groupBox5.SuspendLayout(); @@ -334,5 +332,5 @@ // kROTNOSCLabel.AutoSize = true; - kROTNOSCLabel.Location = new System.Drawing.Point(435, 575); + kROTNOSCLabel.Location = new System.Drawing.Point(796, 344); kROTNOSCLabel.Name = "kROTNOSCLabel"; kROTNOSCLabel.Size = new System.Drawing.Size(69, 13); @@ -343,5 +341,5 @@ // oDSTÊPLabel.AutoSize = true; - oDSTÊPLabel.Location = new System.Drawing.Point(736, 565); + oDSTÊPLabel.Location = new System.Drawing.Point(836, 650); oDSTÊPLabel.Name = "oDSTÊPLabel"; oDSTÊPLabel.Size = new System.Drawing.Size(23, 13); @@ -452,5 +450,5 @@ // kier_notatkaLabel.AutoSize = true; - kier_notatkaLabel.Location = new System.Drawing.Point(26, 290); + kier_notatkaLabel.Location = new System.Drawing.Point(269, 7); kier_notatkaLabel.Name = "kier_notatkaLabel"; kier_notatkaLabel.Size = new System.Drawing.Size(102, 13); @@ -732,5 +730,5 @@ 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(510, 571); + this.kROTNOSCTextBox.Location = new System.Drawing.Point(868, 340); this.kROTNOSCTextBox.Name = "kROTNOSCTextBox"; this.kROTNOSCTextBox.ReadOnly = true; @@ -743,5 +741,5 @@ 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(730, 581); + this.oDSTEPTextBox.Location = new System.Drawing.Point(865, 649); this.oDSTEPTextBox.Name = "oDSTEPTextBox"; this.oDSTEPTextBox.Size = new System.Drawing.Size(43, 20); @@ -880,5 +878,5 @@ this.iNFOTextBox.Multiline = true; this.iNFOTextBox.Name = "iNFOTextBox"; - this.iNFOTextBox.Size = new System.Drawing.Size(240, 252); + this.iNFOTextBox.Size = new System.Drawing.Size(216, 211); this.iNFOTextBox.TabIndex = 52; // @@ -896,9 +894,9 @@ this.kier_notatkaTextBox.BackColor = System.Drawing.SystemColors.Window; this.kier_notatkaTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "kier_notatka", true)); - this.kier_notatkaTextBox.Location = new System.Drawing.Point(7, 305); + this.kier_notatkaTextBox.Location = new System.Drawing.Point(242, 23); this.kier_notatkaTextBox.MaxLength = 200; this.kier_notatkaTextBox.Multiline = true; this.kier_notatkaTextBox.Name = "kier_notatkaTextBox"; - this.kier_notatkaTextBox.Size = new System.Drawing.Size(240, 215); + this.kier_notatkaTextBox.Size = new System.Drawing.Size(216, 211); this.kier_notatkaTextBox.TabIndex = 54; // @@ -907,5 +905,5 @@ 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(7, 289); + this.kier_zatwierdzilCheckBox.Location = new System.Drawing.Point(242, 7); this.kier_zatwierdzilCheckBox.Name = "kier_zatwierdzilCheckBox"; this.kier_zatwierdzilCheckBox.Size = new System.Drawing.Size(15, 14); @@ -929,12 +927,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; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.ukazeSieDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; this.ukazeSieDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ukazeSieDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -942,5 +940,5 @@ this.zafakturowana, this.netto, - this.reklamaIdColumn}); + this.ReklamaId}); this.ukazeSieDataGridView.DataSource = this.rEKLAMAUKAZESIEWNRBindingSource; this.ukazeSieDataGridView.Location = new System.Drawing.Point(435, 9); @@ -950,5 +948,5 @@ this.ukazeSieDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.ukazeSieDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ukazeSieDataGridView.Size = new System.Drawing.Size(204, 556); + this.ukazeSieDataGridView.Size = new System.Drawing.Size(469, 329); this.ukazeSieDataGridView.TabIndex = 46; this.ukazeSieDataGridView.Leave += new System.EventHandler(this.ukazeSieDataGridView_Leave); @@ -961,6 +959,6 @@ // this.nrWydaniaDataGridViewTextBoxColumn.DataPropertyName = "Nr Wydania"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14; this.nrWydaniaDataGridViewTextBoxColumn.FillWeight = 149.2386F; this.nrWydaniaDataGridViewTextBoxColumn.HeaderText = "Nr wyd."; @@ -983,7 +981,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; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle15.Format = "C"; + this.netto.DefaultCellStyle = dataGridViewCellStyle15; this.netto.HeaderText = "Wartoœæ"; this.netto.Name = "netto"; @@ -991,12 +989,12 @@ this.netto.Width = 70; // - // reklamaIdColumn - // - this.reklamaIdColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.reklamaIdColumn.DataPropertyName = "ReklamaId"; - this.reklamaIdColumn.HeaderText = "ReklamaId"; - this.reklamaIdColumn.Name = "ReklamaId"; - this.reklamaIdColumn.ReadOnly = true; - this.reklamaIdColumn.Visible = false; + // ReklamaId + // + this.ReklamaId.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.ReklamaId.DataPropertyName = "ReklamaId"; + this.ReklamaId.HeaderText = "ReklamaId"; + this.ReklamaId.Name = "ReklamaId"; + this.ReklamaId.ReadOnly = true; + this.ReklamaId.Visible = false; // // rEKLAMAUKAZESIEWNRBindingSource @@ -1248,5 +1246,5 @@ // button3 // - this.button3.Location = new System.Drawing.Point(792, 576); + this.button3.Location = new System.Drawing.Point(652, 649); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(68, 23); @@ -1354,5 +1352,5 @@ // cenaEmisjiButton // - this.cenaEmisjiButton.Location = new System.Drawing.Point(645, 571); + this.cenaEmisjiButton.Location = new System.Drawing.Point(743, 649); this.cenaEmisjiButton.Name = "cenaEmisjiButton"; this.cenaEmisjiButton.Size = new System.Drawing.Size(75, 23); @@ -1392,5 +1390,5 @@ // this.dodajButton.Image = ((System.Drawing.Image)(resources.GetObject("dodajButton.Image"))); - this.dodajButton.Location = new System.Drawing.Point(743, 607); + this.dodajButton.Location = new System.Drawing.Point(743, 622); this.dodajButton.Name = "dodajButton"; this.dodajButton.Size = new System.Drawing.Size(76, 36); @@ -1404,5 +1402,5 @@ // this.anulujButton.Image = ((System.Drawing.Image)(resources.GetObject("anulujButton.Image"))); - this.anulujButton.Location = new System.Drawing.Point(652, 607); + this.anulujButton.Location = new System.Drawing.Point(652, 622); this.anulujButton.Name = "anulujButton"; this.anulujButton.Size = new System.Drawing.Size(74, 36); @@ -1425,5 +1423,5 @@ // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(435, 599); + this.label4.Location = new System.Drawing.Point(552, 654); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 13); @@ -1435,5 +1433,5 @@ // this.liczbaEmisjiLabel.AutoSize = true; - this.liczbaEmisjiLabel.Location = new System.Drawing.Point(510, 599); + this.liczbaEmisjiLabel.Location = new System.Drawing.Point(627, 654); this.liczbaEmisjiLabel.Name = "liczbaEmisjiLabel"; this.liczbaEmisjiLabel.Size = new System.Drawing.Size(10, 13); @@ -1552,21 +1550,22 @@ this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(645, 9); + this.tabControl1.Location = new System.Drawing.Point(435, 350); + this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(263, 556); + this.tabControl1.Size = new System.Drawing.Size(473, 266); this.tabControl1.TabIndex = 50; // // notatkiTabPage // + this.notatkiTabPage.Controls.Add(kier_notatkaLabel); this.notatkiTabPage.Controls.Add(iNFOLabel); this.notatkiTabPage.Controls.Add(this.iNFOTextBox); - this.notatkiTabPage.Controls.Add(kier_notatkaLabel); + this.notatkiTabPage.Controls.Add(this.kier_notatkaTextBox); this.notatkiTabPage.Controls.Add(this.kier_zatwierdzilCheckBox); - this.notatkiTabPage.Controls.Add(this.kier_notatkaTextBox); this.notatkiTabPage.Location = new System.Drawing.Point(4, 22); this.notatkiTabPage.Name = "notatkiTabPage"; this.notatkiTabPage.Padding = new System.Windows.Forms.Padding(3); - this.notatkiTabPage.Size = new System.Drawing.Size(255, 530); + this.notatkiTabPage.Size = new System.Drawing.Size(465, 240); this.notatkiTabPage.TabIndex = 2; this.notatkiTabPage.Text = "Notatki"; @@ -1579,5 +1578,5 @@ this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(255, 530); + this.tabPage1.Size = new System.Drawing.Size(465, 240); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Reklama ukaza³a siê"; @@ -1603,40 +1602,17 @@ this.ukazaloSieDataGridView.RowHeadersWidth = 10; this.ukazaloSieDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - this.ukazaloSieDataGridView.Size = new System.Drawing.Size(141, 524); + this.ukazaloSieDataGridView.Size = new System.Drawing.Size(179, 234); 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); // - // nRWYDANIADataGridViewTextBoxColumn1 - // - this.nRWYDANIADataGridViewTextBoxColumn1.DataPropertyName = "NR_WYDANIA"; - this.nRWYDANIADataGridViewTextBoxColumn1.HeaderText = "NR"; - this.nRWYDANIADataGridViewTextBoxColumn1.Name = "nRWYDANIADataGridViewTextBoxColumn1"; - this.nRWYDANIADataGridViewTextBoxColumn1.ReadOnly = true; - // - // NR_WYDANIA - // - this.NR_WYDANIA.DataPropertyName = "NR_WYDANIA"; - this.NR_WYDANIA.HeaderText = "NR_WYDANIA"; - this.NR_WYDANIA.Name = "NR_WYDANIA"; - this.NR_WYDANIA.ReadOnly = true; - this.NR_WYDANIA.Visible = false; - // - // sTRONADataGridViewTextBoxColumn - // - this.sTRONADataGridViewTextBoxColumn.DataPropertyName = "STRONA"; - this.sTRONADataGridViewTextBoxColumn.HeaderText = "STRONA"; - this.sTRONADataGridViewTextBoxColumn.Name = "sTRONADataGridViewTextBoxColumn"; - this.sTRONADataGridViewTextBoxColumn.ReadOnly = true; - // // tabPage2 // this.tabPage2.AutoScroll = true; this.tabPage2.Controls.Add(this.dataGridView1); - this.tabPage2.Controls.Add(this.reklama_Info_DodDataGridView); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(255, 530); + this.tabPage2.Size = new System.Drawing.Size(465, 240); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Info dodatkowe"; @@ -1658,40 +1634,13 @@ this.dataGridView1.RowHeadersWidth = 10; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - this.dataGridView1.Size = new System.Drawing.Size(249, 524); + this.dataGridView1.Size = new System.Drawing.Size(459, 234); this.dataGridView1.TabIndex = 56; this.dataGridView1.Leave += new System.EventHandler(this.dataGridView1_Leave); this.dataGridView1.RowLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_RowLeave); // - // dataDataGridViewTextBoxColumn - // - this.dataDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.dataDataGridViewTextBoxColumn.DataPropertyName = "Data"; - this.dataDataGridViewTextBoxColumn.HeaderText = "Data"; - this.dataDataGridViewTextBoxColumn.Name = "dataDataGridViewTextBoxColumn"; - this.dataDataGridViewTextBoxColumn.ReadOnly = true; - this.dataDataGridViewTextBoxColumn.Width = 75; - // - // reklamaInfoDodDataGridViewTextBoxColumn - // - this.reklamaInfoDodDataGridViewTextBoxColumn.DataPropertyName = "Reklama_Info_Dod"; - this.reklamaInfoDodDataGridViewTextBoxColumn.HeaderText = "Info dod."; - this.reklamaInfoDodDataGridViewTextBoxColumn.Name = "reklamaInfoDodDataGridViewTextBoxColumn"; - // // rEKLAMAReklamaInfoDodBindingSource // this.rEKLAMAReklamaInfoDodBindingSource.DataMember = "REKLAMA_Reklama_Info_Dod"; this.rEKLAMAReklamaInfoDodBindingSource.DataSource = this.rEKLAMABindingSource; - // - // reklama_Info_DodDataGridView - // - this.reklama_Info_DodDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.reklama_Info_DodDataGridView.BackgroundColor = System.Drawing.Color.White; - this.reklama_Info_DodDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; - this.reklama_Info_DodDataGridView.Location = new System.Drawing.Point(3, 3); - this.reklama_Info_DodDataGridView.Name = "reklama_Info_DodDataGridView"; - this.reklama_Info_DodDataGridView.RowHeadersWidth = 10; - this.reklama_Info_DodDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - this.reklama_Info_DodDataGridView.Size = new System.Drawing.Size(249, 524); - this.reklama_Info_DodDataGridView.TabIndex = 0; // // reklama_Info_DodTableAdapter @@ -1754,5 +1703,5 @@ // kalendarzButton // - this.kalendarzButton.Location = new System.Drawing.Point(564, 571); + this.kalendarzButton.Location = new System.Drawing.Point(714, 340); this.kalendarzButton.Name = "kalendarzButton"; this.kalendarzButton.Size = new System.Drawing.Size(75, 23); @@ -1818,5 +1767,5 @@ // this.btnSaveClose.Image = ((System.Drawing.Image)(resources.GetObject("btnSaveClose.Image"))); - this.btnSaveClose.Location = new System.Drawing.Point(832, 607); + this.btnSaveClose.Location = new System.Drawing.Point(832, 622); this.btnSaveClose.Name = "btnSaveClose"; this.btnSaveClose.Size = new System.Drawing.Size(76, 36); @@ -1827,4 +1776,43 @@ this.btnSaveClose.Click += new System.EventHandler(this.btnSaveClose_Click); // + // nRWYDANIADataGridViewTextBoxColumn1 + // + this.nRWYDANIADataGridViewTextBoxColumn1.DataPropertyName = "NR_WYDANIA"; + this.nRWYDANIADataGridViewTextBoxColumn1.HeaderText = "NR"; + this.nRWYDANIADataGridViewTextBoxColumn1.Name = "nRWYDANIADataGridViewTextBoxColumn1"; + this.nRWYDANIADataGridViewTextBoxColumn1.ReadOnly = true; + // + // NR_WYDANIA + // + this.NR_WYDANIA.DataPropertyName = "NR_WYDANIA"; + this.NR_WYDANIA.HeaderText = "NR_WYDANIA"; + this.NR_WYDANIA.Name = "NR_WYDANIA"; + this.NR_WYDANIA.ReadOnly = true; + this.NR_WYDANIA.Visible = false; + // + // sTRONADataGridViewTextBoxColumn + // + this.sTRONADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.sTRONADataGridViewTextBoxColumn.DataPropertyName = "STRONA"; + this.sTRONADataGridViewTextBoxColumn.HeaderText = "STRONA"; + this.sTRONADataGridViewTextBoxColumn.Name = "sTRONADataGridViewTextBoxColumn"; + this.sTRONADataGridViewTextBoxColumn.ReadOnly = true; + // + // dataDataGridViewTextBoxColumn + // + this.dataDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.dataDataGridViewTextBoxColumn.DataPropertyName = "Data"; + this.dataDataGridViewTextBoxColumn.HeaderText = "Data"; + this.dataDataGridViewTextBoxColumn.Name = "dataDataGridViewTextBoxColumn"; + this.dataDataGridViewTextBoxColumn.ReadOnly = true; + this.dataDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.dataDataGridViewTextBoxColumn.Width = 110; + // + // reklamaInfoDodDataGridViewTextBoxColumn + // + this.reklamaInfoDodDataGridViewTextBoxColumn.DataPropertyName = "Reklama_Info_Dod"; + this.reklamaInfoDodDataGridViewTextBoxColumn.HeaderText = "Info dod."; + this.reklamaInfoDodDataGridViewTextBoxColumn.Name = "reklamaInfoDodDataGridViewTextBoxColumn"; + // // OrderDetails // @@ -1834,22 +1822,24 @@ this.ClientSize = new System.Drawing.Size(920, 669); this.Controls.Add(this.btnSaveClose); + this.Controls.Add(this.anulujButton); + this.Controls.Add(this.dodajButton); + this.Controls.Add(this.kalendarzButton); + this.Controls.Add(kROTNOSCLabel); + this.Controls.Add(this.kROTNOSCTextBox); + this.Controls.Add(this.EmailButton); this.Controls.Add(this.button3); - this.Controls.Add(this.EmailButton); - this.Controls.Add(this.cenaEmisjiButton); - this.Controls.Add(this.kalendarzButton); 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.cenaEmisjiButton); this.Controls.Add(this.wyroznienie_exportedCheckBox); this.Controls.Add(fAKTURA_WYSTAWIONOLabel); - this.Controls.Add(this.liczbaEmisjiLabel); this.Controls.Add(this.groupBox4); this.Controls.Add(this.fAKTURA_WYSTAWIONOCheckBox); + this.Controls.Add(this.liczbaEmisjiLabel); this.Controls.Add(this.zAP£ACONOCheckBox); this.Controls.Add(this.label4); - this.Controls.Add(this.anulujButton); - this.Controls.Add(this.dodajButton); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); @@ -1858,6 +1848,4 @@ 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; @@ -1896,5 +1884,4 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rEKLAMAReklamaInfoDodBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.reklama_Info_DodDataGridView)).EndInit(); this.ZDpanel.ResumeLayout(false); this.ZDpanel.PerformLayout(); @@ -1974,8 +1961,5 @@ private System.Windows.Forms.DataGridView ukazaloSieDataGridView; private Baza_Reklam.REKLAMADataSetTableAdapters.Reklama_Info_DodTableAdapter reklama_Info_DodTableAdapter; - private System.Windows.Forms.DataGridView reklama_Info_DodDataGridView; private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn reklamaInfoDodDataGridViewTextBoxColumn; private System.Windows.Forms.BindingSource rEKLAMAReklamaInfoDodBindingSource; private System.Windows.Forms.ComboBox sYMBOL_AKWIZYTORAComboBox; @@ -2013,7 +1997,4 @@ private System.Windows.Forms.ToolStripMenuItem deleteItem; private System.Windows.Forms.ToolStripMenuItem editItem; - private System.Windows.Forms.DataGridViewTextBoxColumn nRWYDANIADataGridViewTextBoxColumn1; - 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; @@ -2026,4 +2007,10 @@ private System.Windows.Forms.Label lblModuleDescription; private System.Windows.Forms.Button btnSaveClose; + private System.Windows.Forms.DataGridViewTextBoxColumn ReklamaId; + private System.Windows.Forms.DataGridViewTextBoxColumn nRWYDANIADataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn NR_WYDANIA; + private System.Windows.Forms.DataGridViewTextBoxColumn sTRONADataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn dataDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn reklamaInfoDodDataGridViewTextBoxColumn; Index: branches/Emisje/BazaReklam/OrderDetails.resx =================================================================== --- branches/Emisje/BazaReklam/OrderDetails.resx (revision 750) +++ branches/Emisje/BazaReklam/OrderDetails.resx (revision 775) @@ -253,4 +253,7 @@ 17, 54 + + 17, 54 + 17, 91 @@ -267,4 +270,7 @@ 443, 91 + + + 1113, 91 @@ -336,9 +342,9 @@ 259, 91 + + 863, 91 + True - - - 863, 91 @@ -403,3 +409,6 @@ + + True +