diff options
Diffstat (limited to 'Aktywator')
| -rw-r--r-- | Aktywator/Bws.cs | 6 | ||||
| -rw-r--r-- | Aktywator/MainForm.Designer.cs | 125 | ||||
| -rw-r--r-- | Aktywator/MainForm.cs | 5 | ||||
| -rw-r--r-- | Aktywator/MainForm.resx | 68 |
4 files changed, 114 insertions, 90 deletions
diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index e1bc061..822d39f 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -27,10 +27,10 @@ namespace Aktywator sql = new Sql(filename); this.main = main; string[] sections = this.getSections().Split(','); - main.lWczytywane.Text = this.getBoardRangeText(sections); foreach (string section in sections) { - main.cblSections.Items.Add(this.sectorNumberToLetter(Int16.Parse(section))); + int sectionNumber = Int16.Parse(section); + main.cblSections.Items.Add("sektor " + this.sectorNumberToLetter(sectionNumber) + " (rozdania " + this.lowBoard(section) + "-" + this.highBoard(section) + ")"); } for (int i = 0; i < main.cblSections.Items.Count; i++) { @@ -40,7 +40,7 @@ namespace Aktywator private int sectorLetterToNumber(string sector) { - return sector[0] - 'A' + 1; + return sector.ToUpper()[0] - 'A' + 1; } private string sectorNumberToLetter(int sector) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index e19875a..c2eea27 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -108,15 +108,12 @@ this.bMySQLTournament = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.bClearHands = new System.Windows.Forms.Button(); + this.toolStrip3 = new System.Windows.Forms.ToolStrip(); + this.bLoadHands = new System.Windows.Forms.ToolStripButton(); + this.bClearHands = new System.Windows.Forms.ToolStripButton(); this.lRecordSections = new System.Windows.Forms.Label(); this.cblSections = new System.Windows.Forms.CheckedListBox(); - this.label14 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.lWczytywane = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); - this.bLoadHands = new System.Windows.Forms.Button(); this.timer = new System.Windows.Forms.Timer(this.components); this.openPBN = new System.Windows.Forms.OpenFileDialog(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -137,6 +134,7 @@ this.groupBox2.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); + this.toolStrip3.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -952,15 +950,10 @@ // // tabPage3 // - this.tabPage3.Controls.Add(this.bClearHands); + this.tabPage3.Controls.Add(this.toolStrip3); this.tabPage3.Controls.Add(this.lRecordSections); this.tabPage3.Controls.Add(this.cblSections); - this.tabPage3.Controls.Add(this.label14); - this.tabPage3.Controls.Add(this.label13); - this.tabPage3.Controls.Add(this.lWczytywane); - this.tabPage3.Controls.Add(this.label12); this.tabPage3.Controls.Add(this.label11); - this.tabPage3.Controls.Add(this.bLoadHands); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); @@ -969,22 +962,47 @@ this.tabPage3.Text = "Rozkłady"; this.tabPage3.UseVisualStyleBackColor = true; // + // toolStrip3 + // + this.toolStrip3.BackColor = System.Drawing.Color.White; + this.toolStrip3.GripMargin = new System.Windows.Forms.Padding(0); + this.toolStrip3.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bLoadHands, + this.bClearHands}); + this.toolStrip3.Location = new System.Drawing.Point(3, 3); + this.toolStrip3.Name = "toolStrip3"; + this.toolStrip3.Size = new System.Drawing.Size(563, 25); + this.toolStrip3.TabIndex = 9; + this.toolStrip3.Text = "toolStrip3"; + // + // bLoadHands + // + this.bLoadHands.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.bLoadHands.Image = ((System.Drawing.Image)(resources.GetObject("bLoadHands.Image"))); + this.bLoadHands.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bLoadHands.Name = "bLoadHands"; + this.bLoadHands.Size = new System.Drawing.Size(122, 22); + this.bLoadHands.Text = "Wczytaj rozkłady"; + this.bLoadHands.Click += new System.EventHandler(this.bLoadHands_Click); + // // bClearHands // - this.bClearHands.Location = new System.Drawing.Point(334, 336); + this.bClearHands.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.bClearHands.Image = ((System.Drawing.Image)(resources.GetObject("bClearHands.Image"))); + this.bClearHands.ImageTransparentColor = System.Drawing.Color.Magenta; this.bClearHands.Name = "bClearHands"; - this.bClearHands.Size = new System.Drawing.Size(223, 23); - this.bClearHands.TabIndex = 8; + this.bClearHands.Size = new System.Drawing.Size(230, 22); this.bClearHands.Text = "Usuń rozkłady dla wszystkich sektorów"; - this.bClearHands.UseVisualStyleBackColor = true; this.bClearHands.Click += new System.EventHandler(this.bClearHands_Click); // // lRecordSections // this.lRecordSections.AutoSize = true; - this.lRecordSections.Location = new System.Drawing.Point(23, 150); + this.lRecordSections.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.lRecordSections.Location = new System.Drawing.Point(6, 138); this.lRecordSections.Name = "lRecordSections"; - this.lRecordSections.Size = new System.Drawing.Size(46, 13); + this.lRecordSections.Size = new System.Drawing.Size(54, 13); this.lRecordSections.TabIndex = 7; this.lRecordSections.Text = "Sektory:"; // @@ -993,69 +1011,19 @@ this.cblSections.BorderStyle = System.Windows.Forms.BorderStyle.None; this.cblSections.CheckOnClick = true; this.cblSections.FormattingEnabled = true; - this.cblSections.Location = new System.Drawing.Point(26, 178); - this.cblSections.MultiColumn = true; + this.cblSections.Location = new System.Drawing.Point(9, 162); this.cblSections.Name = "cblSections"; - this.cblSections.Size = new System.Drawing.Size(456, 105); + this.cblSections.Size = new System.Drawing.Size(546, 285); this.cblSections.TabIndex = 6; - this.cblSections.SelectedIndexChanged += new System.EventHandler(this.cblSections_SelectedIndexChanged); - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(6, 315); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(247, 13); - this.label14.TabIndex = 5; - this.label14.Text = "to także należy ręcznie zrobić Upload (patrz wyżej)."; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(6, 293); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(476, 13); - this.label13.TabIndex = 4; - this.label13.Text = "Jeżeli Server->Show hand records w BCS nie pokazuje rozkładów (i/lub nie pokazują" + - " ich pierniczki)"; - // - // lWczytywane - // - this.lWczytywane.AutoSize = true; - this.lWczytywane.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lWczytywane.Location = new System.Drawing.Point(218, 84); - this.lWczytywane.Name = "lWczytywane"; - this.lWczytywane.Size = new System.Drawing.Size(139, 13); - this.lWczytywane.TabIndex = 3; - this.lWczytywane.Text = "Wczytywane rozkłady: "; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(6, 36); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(408, 13); - this.label12.TabIndex = 2; - this.label12.Text = "W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upload..."; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(6, 14); + this.label11.Location = new System.Drawing.Point(6, 49); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(280, 13); + this.label11.Size = new System.Drawing.Size(479, 78); this.label11.TabIndex = 1; - this.label11.Text = "Rozkłady muszą zostać wczytane przed \"Uruchom BCS\"."; - // - // bLoadHands - // - this.bLoadHands.Location = new System.Drawing.Point(26, 84); - this.bLoadHands.Name = "bLoadHands"; - this.bLoadHands.Size = new System.Drawing.Size(149, 42); - this.bLoadHands.TabIndex = 0; - this.bLoadHands.Text = "Wczytaj rozkłady"; - this.bLoadHands.UseVisualStyleBackColor = true; - this.bLoadHands.Click += new System.EventHandler(this.bLoadHands_Click); + this.label11.Text = resources.GetString("label11.Text"); // // timer // @@ -1150,6 +1118,8 @@ this.tabPage2.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + this.toolStrip3.ResumeLayout(false); + this.toolStrip3.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.ResumeLayout(false); @@ -1216,13 +1186,8 @@ public System.Windows.Forms.ComboBox xResultsOverview; public System.Windows.Forms.CheckBox xViewHandrecord; private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.Button bLoadHands; - private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label11; - public System.Windows.Forms.Label lWczytywane; private System.Windows.Forms.OpenFileDialog openPBN; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label9; private System.Windows.Forms.TextBox eOomRounds; public System.Windows.Forms.CheckBox xCollectPlay; @@ -1230,7 +1195,6 @@ public System.Windows.Forms.CheckBox xCheckLeadCard; public System.Windows.Forms.CheckedListBox cblSections; private System.Windows.Forms.Label lRecordSections; - private System.Windows.Forms.Button bClearHands; private System.Windows.Forms.Button bRRBTournament; private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox7; @@ -1252,6 +1216,9 @@ private System.Windows.Forms.ToolStripStatusLabel lRequiredFirmware; private System.Windows.Forms.ToolStripButton bLoad; private System.Windows.Forms.ToolStripButton bSave; + private System.Windows.Forms.ToolStrip toolStrip3; + private System.Windows.Forms.ToolStripButton bLoadHands; + private System.Windows.Forms.ToolStripButton bClearHands; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 57794cf..37a482a 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -466,11 +466,6 @@ namespace Aktywator } } - private void cblSections_SelectedIndexChanged(object sender, EventArgs e) - { - this.lWczytywane.Text = bws.getBoardRangeText(bws.getSelectedSections()); - } - private void bClearHands_Click(object sender, EventArgs e) { try diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index e102f5f..b1edfed 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -158,6 +158,68 @@ AABJRU5ErkJggg== </value> </data> + <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>133, 56</value> + </metadata> + <data name="bLoadHands.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ0SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWLBYGBI9RBi + RLlSrqDkQrlSZijmuDTjrrO4TqloMy6NOlpZimGFUCgSoeVCialZUFSKqaGS22mcEcnyIQj64IPLvfcc + flyu8F+SUVztJC3Qci2nkiyVjkSZJmnt6O8SFKvCM0IRsLq+lFBhlqqXxaWrvQNjixEaa/J89eX3ttZl + KQz0JokQl7h5RSnwiMg3CBjq0zA/1WDoj0kti+NqdJUKmmrSUteYDfGMVOIRXoBrWBFCQ5WSucnaDfDy + 5xIWB2KovZVDdWkm6uJUyvJTuCkXU5Qdz5rHmDqNjLmvmnV4RQ8zJIaBsE37h+B2eTbfP5Wtw22NMkMf + 6nJp1mZzrzoTnToNbZmUStV1KgqSKFWKUckSjLLqskxm3hcaxh7tkNBUq2R5VApj6Rv7Tr83kgiDsfA6 + it56H6KD3asEtSqN6eEc+CDnfp2Crkdy46VfR38VCN1eLHW6MP/YkbdVIkLPO05fueB2SCgvkPDtjZSx + zmSatHJWRiTQH24Ee0P0oB9LXe7Mt59ipvU4E42HkUZY4+dkmm94gxJlMhN9CdypkdHzTD/JYIxecBF6 + Alh5fpaFp2eYbTvBZJM9X+ps6c7Ygb+LFfY222wMAlWumP72FO7W5MJwCrzUj/vCm4UOV2afODLV7MC4 + TsRHzQEG5KZIwvZjd9C8xQCvpjArnobKHAYeRNKdJ6y3S76F9uyttKRupz7JDHW8BTeuWuLvvG/Fwc7S + eQ0XhLz0OPIkoWQlBJF42ZfoEHeCfU5y7vRRnI6JOCKyxtbKgr3mu9i904Q9piYb/8G/RRB+Attu5QF5 + RgSyAAAAAElFTkSuQmCC +</value> + </data> + <data name="bClearHands.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> + <data name="label11.Text" xml:space="preserve"> + <value>Rozkłady muszą zostać wczytane przed "Uruchom BCS". + +W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upload... + +Jeżeli Server->Show hand records w BCS nie pokazuje rozkładów (i/lub nie pokazują ich pierniczki), +to także należy ręcznie zrobić Upload.</value> + </data> <metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>527, 17</value> </metadata> @@ -183,13 +245,13 @@ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPYxj8YPrOP/9BuH/Tt//Ny9/+L5v1+H9W/63/ UGlUULvid3D5/I+r/eqvS0GFwAZ0bPj/v2zRr/+Jfc/+u5WdnQqVQgWVi37qtKz6cyq1/8l/s6RNd6DC DD3rv/wvmPftf0zfx/9uFbf/2+YeP2KefEATKo0AFUu+TahY/O2/c/7p/6pBc99BhRlqF774H9Z6779z - zs1PFtkX/hsn7fuvG72pByqNAFVLP17Imf7+v2ny/v+6kevnQoUZcifd+W+fdzrHqfTSNNu8c//1Yrb9 - 1w1beh4qjQCN8z99Tp/69r9xwt7/BjE7rEBiaWlnWJM6roADLKz1jnVw0z2wAYpesz+DxFBAGdCAtKnv + 9s1PFtkX/hsn7fuvG72pByqNAFVLP17Imf7+v2ny/v+6kevnQoUZcifd+W+fdzrHqfTSNNu8c//1Yrb9 + 1w1beh4qjQCN8z99Tp/69r9xwt7/BjE7rEBiaWlnWJM6roADLKz1jnVw0z2wAfJesz+DxFBACdCAtKnv /pul7ocbgAyyZr6zSZvy5r9h3C7sBlQs+Hghdcrb//a5p/9bpR+ZCRWGg5plv+dlTPvwXz9mx3+dkCUX oMIIkD31ZV9879P/XlU3/vtW3HybOvHFnDygreULv9k0rP47v3z59/fBzff/64av+q8VtmIiVBsCRDTd 1g6svXrUo+zKf9/aO//jep//z5z27n/ezI//c2Z9+g/SrBe9+b9m6JLTGmFrdaDaUIFr8QVfu+xjR43j d//XjdkKxqBA04vZAgz55UDNi07rhS0NhirHDgxjd2nqhK3p0wyYe1HJb8oXENYKnH1JN3TJJPWQlbpQ - ZYMGMDAAAFzIDh1JAY8rAAAAAElFTkSuQmCC + ZYMGMDAAAE5bDhZeNnGYAAAAAElFTkSuQmCC </value> </data> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |