From ecd99235cc16c52fb6364e67848a1a761c655ef2 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 11 Oct 2018 17:27:18 +0200 Subject: PIN safety improvements: * initializing BWS settings with randomized PIN * checking PIN against predictable PINs (with explicit warning on settings save) * generating randomized PIN easily --- Aktywator/Aktywator.csproj | 1 + Aktywator/Bws.cs | 14 +++++++++++++- Aktywator/MainForm.Designer.cs | 30 +++++++++++++++++++++++++++++- Aktywator/MainForm.cs | 37 +++++++++++++++++++++++++++++++++++++ Aktywator/MainForm.resx | 37 +++++++++++++++++++++++++++++++++++-- Aktywator/Resources/BuildDate.txt | 2 +- 6 files changed, 116 insertions(+), 5 deletions(-) diff --git a/Aktywator/Aktywator.csproj b/Aktywator/Aktywator.csproj index bdcdba6..acfc8c6 100644 --- a/Aktywator/Aktywator.csproj +++ b/Aktywator/Aktywator.csproj @@ -132,6 +132,7 @@ MainForm.cs + Designer MysqlSettings.cs diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 9121eb1..7ae27b3 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -352,7 +352,7 @@ namespace Aktywator } List defaultSettings = new List(); - defaultSettings.Add(new Setting("BM2PINcode", "text(4)", "'5431'")); + defaultSettings.Add(new Setting("BM2PINcode", "text(4)", "'" + this._getRandomPIN() + "'")); defaultSettings.Add(new Setting("BM2Ranking", "integer", "0")); defaultSettings.Add(new Setting("BM2GameSummary", "bit", "false")); defaultSettings.Add(new Setting("BM2SummaryPoints", "integer", "0")); @@ -416,6 +416,16 @@ namespace Aktywator } } + internal int[] _unsafePINs = { 0, 0x0457, 0x08AE, 0x0D05, 0x115C, 0x15B3, 0x1A0A, 0x1E61, 0x22B8, 0x270F, 0x04D2, 0x1537, 0x582, 0x1159 }; + internal string _getRandomPIN(int oldPIN = 0) + { + while (Array.IndexOf(this._unsafePINs, oldPIN) > -1) + { + oldPIN = (new Random()).Next(10000); + } + return String.Format("{0,4:D4}", oldPIN); + } + private void _ensureHandRecordStructure() { try @@ -508,6 +518,7 @@ namespace Aktywator string playerNames = Setting.load("BM2ShowPlayerNames", this, errors, section); main.xShowPlayerNames.Checked = !("".Equals(playerNames) || "0".Equals(playerNames)); main.xPINcode.Text = Setting.load("BM2PINcode", this, errors, section); + main.checkPINsafety(main.xPINcode.Text, this._unsafePINs); int resultsOverview = 0; int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview); main.xResultsOverview.SelectedIndex = resultsOverview; @@ -550,6 +561,7 @@ namespace Aktywator public void saveSettings() { string section = "*".Equals(main.cbSettingsSection.Text.Trim()) ? null : this.sectorLetterToNumber(main.cbSettingsSection.Text.Trim()).ToString(); + main.checkPINsafety(main.xPINcode.Text, this._unsafePINs, true); StringBuilder errors = new StringBuilder(); foreach (Setting s in settings) { diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index f8b03b9..9eaa7d6 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -54,6 +54,7 @@ this.cbSettingsSection = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.lPINWarning = new System.Windows.Forms.Label(); this.xResetFunctionKey = new System.Windows.Forms.CheckBox(); this.label2 = new System.Windows.Forms.Label(); this.xPINcode = new System.Windows.Forms.TextBox(); @@ -147,6 +148,7 @@ this.bLaunch = new System.Windows.Forms.ToolStripButton(); this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.namesTimer = new System.Windows.Forms.Timer(this.components); + this.bRandomPIN = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -393,6 +395,8 @@ // // groupBox7 // + this.groupBox7.Controls.Add(this.bRandomPIN); + this.groupBox7.Controls.Add(this.lPINWarning); this.groupBox7.Controls.Add(this.xResetFunctionKey); this.groupBox7.Controls.Add(this.label2); this.groupBox7.Controls.Add(this.xPINcode); @@ -405,6 +409,17 @@ this.groupBox7.TabStop = false; this.groupBox7.Text = "Opcje sędziowskie"; // + // lPINWarning + // + this.lPINWarning.Cursor = System.Windows.Forms.Cursors.Help; + this.lPINWarning.Image = ((System.Drawing.Image)(resources.GetObject("lPINWarning.Image"))); + this.lPINWarning.Location = new System.Drawing.Point(41, 22); + this.lPINWarning.Name = "lPINWarning"; + this.lPINWarning.Size = new System.Drawing.Size(22, 18); + this.lPINWarning.TabIndex = 30; + this.lPINWarning.Visible = false; + this.lPINWarning.Click += new System.EventHandler(this.lPINWarning_Click); + // // xResetFunctionKey // this.xResetFunctionKey.AutoSize = true; @@ -426,12 +441,13 @@ // // xPINcode // - this.xPINcode.Location = new System.Drawing.Point(41, 21); + this.xPINcode.Location = new System.Drawing.Point(69, 22); this.xPINcode.MaxLength = 4; this.xPINcode.Name = "xPINcode"; this.xPINcode.Size = new System.Drawing.Size(37, 20); this.xPINcode.TabIndex = 14; this.xPINcode.Text = "0000"; + this.xPINcode.TextChanged += new System.EventHandler(this.xPINcode_TextChanged); // // xConfirmNP // @@ -1439,6 +1455,16 @@ this.namesTimer.Interval = 3000; this.namesTimer.Tick += new System.EventHandler(this.namesTimer_Tick); // + // bRandomPIN + // + this.bRandomPIN.Image = ((System.Drawing.Image)(resources.GetObject("bRandomPIN.Image"))); + this.bRandomPIN.Location = new System.Drawing.Point(112, 19); + this.bRandomPIN.Name = "bRandomPIN"; + this.bRandomPIN.Size = new System.Drawing.Size(24, 23); + this.bRandomPIN.TabIndex = 31; + this.bRandomPIN.UseVisualStyleBackColor = true; + this.bRandomPIN.Click += new System.EventHandler(this.bRandomPIN_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1622,6 +1648,8 @@ private System.Windows.Forms.ToolStrip sectionToolStrip; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripComboBox cbNamesSection; + public System.Windows.Forms.Label lPINWarning; + private System.Windows.Forms.Button bRandomPIN; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 6284419..3a5b69b 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -678,5 +678,42 @@ namespace Aktywator } } + + internal void checkPINsafety(string pin, int[] unsafePINs, bool explicitWarning = false) + { + try + { + if (Array.IndexOf(unsafePINs, Int32.Parse(pin)) > -1) + { + this.lPINWarning.Visible = true; + if (explicitWarning) + { + MessageBox.Show("Próbujesz ustawić PIN, który jest łatwy do przewidzenia przez zawodników.\n\nMam nadzieję, że wiesz, co robisz!", "Przewidywalny PIN!", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } + else + { + this.lPINWarning.Visible = false; + } + } + catch (FormatException e) + { + } + } + + private void xPINcode_TextChanged(object sender, EventArgs e) + { + this.checkPINsafety(this.xPINcode.Text, this.bws._unsafePINs); + } + + private void lPINWarning_Click(object sender, EventArgs e) + { + this.checkPINsafety(this.xPINcode.Text, this.bws._unsafePINs, true); + } + + private void bRandomPIN_Click(object sender, EventArgs e) + { + this.xPINcode.Text = this.bws._getRandomPIN(); + } } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 11af55c..0a1a205 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -158,6 +158,39 @@ 343, 56 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAACHElE + QVQ4T2P4//8/RRirICkYqyAynr7zz38Q7t/07X/z8rf/y2Y9/p/VfwsoBZFHUVy38k9w+YKPq32brkrB + xECaOzb8/1+26Nf/xL5n/z3Kzk1F1gNnVCz+rdOy+u+p1P4n/61St9yBifes//K/YN63/zF9H/+7Vdz+ + b5t7/Ih56iFNmDzcgMql3yZULP723zn/9H+doAXvYOK1C1/8D2u999+59OYni+wL/42T9v3Xi97cA5OH + G1Cz9POFnOnv/5sm7/+vG7l+Lkw8d9Kd/w4Fp3NcSi9Ps807918vZtt/3bCl52HycAMal3/6nD717X/j + hL3/9eN2WIHE8vJusyZ1XAEy/zOEtd6xDm66BzZAK2D2Z5g+uAH1Sz99Tpv67r9Z6n64Acg4Z9Z7m7Qp + b/4bxu3CbkDFwo8XUqe8/W+fe/q/debRmTBxGK5d/mdexrQP//VjdvzXCV1yASYOV5A99WVffO/T/15V + N/4H1t98mzbxxZz8me9syhd8s2lY/Xd+/Yrf74Ob7//XDV/1XydsxUQMA8KabmsH1l8/6lF25b9v7Z3/ + cb3P/2dOe/c/b+bH/zmzPv0HaQaGPsj209pha3UwDABh1+LzvnY5x44ax+/+rxuzFYxBgaYXswUY8suB + mhed1gtdFoysB8UAEDaM36upG7GmTyd4wUUtvylfQFg7cO4l3bAlk7RCV+qiq0fhkIOxChKP/zMAAKH7 + vWcksHU/AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE + QVQ4T6WRX0hTYRjGdxMkikcqmeWURbeamAg60pVK82KgppIzCh3WNvwzRtjCuahhCYabyzRrFcQyVEbQ + hSj+YaKrkCBnDpuSTsu55lEXG1mG29PZuRiunau6+MH3PTzPw/u9HwvAf8EoBlmcKOa+GTi7p68ndrsV + xGEmTxBGMcjbgfz5JfvN3/MzSn9HLTHI5AnCKFr68oTzU5f9vp9PsbnWCNsID50NxEkmb4QQ5P3rQvLz + chdUzTUQiYpgGZOht4XjYvJGCGYjX2mflvibVFdgMpmg0WiQyEmAdTADulpC8rc/7EItLurjkHA3OLqo + shw6nQ5SqRRsNgFyqRovNfG/qIUe2J8JKxh/ntO3sqCm3v4MzepqKBQK5PLPQFGfg+2vcixbTge0MsK4 + PxM6WPrzkuyTInpxvh0DzGY1Ss+XIj0tBeahKnhWrmJroQyjj7gB6mu5EQVmY67V/U27Rxd49XA7WyAQ + nIKoPBO2dxXY/FRCUYTVMY5fX0fYwgqGDDy+Y0YWoMO+Tni3W7G6qIThQTG62gVYmy3DxgceNqx8uKa4 + GNTGBNqlscJQgaU/3+3beUKN/pgOf3erqLEluFhZguzsLOg1KSDnCkDOFsA1mYQvw1HoUhBeuuBVR4bS + 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i + emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 + EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -340,7 +373,7 @@ S5vmPfe+JjvtcklE6MUrYYEbmdtDfF9ayn2gKP5L/6d/QueutWjblIOunWvQezgfd/74BmoPvHwuwN7e mZGPOdVz5pg0Lc/JVm/IvXF77xZ0bl6BusRpOOPujCXm7LNiXd1EkhkPir9vUQU/VBS2aV7bhaaceWhe ngT1moVo35yDzh2r0bV7Le6/9hLUeXn/3D5j+ubBTmOEMjqaV580N7/zxRd77r1zEANv5KNx8XycdZUj - 1dj4Y1MWawbJBENqImHqVP/DeXnfd+Q9T8bPQevqDKjXZ6Ej7wV07d0Izf48dB/Yju7929D/yhbg8E7c + 1dj4Y1MWawbJBENqImHqVP8DeXnfd+Q9T8bPQevqDKjXZ6Ej7wV07d0Izf48dB/Yju7929D/yhbg8E7c WLpIESgSeTNDjBoNqQs2t6xf33/33SN4+OGb6MjfiOuTw5FnafmVLUtnIUlsh5Q/4ui2LTvxwZtQ06q3 r8uEekM22retJONfRDftSPeRPeg5mo/eQ7vQSxPppUn8q2AD7mxcgY2hwauZYf4vVFlZz6lXvaDsO7QH D/6wHwPv7MetFYtwQiodiNLTe5kkHtQMB8U/hc1m895cmHK1acsaaDYvg2bHKmho5btf24meY/vQe+wV @@ -383,7 +416,7 @@ imXm5oeYS8Mz0czM8UFGIno2ZKI9Zy5aUmKhSgjBLcpE9REUyMFy7OXzS0k6bMU5Ghx1dy47zuXWMF8f jZppE2sGctPRuTKFiYNwNMb44FaUC65RdggzNP7ff22OIZZ6eh5xpqbaU/nRM95kC4v49vgo9K5JG3yF rp4/Gc0JwSgNdUe+wLqKJE5Dyl+Nx3/9uJTDKWicEoKOhXF0HkSjMsoPb/D5fVa6uvGM5OknwdB42wlb - 287TlJO3WnNvWOrozKXLVKL8htBnsdwoD2tLBq3bjMnJ+zu/fVisfwP1S8tTgtT67QAAAABJRU5ErkJg + 287TlJO3WnNvWOrozKXLVKL8htBnsdwoD2tLBq3bjMnJ+zu/fVisfwNzs8tPbIn1ogAAAABJRU5ErkJg gg== diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 6e1bd6e..1cc075b 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-10-05 +2018-10-11 -- cgit v1.2.3 From 9b7bdf9d024b88b956d9601ca39307914708929b Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 11 Oct 2018 17:38:49 +0200 Subject: Styling adjustements --- Aktywator/MainForm.Designer.cs | 47 ++++----- Aktywator/MainForm.resx | 211 ++++++++++++++++++++++------------------- 2 files changed, 140 insertions(+), 118 deletions(-) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 9eaa7d6..a8ea1a7 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -54,6 +54,7 @@ this.cbSettingsSection = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.bRandomPIN = new System.Windows.Forms.Button(); this.lPINWarning = new System.Windows.Forms.Label(); this.xResetFunctionKey = new System.Windows.Forms.CheckBox(); this.label2 = new System.Windows.Forms.Label(); @@ -148,7 +149,6 @@ this.bLaunch = new System.Windows.Forms.ToolStripButton(); this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.namesTimer = new System.Windows.Forms.Timer(this.components); - this.bRandomPIN = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -409,11 +409,21 @@ this.groupBox7.TabStop = false; this.groupBox7.Text = "Opcje sędziowskie"; // + // bRandomPIN + // + this.bRandomPIN.Image = ((System.Drawing.Image)(resources.GetObject("bRandomPIN.Image"))); + this.bRandomPIN.Location = new System.Drawing.Point(94, 21); + this.bRandomPIN.Name = "bRandomPIN"; + this.bRandomPIN.Size = new System.Drawing.Size(22, 22); + this.bRandomPIN.TabIndex = 31; + this.bRandomPIN.UseVisualStyleBackColor = true; + this.bRandomPIN.Click += new System.EventHandler(this.bRandomPIN_Click); + // // lPINWarning // this.lPINWarning.Cursor = System.Windows.Forms.Cursors.Help; this.lPINWarning.Image = ((System.Drawing.Image)(resources.GetObject("lPINWarning.Image"))); - this.lPINWarning.Location = new System.Drawing.Point(41, 22); + this.lPINWarning.Location = new System.Drawing.Point(10, 22); this.lPINWarning.Name = "lPINWarning"; this.lPINWarning.Size = new System.Drawing.Size(22, 18); this.lPINWarning.TabIndex = 30; @@ -433,7 +443,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(10, 25); + this.label2.Location = new System.Drawing.Point(30, 25); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(25, 13); this.label2.TabIndex = 27; @@ -441,12 +451,13 @@ // // xPINcode // - this.xPINcode.Location = new System.Drawing.Point(69, 22); + this.xPINcode.Location = new System.Drawing.Point(56, 22); this.xPINcode.MaxLength = 4; this.xPINcode.Name = "xPINcode"; this.xPINcode.Size = new System.Drawing.Size(37, 20); this.xPINcode.TabIndex = 14; this.xPINcode.Text = "0000"; + this.xPINcode.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.xPINcode.TextChanged += new System.EventHandler(this.xPINcode_TextChanged); // // xConfirmNP @@ -1320,14 +1331,14 @@ this.gwSections.AllowUserToResizeRows = false; this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - 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.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gwSections.Location = new System.Drawing.Point(9, 118); this.gwSections.MultiSelect = false; @@ -1455,16 +1466,6 @@ this.namesTimer.Interval = 3000; this.namesTimer.Tick += new System.EventHandler(this.namesTimer_Tick); // - // bRandomPIN - // - this.bRandomPIN.Image = ((System.Drawing.Image)(resources.GetObject("bRandomPIN.Image"))); - this.bRandomPIN.Location = new System.Drawing.Point(112, 19); - this.bRandomPIN.Name = "bRandomPIN"; - this.bRandomPIN.Size = new System.Drawing.Size(24, 23); - this.bRandomPIN.TabIndex = 31; - this.bRandomPIN.UseVisualStyleBackColor = true; - this.bRandomPIN.Click += new System.EventHandler(this.bRandomPIN_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 0a1a205..7b08637 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -126,42 +126,14 @@ 459, 56 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s - hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f - v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 - 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN - mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// - f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU - ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 - fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa - mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa - QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII - s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW - l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO - 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t - EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt - 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA - AABJRU5ErkJggg== - - 343, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAACHElE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACHElE QVQ4T2P4//8/RRirICkYqyAynr7zz38Q7t/07X/z8rf/y2Y9/p/VfwsoBZFHUVy38k9w+YKPq32brkrB xECaOzb8/1+26Nf/xL5n/z3Kzk1F1gNnVCz+rdOy+u+p1P4n/61St9yBifes//K/YN63/zF9H/+7Vdz+ b5t7/Ih56iFNmDzcgMql3yZULP723zn/9H+doAXvYOK1C1/8D2u999+59OYni+wL/42T9v3Xi97cA5OH @@ -189,6 +161,46 @@ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC + + + + 564, 33 + + + 343, 21 + + + 238, 56 + + + 133, 56 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s + hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f + v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 + 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN + mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// + f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU + ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 + fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa + mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa + QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII + s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW + l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO + 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t + EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt + 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA + AABJRU5ErkJggg== @@ -250,6 +262,15 @@ True + + True + + + True + + + True + 343, 21 @@ -282,6 +303,23 @@ 238, 56 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY + Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 + hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt + ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL + n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 + UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX + 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM + dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg + O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj + ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW + rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 + xNmtFAAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -313,23 +351,6 @@ YVXLVS8xE6wHcShj+5DDqparXmImWA/iUMb2yXZGgKZliKNmKpyFzFRrBr5AZYO1zmJW4Sxkhq767jdc yld72a9wWdvDmRpyPX53RLbnXb8mhaZH4F3ibpbz13pDviT76h14p3ofpD/5uOBd+T4fflz8xBu/xePx BZRDJQYQ19gkAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY - Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 - hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt - ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL - n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 - UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX - 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM - dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg - O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj - ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW - rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 - xNmtFAAAAABJRU5ErkJggg== @@ -367,56 +388,56 @@ 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 gg== -- cgit v1.2.3 From dab3f079ae0d51da0064bb06089f950ee977935e Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 11 Oct 2018 19:39:13 +0200 Subject: Disabling hand records if unsafe PIN is set --- Aktywator/MainForm.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 3a5b69b..2752b31 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -688,12 +688,15 @@ namespace Aktywator this.lPINWarning.Visible = true; if (explicitWarning) { - MessageBox.Show("Próbujesz ustawić PIN, który jest łatwy do przewidzenia przez zawodników.\n\nMam nadzieję, że wiesz, co robisz!", "Przewidywalny PIN!", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("Próbujesz ustawić PIN, który jest łatwy do przewidzenia przez zawodników.\n\nMam nadzieję, że wiesz, co robisz!\n\nNiestety, nie możemy pozwolić Ci na wgranie do BWSa rozkładów.", "Przewidywalny PIN!", MessageBoxButtons.OK, MessageBoxIcon.Warning); + this.bws.clearHandRecords(); + this.tabControl1.TabPages[2].Enabled = false; } } else { this.lPINWarning.Visible = false; + this.tabControl1.TabPages[2].Enabled = true; } } catch (FormatException e) -- cgit v1.2.3 From 480e02a22500385a14831aa918cc5f4af6d5416f Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 18:04:47 +0200 Subject: Removing [beta] designations from changelog --- Aktywator.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Aktywator.txt b/Aktywator.txt index 82896cb..36d8681 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -2,7 +2,7 @@ - nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze) - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa) -Aktywator 1.1.4 (beta) +Aktywator 1.1.4 05.10.2018 [mkl] * wczytywanie nazwisk do indywiduela granego parami * usprawnienie mechanizmu wczytywania nazwisk do różnych sektorów @@ -12,7 +12,7 @@ Aktywator 1.1.4 (beta) * dodany plik licencji do wersji binarnej wraz z odpowiednimi informacjami o licencjach zależności --------------------- -Aktywator 1.1.3 (beta) +Aktywator 1.1.3 04.01.2018 [mkl] * niewymuszanie odświeżania listy nazwisk po wczytaniu turnieju * wyświetlanie w pierniczku skróconej nazwy teamu zamiast pełnej @@ -25,7 +25,7 @@ Aktywator 1.1.3 (beta) * wizualne poprawki wyświetlania długich ścieżek i nazw plików BWS --------------------- -Aktywator 1.1.2 (beta) +Aktywator 1.1.2 30.09.2017 [mkl] * pobieranie i wyświetlanie jako nazwiska dodatkowych informacji z turniejów JFR Teamy (lineup, wynik meczu, wynik turnieju) * podgląd rozkładów z BWSa @@ -36,7 +36,7 @@ Aktywator 1.1.2 (beta) * ostrzeżenie o niemożności zmiany maksowania sektorów w czasie sesji --------------------- -Aktywator 1.1.1 (beta) +Aktywator 1.1.1 24.08.2017 [mkl] * edytor nazwisk ładowanych do BWS * zmiana wyglądu zakładek @@ -46,7 +46,7 @@ Aktywator 1.1.1 (beta) * poprawiono błąd pobierania numerów graczy przy wyświetlonych nazwach teamów --------------------- -Aktywator 1.1.0 (beta) +Aktywator 1.1.0 30.07.2017 [mkl] * wczytywanie nazwisk z plików RRBridge -- cgit v1.2.3 From b158f40da4320ed5dd85a59fd39dd21e38268525 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 18:05:04 +0200 Subject: Changelog for random PIN feature --- Aktywator.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Aktywator.txt b/Aktywator.txt index 36d8681..b95fa55 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -2,6 +2,13 @@ - nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze) - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa) +Aktywator 1.1.5 (dev) +??.??.2018 [mkl] + * poprawa bezpieczeństwa PINów + - losowanie PINu przy inicjalizacji + - możliwość ręcznego wylosowania PINu + - wyłączanie rozkładów przy wykryciu "łatwego" PINu + Aktywator 1.1.4 05.10.2018 [mkl] * wczytywanie nazwisk do indywiduela granego parami -- cgit v1.2.3 From f0366782867de119d5133f18746adb58a26a0ddc Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 19:03:04 +0200 Subject: UI improvements of blocking hand records with insecure PINs --- Aktywator/MainForm.Designer.cs | 163 +++++++++++---------- Aktywator/MainForm.cs | 16 +- Aktywator/MainForm.resx | 298 +++++++++++++++++++++----------------- Aktywator/Resources/BuildDate.txt | 2 +- 4 files changed, 272 insertions(+), 207 deletions(-) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index a8ea1a7..b2069f5 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -38,7 +38,7 @@ this.status3 = new System.Windows.Forms.ToolStripStatusLabel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tpSettings = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.toolStrip2 = new System.Windows.Forms.ToolStrip(); this.bLoad = new System.Windows.Forms.ToolStripButton(); @@ -90,7 +90,7 @@ this.xShowPercentage = new System.Windows.Forms.CheckBox(); this.xShowContract = new System.Windows.Forms.CheckBox(); this.xResultsOverview = new System.Windows.Forms.ComboBox(); - this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tpNames = new System.Windows.Forms.TabPage(); this.sectionToolStrip = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.cbNamesSection = new System.Windows.Forms.ToolStripComboBox(); @@ -127,7 +127,7 @@ this.bMysqlSettings = new System.Windows.Forms.ToolStripButton(); this.bForceSync = new System.Windows.Forms.ToolStripButton(); this.bTruncate = new System.Windows.Forms.ToolStripButton(); - this.tabPage3 = new System.Windows.Forms.TabPage(); + this.tpRecords = new System.Windows.Forms.TabPage(); this.label17 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); @@ -142,6 +142,7 @@ this.bClearHands = new System.Windows.Forms.ToolStripButton(); this.lRecordSections = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); + this.ilTabIcons = new System.Windows.Forms.ImageList(this.components); this.timer = new System.Windows.Forms.Timer(this.components); this.openPBN = new System.Windows.Forms.OpenFileDialog(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -152,7 +153,7 @@ this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); + this.tpSettings.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip2.SuspendLayout(); this.statusStrip2.SuspendLayout(); @@ -162,7 +163,7 @@ this.groupBox3.SuspendLayout(); this.groupBox5.SuspendLayout(); this.groupBox4.SuspendLayout(); - this.tabPage2.SuspendLayout(); + this.tpNames.SuspendLayout(); this.sectionToolStrip.SuspendLayout(); this.namesPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numNamesRefreshInterval)).BeginInit(); @@ -170,7 +171,7 @@ ((System.ComponentModel.ISupportInitialize)(this.namesGridView)).BeginInit(); this.syncToolStrip.SuspendLayout(); this.toolStrip4.SuspendLayout(); - this.tabPage3.SuspendLayout(); + this.tpRecords.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gwSections)).BeginInit(); this.toolStrip3.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -226,25 +227,29 @@ // tabControl1 // this.tabControl1.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tpSettings); + this.tabControl1.Controls.Add(this.tpNames); + this.tabControl1.Controls.Add(this.tpRecords); + this.tabControl1.ImageList = this.ilTabIcons; this.tabControl1.Location = new System.Drawing.Point(0, 43); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; + this.tabControl1.ShowToolTips = true; this.tabControl1.Size = new System.Drawing.Size(577, 537); this.tabControl1.TabIndex = 0; + this.tabControl1.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControl1_Selecting); // - // tabPage1 + // tpSettings // - this.tabPage1.Controls.Add(this.panel1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(569, 511); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Ustawienia"; - this.tabPage1.UseVisualStyleBackColor = true; + this.tpSettings.Controls.Add(this.panel1); + this.tpSettings.ImageIndex = 0; + this.tpSettings.Location = new System.Drawing.Point(4, 23); + this.tpSettings.Name = "tpSettings"; + this.tpSettings.Padding = new System.Windows.Forms.Padding(3); + this.tpSettings.Size = new System.Drawing.Size(569, 510); + this.tpSettings.TabIndex = 0; + this.tpSettings.Text = "Ustawienia"; + this.tpSettings.UseVisualStyleBackColor = true; // // panel1 // @@ -260,7 +265,7 @@ this.panel1.Controls.Add(this.groupBox5); this.panel1.Controls.Add(this.groupBox4); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(3, 6); + this.panel1.Location = new System.Drawing.Point(3, 5); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(563, 502); this.panel1.TabIndex = 29; @@ -805,19 +810,20 @@ this.xResultsOverview.Size = new System.Drawing.Size(103, 21); this.xResultsOverview.TabIndex = 28; // - // tabPage2 - // - this.tabPage2.Controls.Add(this.sectionToolStrip); - this.tabPage2.Controls.Add(this.namesPanel); - this.tabPage2.Controls.Add(this.syncToolStrip); - this.tabPage2.Controls.Add(this.toolStrip4); - 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(569, 511); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Nazwiska"; - this.tabPage2.UseVisualStyleBackColor = true; + // tpNames + // + this.tpNames.Controls.Add(this.sectionToolStrip); + this.tpNames.Controls.Add(this.namesPanel); + this.tpNames.Controls.Add(this.syncToolStrip); + this.tpNames.Controls.Add(this.toolStrip4); + this.tpNames.ImageIndex = 1; + this.tpNames.Location = new System.Drawing.Point(4, 23); + this.tpNames.Name = "tpNames"; + this.tpNames.Padding = new System.Windows.Forms.Padding(3); + this.tpNames.Size = new System.Drawing.Size(569, 510); + this.tpNames.TabIndex = 1; + this.tpNames.Text = "Nazwiska"; + this.tpNames.UseVisualStyleBackColor = true; // // sectionToolStrip // @@ -828,7 +834,7 @@ this.sectionToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.cbNamesSection}); - this.sectionToolStrip.Location = new System.Drawing.Point(3, 458); + this.sectionToolStrip.Location = new System.Drawing.Point(3, 457); this.sectionToolStrip.Name = "sectionToolStrip"; this.sectionToolStrip.Size = new System.Drawing.Size(563, 25); this.sectionToolStrip.TabIndex = 30; @@ -1108,7 +1114,7 @@ this.bSync, this.eInterval, this.bAutoSync}); - this.syncToolStrip.Location = new System.Drawing.Point(3, 483); + this.syncToolStrip.Location = new System.Drawing.Point(3, 482); this.syncToolStrip.Name = "syncToolStrip"; this.syncToolStrip.Size = new System.Drawing.Size(563, 25); this.syncToolStrip.TabIndex = 27; @@ -1219,27 +1225,28 @@ this.bTruncate.Text = "Usuń nazwiska z BWS"; this.bTruncate.Click += new System.EventHandler(this.bTruncate_Click); // - // tabPage3 - // - this.tabPage3.Controls.Add(this.label17); - this.tabPage3.Controls.Add(this.label18); - this.tabPage3.Controls.Add(this.label15); - this.tabPage3.Controls.Add(this.label16); - this.tabPage3.Controls.Add(this.label13); - this.tabPage3.Controls.Add(this.label14); - this.tabPage3.Controls.Add(this.label12); - this.tabPage3.Controls.Add(this.label10); - this.tabPage3.Controls.Add(this.gwSections); - this.tabPage3.Controls.Add(this.toolStrip3); - this.tabPage3.Controls.Add(this.lRecordSections); - this.tabPage3.Controls.Add(this.label11); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(569, 511); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Rozkłady"; - this.tabPage3.UseVisualStyleBackColor = true; + // tpRecords + // + this.tpRecords.Controls.Add(this.label17); + this.tpRecords.Controls.Add(this.label18); + this.tpRecords.Controls.Add(this.label15); + this.tpRecords.Controls.Add(this.label16); + this.tpRecords.Controls.Add(this.label13); + this.tpRecords.Controls.Add(this.label14); + this.tpRecords.Controls.Add(this.label12); + this.tpRecords.Controls.Add(this.label10); + this.tpRecords.Controls.Add(this.gwSections); + this.tpRecords.Controls.Add(this.toolStrip3); + this.tpRecords.Controls.Add(this.lRecordSections); + this.tpRecords.Controls.Add(this.label11); + this.tpRecords.ImageIndex = 2; + this.tpRecords.Location = new System.Drawing.Point(4, 23); + this.tpRecords.Name = "tpRecords"; + this.tpRecords.Padding = new System.Windows.Forms.Padding(3); + this.tpRecords.Size = new System.Drawing.Size(569, 510); + this.tpRecords.TabIndex = 2; + this.tpRecords.Text = "Rozkłady"; + this.tpRecords.UseVisualStyleBackColor = true; // // label17 // @@ -1331,14 +1338,14 @@ this.gwSections.AllowUserToResizeRows = false; this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + 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.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gwSections.Location = new System.Drawing.Point(9, 118); this.gwSections.MultiSelect = false; @@ -1363,7 +1370,7 @@ this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bLoadHands, this.bClearHands}); - this.toolStrip3.Location = new System.Drawing.Point(3, 483); + this.toolStrip3.Location = new System.Drawing.Point(3, 482); this.toolStrip3.Name = "toolStrip3"; this.toolStrip3.Size = new System.Drawing.Size(563, 25); this.toolStrip3.TabIndex = 9; @@ -1408,6 +1415,15 @@ this.label11.TabIndex = 1; this.label11.Text = resources.GetString("label11.Text"); // + // ilTabIcons + // + this.ilTabIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilTabIcons.ImageStream"))); + this.ilTabIcons.TransparentColor = System.Drawing.Color.Transparent; + this.ilTabIcons.Images.SetKeyName(0, "CheckBoxHS.png"); + this.ilTabIcons.Images.SetKeyName(1, "EnvelopeHS.png"); + this.ilTabIcons.Images.SetKeyName(2, "ShowAllCommentsHS.png"); + this.ilTabIcons.Images.SetKeyName(3, "WarningHS.png"); + // // timer // this.timer.Tick += new System.EventHandler(this.timer_Tick); @@ -1487,7 +1503,7 @@ this.statusStrip1.PerformLayout(); this.groupBox1.ResumeLayout(false); this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); + this.tpSettings.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.toolStrip2.ResumeLayout(false); @@ -1506,8 +1522,8 @@ this.groupBox5.PerformLayout(); this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); + this.tpNames.ResumeLayout(false); + this.tpNames.PerformLayout(); this.sectionToolStrip.ResumeLayout(false); this.sectionToolStrip.PerformLayout(); this.namesPanel.ResumeLayout(false); @@ -1519,8 +1535,8 @@ this.syncToolStrip.PerformLayout(); this.toolStrip4.ResumeLayout(false); this.toolStrip4.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.tabPage3.PerformLayout(); + this.tpRecords.ResumeLayout(false); + this.tpRecords.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.gwSections)).EndInit(); this.toolStrip3.ResumeLayout(false); this.toolStrip3.PerformLayout(); @@ -1540,7 +1556,7 @@ private System.Windows.Forms.ToolStripStatusLabel status3; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tpSettings; public System.Windows.Forms.TextBox xPINcode; private System.Windows.Forms.Label label2; public System.Windows.Forms.CheckBox xAutoShutDownBPC; @@ -1555,7 +1571,7 @@ public System.Windows.Forms.CheckBox xShowPercentage; public System.Windows.Forms.CheckBox xRepeatResults; public System.Windows.Forms.CheckBox xShowResults; - public System.Windows.Forms.TabPage tabPage2; + public System.Windows.Forms.TabPage tpNames; public System.Windows.Forms.CheckBox xConfirmNP; public System.Windows.Forms.CheckBox xShowPlayerNames; public System.Windows.Forms.CheckBox xAutoBoardNumber; @@ -1578,7 +1594,7 @@ private System.Windows.Forms.Label lSkok; public System.Windows.Forms.ComboBox xResultsOverview; public System.Windows.Forms.CheckBox xViewHandrecord; - private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.TabPage tpRecords; private System.Windows.Forms.Label label11; private System.Windows.Forms.OpenFileDialog openPBN; public System.Windows.Forms.CheckBox xCollectPlay; @@ -1651,6 +1667,7 @@ private System.Windows.Forms.ToolStripComboBox cbNamesSection; public System.Windows.Forms.Label lPINWarning; private System.Windows.Forms.Button bRandomPIN; + private System.Windows.Forms.ImageList ilTabIcons; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 2752b31..6144a28 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -686,17 +686,21 @@ namespace Aktywator if (Array.IndexOf(unsafePINs, Int32.Parse(pin)) > -1) { this.lPINWarning.Visible = true; + this.tpRecords.Enabled = false; + this.tpRecords.ImageIndex = 3; + this.tpRecords.ToolTipText = "Wczytanie rozkładów przy przewidywalnym PINie jest niedozwolone."; if (explicitWarning) { MessageBox.Show("Próbujesz ustawić PIN, który jest łatwy do przewidzenia przez zawodników.\n\nMam nadzieję, że wiesz, co robisz!\n\nNiestety, nie możemy pozwolić Ci na wgranie do BWSa rozkładów.", "Przewidywalny PIN!", MessageBoxButtons.OK, MessageBoxIcon.Warning); this.bws.clearHandRecords(); - this.tabControl1.TabPages[2].Enabled = false; } } else { this.lPINWarning.Visible = false; - this.tabControl1.TabPages[2].Enabled = true; + this.tpRecords.Enabled = true; + this.tpRecords.ImageIndex = 2; + this.tpRecords.ToolTipText = ""; } } catch (FormatException e) @@ -718,5 +722,13 @@ namespace Aktywator { this.xPINcode.Text = this.bws._getRandomPIN(); } + + private void tabControl1_Selecting(object sender, TabControlCancelEventArgs e) + { + if (!e.TabPage.Enabled) + { + e.Cancel = true; + } + } } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 7b08637..aca1111 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -121,19 +121,47 @@ 17, 17 - 411, 17 + 100, 23 - 459, 56 + 760, 20 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s + hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f + v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 + 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN + mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// + f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU + ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 + fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa + mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa + QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII + s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW + l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO + 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t + EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt + 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA + AABJRU5ErkJggg== + + - 343, 56 + 237, 20 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACHElE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACHElE QVQ4T2P4//8/RRirICkYqyAynr7zz38Q7t/07X/z8rf/y2Y9/p/VfwsoBZFHUVy38k9w+YKPq32brkrB xECaOzb8/1+26Nf/xL5n/z3Kzk1F1gNnVCz+rdOy+u+p1P4n/61St9yBifes//K/YN63/zF9H/+7Vdz+ b5t7/Ih56iFNmDzcgMql3yZULP723zn/9H+doAXvYOK1C1/8D2u999+59OYni+wL/42T9v3Xi97cA5OH @@ -161,46 +189,6 @@ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC - - - - 564, 33 - - - 343, 21 - - - 238, 56 - - - 133, 56 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s - hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f - v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 - 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN - mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// - f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU - ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 - fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa - mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa - QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII - s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW - l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO - 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t - EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt - 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA - AABJRU5ErkJggg== @@ -221,7 +209,7 @@ - 564, 33 + 352, 59 @@ -262,17 +250,8 @@ True - - True - - - True - - - True - - 343, 21 + 17, 59 @@ -301,25 +280,8 @@ - 238, 56 + 865, 20 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY - Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 - hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt - ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL - n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 - UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX - 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM - dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg - O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj - ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW - rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 - xNmtFAAAAABJRU5ErkJggg== - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -351,6 +313,23 @@ YVXLVS8xE6wHcShj+5DDqparXmImWA/iUMb2yXZGgKZliKNmKpyFzFRrBr5AZYO1zmJW4Sxkhq767jdc yld72a9wWdvDmRpyPX53RLbnXb8mhaZH4F3ibpbz13pDviT76h14p3ofpD/5uOBd+T4fflz8xBu/xePx BZRDJQYQ19gkAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY + Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 + hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt + ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL + n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 + UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX + 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM + dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg + O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj + ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW + rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 + xNmtFAAAAABJRU5ErkJggg== @@ -388,61 +367,60 @@ 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 - gg== + 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 - 133, 56 + 142, 59 @@ -502,15 +480,73 @@ W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upl 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. + + + 353, 20 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs + CwAAAk1TRnQBSQFMAgEBBAEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL + BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 + AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ + AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES + ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK + ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ + At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa + AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ + AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs + AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa + AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG + AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET + Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA + AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu + Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs + AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ + BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA + AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA + AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 + AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L + - 527, 17 + 459, 20 - 607, 17 + 657, 20 - 710, 17 + 247, 59 @@ -538,10 +574,10 @@ to także należy ręcznie zrobić Upload. - 343, 21 + 539, 20 - 55 + 90 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 1cc075b..8ac668a 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-10-11 +2018-10-23 -- cgit v1.2.3 From e37fd194f74a7548b1fe9d7866cea2b2b64e5504 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 19:04:24 +0200 Subject: Bumping version number Fixes michzimny/aktywator#48 --- Aktywator/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aktywator/Properties/AssemblyInfo.cs b/Aktywator/Properties/AssemblyInfo.cs index 90362f9..af831a3 100644 --- a/Aktywator/Properties/AssemblyInfo.cs +++ b/Aktywator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.4.1")] -[assembly: AssemblyFileVersion("1.1.4.1")] +[assembly: AssemblyVersion("1.1.5.0")] +[assembly: AssemblyFileVersion("1.1.5.0")] -- cgit v1.2.3 From dd8c7097c8e09ee2dccbd4ab623d38390cd81bc0 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 19:54:03 +0200 Subject: Setting TD calls from bridgemates --- Aktywator/Bws.cs | 2 + Aktywator/MainForm.Designer.cs | 63 ++++---- Aktywator/MainForm.resx | 330 ++++++++++++++++++++++------------------- 3 files changed, 216 insertions(+), 179 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 7ae27b3..f742c05 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -272,6 +272,7 @@ namespace Aktywator settings.Add(new Setting("BM2RecordBidding", main.xCollectBidding, this, new Version(2, 0, 0), new Version(1, 3, 1))); settings.Add(new Setting("BM2RecordPlay", main.xCollectPlay, this, new Version(2, 0, 0), new Version(1, 3, 1))); settings.Add(new Setting("BM2ValidateLeadCard", main.xCheckLeadCard, this, new Version(3, 2, 1), new Version(2, 2, 1))); + settings.Add(new Setting("BM2TDCall", main.xCallTD, this, new Version(3, 3, 1), new Version(2, 3, 1))); return settings; } @@ -344,6 +345,7 @@ namespace Aktywator settings.Add(new Setting("BM2RecordBidding", "bit", "false")); settings.Add(new Setting("BM2RecordPlay", "bit", "false")); settings.Add(new Setting("BM2ValidateLeadCard", "bit", "false")); + settings.Add(new Setting("BM2TDCall", "bit", "false")); settings.Add(new Setting("BM2ShowPlayerNames", "integer", "0")); foreach (Setting s in settings) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index b2069f5..088e72b 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -54,6 +54,7 @@ this.cbSettingsSection = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.xCallTD = new System.Windows.Forms.CheckBox(); this.bRandomPIN = new System.Windows.Forms.Button(); this.lPINWarning = new System.Windows.Forms.Label(); this.xResetFunctionKey = new System.Windows.Forms.CheckBox(); @@ -187,7 +188,7 @@ this.status1, this.status2, this.status3}); - this.statusStrip1.Location = new System.Drawing.Point(0, 586); + this.statusStrip1.Location = new System.Drawing.Point(0, 598); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(583, 22); this.statusStrip1.SizingGrip = false; @@ -220,7 +221,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(583, 586); + this.groupBox1.Size = new System.Drawing.Size(583, 598); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // @@ -235,7 +236,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(577, 537); + this.tabControl1.Size = new System.Drawing.Size(577, 551); this.tabControl1.TabIndex = 0; this.tabControl1.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControl1_Selecting); // @@ -246,7 +247,7 @@ this.tpSettings.Location = new System.Drawing.Point(4, 23); this.tpSettings.Name = "tpSettings"; this.tpSettings.Padding = new System.Windows.Forms.Padding(3); - this.tpSettings.Size = new System.Drawing.Size(569, 510); + this.tpSettings.Size = new System.Drawing.Size(569, 524); this.tpSettings.TabIndex = 0; this.tpSettings.Text = "Ustawienia"; this.tpSettings.UseVisualStyleBackColor = true; @@ -265,9 +266,9 @@ this.panel1.Controls.Add(this.groupBox5); this.panel1.Controls.Add(this.groupBox4); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(3, 5); + this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(563, 502); + this.panel1.Size = new System.Drawing.Size(563, 518); this.panel1.TabIndex = 29; // // toolStrip2 @@ -280,7 +281,7 @@ this.bLoad, this.bSave}); this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; - this.toolStrip2.Location = new System.Drawing.Point(0, 455); + this.toolStrip2.Location = new System.Drawing.Point(0, 471); this.toolStrip2.Name = "toolStrip2"; this.toolStrip2.Size = new System.Drawing.Size(563, 25); this.toolStrip2.TabIndex = 51; @@ -316,7 +317,7 @@ this.lDetectedVersion, this.toolStripStatusLabel3, this.lRequiredFirmware}); - this.statusStrip2.Location = new System.Drawing.Point(0, 480); + this.statusStrip2.Location = new System.Drawing.Point(0, 496); this.statusStrip2.Name = "statusStrip2"; this.statusStrip2.Size = new System.Drawing.Size(563, 22); this.statusStrip2.SizingGrip = false; @@ -400,6 +401,7 @@ // // groupBox7 // + this.groupBox7.Controls.Add(this.xCallTD); this.groupBox7.Controls.Add(this.bRandomPIN); this.groupBox7.Controls.Add(this.lPINWarning); this.groupBox7.Controls.Add(this.xResetFunctionKey); @@ -409,11 +411,21 @@ this.groupBox7.Controls.Add(this.xScoreCorrection); this.groupBox7.Location = new System.Drawing.Point(268, 324); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(294, 121); + this.groupBox7.Size = new System.Drawing.Size(294, 143); this.groupBox7.TabIndex = 44; this.groupBox7.TabStop = false; this.groupBox7.Text = "Opcje sędziowskie"; // + // xCallTD + // + this.xCallTD.AutoSize = true; + this.xCallTD.Location = new System.Drawing.Point(13, 115); + this.xCallTD.Name = "xCallTD"; + this.xCallTD.Size = new System.Drawing.Size(186, 17); + this.xCallTD.TabIndex = 32; + this.xCallTD.Text = "zawodnik może wezwać sędziego"; + this.xCallTD.UseVisualStyleBackColor = true; + // // bRandomPIN // this.bRandomPIN.Image = ((System.Drawing.Image)(resources.GetObject("bRandomPIN.Image"))); @@ -676,7 +688,7 @@ this.groupBox5.Controls.Add(this.xViewHandrecord); this.groupBox5.Location = new System.Drawing.Point(5, 324); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(257, 121); + this.groupBox5.Size = new System.Drawing.Size(257, 143); this.groupBox5.TabIndex = 42; this.groupBox5.TabStop = false; this.groupBox5.Text = "Rozkłady"; @@ -820,7 +832,7 @@ this.tpNames.Location = new System.Drawing.Point(4, 23); this.tpNames.Name = "tpNames"; this.tpNames.Padding = new System.Windows.Forms.Padding(3); - this.tpNames.Size = new System.Drawing.Size(569, 510); + this.tpNames.Size = new System.Drawing.Size(569, 524); this.tpNames.TabIndex = 1; this.tpNames.Text = "Nazwiska"; this.tpNames.UseVisualStyleBackColor = true; @@ -834,7 +846,7 @@ this.sectionToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.cbNamesSection}); - this.sectionToolStrip.Location = new System.Drawing.Point(3, 457); + this.sectionToolStrip.Location = new System.Drawing.Point(3, 471); this.sectionToolStrip.Name = "sectionToolStrip"; this.sectionToolStrip.Size = new System.Drawing.Size(563, 25); this.sectionToolStrip.TabIndex = 30; @@ -1114,7 +1126,7 @@ this.bSync, this.eInterval, this.bAutoSync}); - this.syncToolStrip.Location = new System.Drawing.Point(3, 482); + this.syncToolStrip.Location = new System.Drawing.Point(3, 496); this.syncToolStrip.Name = "syncToolStrip"; this.syncToolStrip.Size = new System.Drawing.Size(563, 25); this.syncToolStrip.TabIndex = 27; @@ -1243,7 +1255,7 @@ this.tpRecords.Location = new System.Drawing.Point(4, 23); this.tpRecords.Name = "tpRecords"; this.tpRecords.Padding = new System.Windows.Forms.Padding(3); - this.tpRecords.Size = new System.Drawing.Size(569, 510); + this.tpRecords.Size = new System.Drawing.Size(569, 524); this.tpRecords.TabIndex = 2; this.tpRecords.Text = "Rozkłady"; this.tpRecords.UseVisualStyleBackColor = true; @@ -1338,14 +1350,14 @@ this.gwSections.AllowUserToResizeRows = false; this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - 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.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gwSections.Location = new System.Drawing.Point(9, 118); this.gwSections.MultiSelect = false; @@ -1370,7 +1382,7 @@ this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bLoadHands, this.bClearHands}); - this.toolStrip3.Location = new System.Drawing.Point(3, 482); + this.toolStrip3.Location = new System.Drawing.Point(3, 496); this.toolStrip3.Name = "toolStrip3"; this.toolStrip3.Size = new System.Drawing.Size(563, 25); this.toolStrip3.TabIndex = 9; @@ -1486,7 +1498,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(583, 608); + this.ClientSize = new System.Drawing.Size(583, 620); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.groupBox1); this.Controls.Add(this.statusStrip1); @@ -1668,6 +1680,7 @@ public System.Windows.Forms.Label lPINWarning; private System.Windows.Forms.Button bRandomPIN; private System.Windows.Forms.ImageList ilTabIcons; + public System.Windows.Forms.CheckBox xCallTD; } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index aca1111..841d6f6 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -126,38 +126,10 @@ 760, 20 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s - hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f - v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 - 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN - mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// - f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU - ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 - fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa - mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa - QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII - s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW - l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO - 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t - EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt - 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA - AABJRU5ErkJggg== - - 237, 20 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -189,6 +161,104 @@ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC + + + + 352, 59 + + + 17, 59 + + + 865, 20 + + + 142, 59 + + + 353, 20 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs + CwAAAk1TRnQBSQFMAgEBBAEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL + BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 + AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ + AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES + ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK + ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ + At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa + AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ + AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs + AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa + AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG + AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET + Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA + AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu + Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs + AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ + BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA + AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA + AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 + AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s + hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f + v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 + 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN + mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// + f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU + ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 + fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa + mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa + QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII + s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW + l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO + 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t + EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt + 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA + AABJRU5ErkJggg== @@ -250,6 +320,15 @@ True + + True + + + True + + + True + 17, 59 @@ -282,6 +361,23 @@ 865, 20 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY + Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 + hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt + ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL + n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 + UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX + 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM + dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg + O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj + ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW + rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 + xNmtFAAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -313,23 +409,6 @@ YVXLVS8xE6wHcShj+5DDqparXmImWA/iUMb2yXZGgKZliKNmKpyFzFRrBr5AZYO1zmJW4Sxkhq767jdc yld72a9wWdvDmRpyPX53RLbnXb8mhaZH4F3ibpbz13pDviT76h14p3ofpD/5uOBd+T4fflz8xBu/xePx BZRDJQYQ19gkAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY - Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 - hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt - ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL - n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 - UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX - 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM - dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg - O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj - ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW - rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 - xNmtFAAAAABJRU5ErkJggg== @@ -367,56 +446,57 @@ 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 + gg== @@ -480,64 +560,6 @@ W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upl 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. - - - 353, 20 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL - BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 - AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ - AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES - ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK - ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ - At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa - AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ - AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs - AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa - AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG - AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET - Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA - AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu - Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs - AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ - BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA - AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA - AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 - AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L - 459, 20 -- cgit v1.2.3 From 3bbab1df5cd9caf178e6efc63e28a3898a8aaed2 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 23 Oct 2018 23:02:31 +0200 Subject: Changelog --- Aktywator.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Aktywator.txt b/Aktywator.txt index b95fa55..f10a95c 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -8,6 +8,7 @@ Aktywator 1.1.5 (dev) - losowanie PINu przy inicjalizacji - możliwość ręcznego wylosowania PINu - wyłączanie rozkładów przy wykryciu "łatwego" PINu + * opcja wezwania sędziego z pierniczka Aktywator 1.1.4 05.10.2018 [mkl] -- cgit v1.2.3 From 5adb7bd504505036d3f32c5afcc6e3a5835f2d4a Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 00:39:10 +0200 Subject: Hand record upload error handling improved --- Aktywator/MainForm.cs | 10 +++++++--- Aktywator/PBN.cs | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 6144a28..09e191d 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -536,15 +536,19 @@ namespace Aktywator confirmMsg.Append("\nNagłówek pliku: " + pbn.title); } confirmMsg.Append("\nPierwszy rozkład: "); - for (int i = 0; i < pbn.handRecords[bws.lowBoard()].north.Length; i++) + int lowBoard = bws.lowBoard(); + while (lowBoard < pbn.handRecords.Length && pbn.handRecords[lowBoard] == null) { + lowBoard++; + } + for (int i = 0; i < pbn.handRecords[lowBoard].north.Length; i++) { - if ("".Equals(pbn.handRecords[bws.lowBoard()].north[i])) + if ("".Equals(pbn.handRecords[lowBoard].north[i])) { confirmMsg.Append("renons, "); } else { - confirmMsg.Append(pbn.handRecords[bws.lowBoard()].north[i]); + confirmMsg.Append(pbn.handRecords[lowBoard].north[i]); break; } } diff --git a/Aktywator/PBN.cs b/Aktywator/PBN.cs index e312d63..2e36aef 100644 --- a/Aktywator/PBN.cs +++ b/Aktywator/PBN.cs @@ -43,6 +43,10 @@ namespace Aktywator this._count++; } } + if (this._count == 0) + { + throw new Exception("PBN nie zawiera rozdań z zadanego przedziału"); + } if (pbn.Boards.Count > 0 && pbn.Boards[0].HasField("Event")) { this._title = pbn.Boards[0].GetField("Event"); -- cgit v1.2.3 From a5f9526a9c52a3728f3f003954df5369b06c2192 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 00:39:44 +0200 Subject: UI for board result display --- Aktywator/Bws.cs | 5 +- Aktywator/MainForm.Designer.cs | 333 ++++++++++++++++++++++---------------- Aktywator/MainForm.cs | 72 +++++---- Aktywator/MainForm.resx | 332 ++++++++++++++++++------------------- Aktywator/Resources/BuildDate.txt | 2 +- 5 files changed, 394 insertions(+), 350 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index f742c05..4c4586e 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -119,7 +119,6 @@ namespace Aktywator this.setHandRecordInfo(board.Key); } } - main.xShowResults_CheckedChanged(null, EventArgs.Empty); if (this.detectDifferentRecordsInSections()) { if (main.xGroupSections.Checked) @@ -129,6 +128,7 @@ namespace Aktywator } Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked); } + main.checkRecordsForSectionGroups(); } private void setHandRecordInfo(int board, string section = null, List layout = null, bool analysis = false) @@ -524,7 +524,8 @@ namespace Aktywator int resultsOverview = 0; int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview); main.xResultsOverview.SelectedIndex = resultsOverview; - main.xGroupSections.Checked = this.getSectionGroupCount() <= 1; + + main.checkRecordsForSectionGroups(); if (section == null && main.cbSettingsSection.Items.Count > 2) { diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 088e72b..e21e2b3 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -53,7 +53,12 @@ this.lFirstSectorSettings = new System.Windows.Forms.Label(); this.cbSettingsSection = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.xCheckLeadCard = new System.Windows.Forms.CheckBox(); + this.xLeadCard = new System.Windows.Forms.CheckBox(); + this.xViewHandrecord = new System.Windows.Forms.CheckBox(); this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.xAutoShutDownBPC = new System.Windows.Forms.CheckBox(); this.xCallTD = new System.Windows.Forms.CheckBox(); this.bRandomPIN = new System.Windows.Forms.Button(); this.lPINWarning = new System.Windows.Forms.Label(); @@ -68,7 +73,6 @@ this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox(); this.xShowPlayerNames = new System.Windows.Forms.CheckBox(); this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.xAutoShutDownBPC = new System.Windows.Forms.CheckBox(); this.xRemainingBoards = new System.Windows.Forms.CheckBox(); this.xNextSeatings = new System.Windows.Forms.CheckBox(); this.xScoreRecap = new System.Windows.Forms.CheckBox(); @@ -79,16 +83,16 @@ this.xIntermediateResults = new System.Windows.Forms.CheckBox(); this.xAutoBoardNumber = new System.Windows.Forms.CheckBox(); this.xCollectBidding = new System.Windows.Forms.CheckBox(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.xCheckLeadCard = new System.Windows.Forms.CheckBox(); - this.xLeadCard = new System.Windows.Forms.CheckBox(); - this.xViewHandrecord = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.rbIMPButler = new System.Windows.Forms.RadioButton(); + this.rbIMPCavendish = new System.Windows.Forms.RadioButton(); + this.rbIMPTeams = new System.Windows.Forms.RadioButton(); + this.rbMatchpoints = new System.Windows.Forms.RadioButton(); this.lGroupSectionsWarning = new System.Windows.Forms.Label(); - this.xGroupSections = new System.Windows.Forms.CheckBox(); this.xShowResults = new System.Windows.Forms.CheckBox(); - this.xRepeatResults = new System.Windows.Forms.CheckBox(); + this.xGroupSections = new System.Windows.Forms.CheckBox(); this.xShowPercentage = new System.Windows.Forms.CheckBox(); + this.xRepeatResults = new System.Windows.Forms.CheckBox(); this.xShowContract = new System.Windows.Forms.CheckBox(); this.xResultsOverview = new System.Windows.Forms.ComboBox(); this.tpNames = new System.Windows.Forms.TabPage(); @@ -158,11 +162,11 @@ this.panel1.SuspendLayout(); this.toolStrip2.SuspendLayout(); this.statusStrip2.SuspendLayout(); + this.groupBox5.SuspendLayout(); this.groupBox7.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox6.SuspendLayout(); this.groupBox3.SuspendLayout(); - this.groupBox5.SuspendLayout(); this.groupBox4.SuspendLayout(); this.tpNames.SuspendLayout(); this.sectionToolStrip.SuspendLayout(); @@ -188,9 +192,9 @@ this.status1, this.status2, this.status3}); - this.statusStrip1.Location = new System.Drawing.Point(0, 598); + this.statusStrip1.Location = new System.Drawing.Point(0, 633); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(583, 22); + this.statusStrip1.Size = new System.Drawing.Size(632, 22); this.statusStrip1.SizingGrip = false; this.statusStrip1.TabIndex = 2; this.statusStrip1.Text = "statusBar"; @@ -221,7 +225,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(583, 598); + this.groupBox1.Size = new System.Drawing.Size(632, 633); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // @@ -232,11 +236,11 @@ this.tabControl1.Controls.Add(this.tpNames); this.tabControl1.Controls.Add(this.tpRecords); this.tabControl1.ImageList = this.ilTabIcons; - this.tabControl1.Location = new System.Drawing.Point(0, 43); + this.tabControl1.Location = new System.Drawing.Point(6, 43); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(577, 551); + this.tabControl1.Size = new System.Drawing.Size(620, 584); this.tabControl1.TabIndex = 0; this.tabControl1.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControl1_Selecting); // @@ -247,7 +251,7 @@ this.tpSettings.Location = new System.Drawing.Point(4, 23); this.tpSettings.Name = "tpSettings"; this.tpSettings.Padding = new System.Windows.Forms.Padding(3); - this.tpSettings.Size = new System.Drawing.Size(569, 524); + this.tpSettings.Size = new System.Drawing.Size(612, 557); this.tpSettings.TabIndex = 0; this.tpSettings.Text = "Ustawienia"; this.tpSettings.UseVisualStyleBackColor = true; @@ -259,16 +263,16 @@ this.panel1.Controls.Add(this.lFirstSectorSettings); this.panel1.Controls.Add(this.cbSettingsSection); this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.groupBox5); this.panel1.Controls.Add(this.groupBox7); this.panel1.Controls.Add(this.groupBox2); this.panel1.Controls.Add(this.groupBox6); this.panel1.Controls.Add(this.groupBox3); - this.panel1.Controls.Add(this.groupBox5); this.panel1.Controls.Add(this.groupBox4); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Location = new System.Drawing.Point(3, 6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(563, 518); + this.panel1.Size = new System.Drawing.Size(606, 548); this.panel1.TabIndex = 29; // // toolStrip2 @@ -281,9 +285,9 @@ this.bLoad, this.bSave}); this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; - this.toolStrip2.Location = new System.Drawing.Point(0, 471); + this.toolStrip2.Location = new System.Drawing.Point(0, 501); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(563, 25); + this.toolStrip2.Size = new System.Drawing.Size(606, 25); this.toolStrip2.TabIndex = 51; this.toolStrip2.Text = "toolStrip2"; // @@ -317,9 +321,9 @@ this.lDetectedVersion, this.toolStripStatusLabel3, this.lRequiredFirmware}); - this.statusStrip2.Location = new System.Drawing.Point(0, 496); + this.statusStrip2.Location = new System.Drawing.Point(0, 526); this.statusStrip2.Name = "statusStrip2"; - this.statusStrip2.Size = new System.Drawing.Size(563, 22); + this.statusStrip2.Size = new System.Drawing.Size(606, 22); this.statusStrip2.SizingGrip = false; this.statusStrip2.TabIndex = 50; this.statusStrip2.Text = "statusStrip2"; @@ -399,8 +403,52 @@ this.label1.TabIndex = 47; this.label1.Text = "Sektor:"; // + // groupBox5 + // + this.groupBox5.Controls.Add(this.xCheckLeadCard); + this.groupBox5.Controls.Add(this.xLeadCard); + this.groupBox5.Controls.Add(this.xViewHandrecord); + this.groupBox5.Location = new System.Drawing.Point(309, 34); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(295, 114); + this.groupBox5.TabIndex = 42; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Rozkłady"; + // + // xCheckLeadCard + // + this.xCheckLeadCard.AutoSize = true; + this.xCheckLeadCard.Location = new System.Drawing.Point(13, 65); + this.xCheckLeadCard.Name = "xCheckLeadCard"; + this.xCheckLeadCard.Size = new System.Drawing.Size(180, 17); + this.xCheckLeadCard.TabIndex = 32; + this.xCheckLeadCard.Text = "sprawdź kartę wistu z rozkładem"; + this.xCheckLeadCard.UseVisualStyleBackColor = true; + // + // xLeadCard + // + this.xLeadCard.AutoSize = true; + this.xLeadCard.Location = new System.Drawing.Point(13, 42); + this.xLeadCard.Name = "xLeadCard"; + this.xLeadCard.Size = new System.Drawing.Size(111, 17); + this.xLeadCard.TabIndex = 21; + this.xLeadCard.Text = "pytaj o kartę wistu"; + this.xLeadCard.UseVisualStyleBackColor = true; + // + // xViewHandrecord + // + this.xViewHandrecord.AutoSize = true; + this.xViewHandrecord.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.xViewHandrecord.Location = new System.Drawing.Point(13, 19); + this.xViewHandrecord.Name = "xViewHandrecord"; + this.xViewHandrecord.Size = new System.Drawing.Size(123, 17); + this.xViewHandrecord.TabIndex = 29; + this.xViewHandrecord.Text = "pokazuj rozkłady"; + this.xViewHandrecord.UseVisualStyleBackColor = true; + // // groupBox7 // + this.groupBox7.Controls.Add(this.xAutoShutDownBPC); this.groupBox7.Controls.Add(this.xCallTD); this.groupBox7.Controls.Add(this.bRandomPIN); this.groupBox7.Controls.Add(this.lPINWarning); @@ -409,13 +457,23 @@ this.groupBox7.Controls.Add(this.xPINcode); this.groupBox7.Controls.Add(this.xConfirmNP); this.groupBox7.Controls.Add(this.xScoreCorrection); - this.groupBox7.Location = new System.Drawing.Point(268, 324); + this.groupBox7.Location = new System.Drawing.Point(309, 300); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(294, 143); + this.groupBox7.Size = new System.Drawing.Size(294, 190); this.groupBox7.TabIndex = 44; this.groupBox7.TabStop = false; this.groupBox7.Text = "Opcje sędziowskie"; // + // xAutoShutDownBPC + // + this.xAutoShutDownBPC.AutoSize = true; + this.xAutoShutDownBPC.Location = new System.Drawing.Point(13, 138); + this.xAutoShutDownBPC.Name = "xAutoShutDownBPC"; + this.xAutoShutDownBPC.Size = new System.Drawing.Size(166, 17); + this.xAutoShutDownBPC.TabIndex = 17; + this.xAutoShutDownBPC.Text = "automat. wyłącz BCS po sesji"; + this.xAutoShutDownBPC.UseVisualStyleBackColor = true; + // // xCallTD // this.xCallTD.AutoSize = true; @@ -505,7 +563,7 @@ this.groupBox2.Controls.Add(this.xShowPlayerNames); this.groupBox2.Location = new System.Drawing.Point(6, 34); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(256, 138); + this.groupBox2.Size = new System.Drawing.Size(294, 114); this.groupBox2.TabIndex = 39; this.groupBox2.TabStop = false; this.groupBox2.Text = "Rozstawienie"; @@ -513,7 +571,7 @@ // xMemberNumbers // this.xMemberNumbers.AutoSize = true; - this.xMemberNumbers.Location = new System.Drawing.Point(12, 67); + this.xMemberNumbers.Location = new System.Drawing.Point(11, 65); this.xMemberNumbers.Name = "xMemberNumbers"; this.xMemberNumbers.Size = new System.Drawing.Size(133, 17); this.xMemberNumbers.TabIndex = 6; @@ -524,7 +582,7 @@ // xShowPairNumbers // this.xShowPairNumbers.AutoSize = true; - this.xShowPairNumbers.Location = new System.Drawing.Point(12, 44); + this.xShowPairNumbers.Location = new System.Drawing.Point(11, 42); this.xShowPairNumbers.Name = "xShowPairNumbers"; this.xShowPairNumbers.Size = new System.Drawing.Size(118, 17); this.xShowPairNumbers.TabIndex = 5; @@ -535,7 +593,7 @@ // this.xMemberNumbersNoBlankEntry.AutoSize = true; this.xMemberNumbersNoBlankEntry.Enabled = false; - this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(33, 90); + this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(34, 88); this.xMemberNumbersNoBlankEntry.Name = "xMemberNumbersNoBlankEntry"; this.xMemberNumbersNoBlankEntry.Size = new System.Drawing.Size(131, 17); this.xMemberNumbersNoBlankEntry.TabIndex = 7; @@ -546,7 +604,7 @@ // this.xShowPlayerNames.AutoSize = true; this.xShowPlayerNames.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.xShowPlayerNames.Location = new System.Drawing.Point(12, 21); + this.xShowPlayerNames.Location = new System.Drawing.Point(11, 19); this.xShowPlayerNames.Name = "xShowPlayerNames"; this.xShowPlayerNames.Size = new System.Drawing.Size(126, 17); this.xShowPlayerNames.TabIndex = 9; @@ -555,28 +613,17 @@ // // groupBox6 // - this.groupBox6.Controls.Add(this.xAutoShutDownBPC); this.groupBox6.Controls.Add(this.xRemainingBoards); this.groupBox6.Controls.Add(this.xNextSeatings); this.groupBox6.Controls.Add(this.xScoreRecap); this.groupBox6.Controls.Add(this.xAutoShowScoreRecap); - this.groupBox6.Location = new System.Drawing.Point(268, 178); + this.groupBox6.Location = new System.Drawing.Point(309, 154); this.groupBox6.Name = "groupBox6"; this.groupBox6.Size = new System.Drawing.Size(294, 140); this.groupBox6.TabIndex = 43; this.groupBox6.TabStop = false; this.groupBox6.Text = "Koniec rundy"; // - // xAutoShutDownBPC - // - this.xAutoShutDownBPC.AutoSize = true; - this.xAutoShutDownBPC.Location = new System.Drawing.Point(13, 114); - this.xAutoShutDownBPC.Name = "xAutoShutDownBPC"; - this.xAutoShutDownBPC.Size = new System.Drawing.Size(166, 17); - this.xAutoShutDownBPC.TabIndex = 17; - this.xAutoShutDownBPC.Text = "automat. wyłącz BCS po sesji"; - this.xAutoShutDownBPC.UseVisualStyleBackColor = true; - // // xRemainingBoards // this.xRemainingBoards.AutoSize = true; @@ -624,9 +671,9 @@ this.groupBox3.Controls.Add(this.xIntermediateResults); this.groupBox3.Controls.Add(this.xAutoBoardNumber); this.groupBox3.Controls.Add(this.xCollectBidding); - this.groupBox3.Location = new System.Drawing.Point(4, 178); + this.groupBox3.Location = new System.Drawing.Point(5, 154); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(257, 140); + this.groupBox3.Size = new System.Drawing.Size(295, 140); this.groupBox3.TabIndex = 40; this.groupBox3.TabStop = false; this.groupBox3.Text = "Zapis rozdania"; @@ -681,124 +728,128 @@ this.xCollectBidding.Text = "zbieraj licytację"; this.xCollectBidding.UseVisualStyleBackColor = true; // - // groupBox5 - // - this.groupBox5.Controls.Add(this.xCheckLeadCard); - this.groupBox5.Controls.Add(this.xLeadCard); - this.groupBox5.Controls.Add(this.xViewHandrecord); - this.groupBox5.Location = new System.Drawing.Point(5, 324); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(257, 143); - this.groupBox5.TabIndex = 42; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Rozkłady"; - // - // xCheckLeadCard - // - this.xCheckLeadCard.AutoSize = true; - this.xCheckLeadCard.Location = new System.Drawing.Point(12, 71); - this.xCheckLeadCard.Name = "xCheckLeadCard"; - this.xCheckLeadCard.Size = new System.Drawing.Size(180, 17); - this.xCheckLeadCard.TabIndex = 32; - this.xCheckLeadCard.Text = "sprawdź kartę wistu z rozkładem"; - this.xCheckLeadCard.UseVisualStyleBackColor = true; - // - // xLeadCard - // - this.xLeadCard.AutoSize = true; - this.xLeadCard.Location = new System.Drawing.Point(12, 48); - this.xLeadCard.Name = "xLeadCard"; - this.xLeadCard.Size = new System.Drawing.Size(111, 17); - this.xLeadCard.TabIndex = 21; - this.xLeadCard.Text = "pytaj o kartę wistu"; - this.xLeadCard.UseVisualStyleBackColor = true; - // - // xViewHandrecord - // - this.xViewHandrecord.AutoSize = true; - this.xViewHandrecord.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.xViewHandrecord.Location = new System.Drawing.Point(12, 25); - this.xViewHandrecord.Name = "xViewHandrecord"; - this.xViewHandrecord.Size = new System.Drawing.Size(123, 17); - this.xViewHandrecord.TabIndex = 29; - this.xViewHandrecord.Text = "pokazuj rozkłady"; - this.xViewHandrecord.UseVisualStyleBackColor = true; - // // groupBox4 // + this.groupBox4.Controls.Add(this.rbIMPButler); + this.groupBox4.Controls.Add(this.rbIMPCavendish); + this.groupBox4.Controls.Add(this.rbIMPTeams); + this.groupBox4.Controls.Add(this.rbMatchpoints); this.groupBox4.Controls.Add(this.lGroupSectionsWarning); - this.groupBox4.Controls.Add(this.xGroupSections); this.groupBox4.Controls.Add(this.xShowResults); - this.groupBox4.Controls.Add(this.xRepeatResults); + this.groupBox4.Controls.Add(this.xGroupSections); this.groupBox4.Controls.Add(this.xShowPercentage); + this.groupBox4.Controls.Add(this.xRepeatResults); this.groupBox4.Controls.Add(this.xShowContract); this.groupBox4.Controls.Add(this.xResultsOverview); - this.groupBox4.Location = new System.Drawing.Point(268, 34); + this.groupBox4.Location = new System.Drawing.Point(6, 300); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(294, 138); + this.groupBox4.Size = new System.Drawing.Size(294, 190); this.groupBox4.TabIndex = 41; this.groupBox4.TabStop = false; this.groupBox4.Text = "Protokół"; // + // rbIMPButler + // + this.rbIMPButler.AutoSize = true; + this.rbIMPButler.Enabled = false; + this.rbIMPButler.Location = new System.Drawing.Point(126, 136); + this.rbIMPButler.Name = "rbIMPButler"; + this.rbIMPButler.Size = new System.Drawing.Size(79, 17); + this.rbIMPButler.TabIndex = 33; + this.rbIMPButler.Text = "IMP (butler)"; + this.rbIMPButler.UseVisualStyleBackColor = true; + // + // rbIMPCavendish + // + this.rbIMPCavendish.AutoSize = true; + this.rbIMPCavendish.Enabled = false; + this.rbIMPCavendish.Location = new System.Drawing.Point(126, 112); + this.rbIMPCavendish.Name = "rbIMPCavendish"; + this.rbIMPCavendish.Size = new System.Drawing.Size(102, 17); + this.rbIMPCavendish.TabIndex = 32; + this.rbIMPCavendish.Text = "IMP (cavendish)"; + this.rbIMPCavendish.UseVisualStyleBackColor = true; + // + // rbIMPTeams + // + this.rbIMPTeams.AutoSize = true; + this.rbIMPTeams.Enabled = false; + this.rbIMPTeams.Location = new System.Drawing.Point(34, 136); + this.rbIMPTeams.Name = "rbIMPTeams"; + this.rbIMPTeams.Size = new System.Drawing.Size(81, 17); + this.rbIMPTeams.TabIndex = 31; + this.rbIMPTeams.Text = "IMP (teamy)"; + this.rbIMPTeams.UseVisualStyleBackColor = true; + // + // rbMatchpoints + // + this.rbMatchpoints.AutoSize = true; + this.rbMatchpoints.Enabled = false; + this.rbMatchpoints.Location = new System.Drawing.Point(34, 112); + this.rbMatchpoints.Name = "rbMatchpoints"; + this.rbMatchpoints.Size = new System.Drawing.Size(67, 17); + this.rbMatchpoints.TabIndex = 30; + this.rbMatchpoints.Text = "% maksa"; + this.rbMatchpoints.UseVisualStyleBackColor = true; + // // lGroupSectionsWarning // this.lGroupSectionsWarning.Cursor = System.Windows.Forms.Cursors.Help; this.lGroupSectionsWarning.Image = ((System.Drawing.Image)(resources.GetObject("lGroupSectionsWarning.Image"))); - this.lGroupSectionsWarning.Location = new System.Drawing.Point(9, 87); + this.lGroupSectionsWarning.Location = new System.Drawing.Point(9, 18); this.lGroupSectionsWarning.Name = "lGroupSectionsWarning"; this.lGroupSectionsWarning.Size = new System.Drawing.Size(22, 18); this.lGroupSectionsWarning.TabIndex = 29; this.lGroupSectionsWarning.Visible = false; this.lGroupSectionsWarning.Click += new System.EventHandler(this.lGroupSectionsWarning_Click); // + // xShowResults + // + this.xShowResults.AutoSize = true; + this.xShowResults.Location = new System.Drawing.Point(11, 42); + this.xShowResults.Name = "xShowResults"; + this.xShowResults.Size = new System.Drawing.Size(161, 17); + this.xShowResults.TabIndex = 1; + this.xShowResults.Text = "pokazuj zapisy rozdania jako"; + this.xShowResults.UseVisualStyleBackColor = true; + this.xShowResults.CheckedChanged += new System.EventHandler(this.xShowResults_CheckedChanged); + // // xGroupSections // this.xGroupSections.AutoSize = true; - this.xGroupSections.Enabled = false; - this.xGroupSections.Location = new System.Drawing.Point(34, 89); + this.xGroupSections.Location = new System.Drawing.Point(34, 19); this.xGroupSections.Name = "xGroupSections"; - this.xGroupSections.Size = new System.Drawing.Size(227, 17); + this.xGroupSections.Size = new System.Drawing.Size(181, 17); this.xGroupSections.TabIndex = 4; - this.xGroupSections.Text = "wspólne maksowanie wszystkich sektorów"; + this.xGroupSections.Text = "wspólny dla wszystkich sektorów"; this.xGroupSections.UseVisualStyleBackColor = true; // - // xShowResults + // xShowPercentage // - this.xShowResults.AutoSize = true; - this.xShowResults.Location = new System.Drawing.Point(13, 20); - this.xShowResults.Name = "xShowResults"; - this.xShowResults.Size = new System.Drawing.Size(159, 17); - this.xShowResults.TabIndex = 1; - this.xShowResults.Text = "pokazuj wynik rozdania jako"; - this.xShowResults.UseVisualStyleBackColor = true; - this.xShowResults.CheckedChanged += new System.EventHandler(this.xShowResults_CheckedChanged); + this.xShowPercentage.AutoSize = true; + this.xShowPercentage.Location = new System.Drawing.Point(11, 88); + this.xShowPercentage.Name = "xShowPercentage"; + this.xShowPercentage.Size = new System.Drawing.Size(128, 17); + this.xShowPercentage.TabIndex = 3; + this.xShowPercentage.Text = "pokaż wynik rozdania"; + this.xShowPercentage.UseVisualStyleBackColor = true; + this.xShowPercentage.CheckedChanged += new System.EventHandler(this.xShowPercentage_CheckedChanged); // // xRepeatResults // this.xRepeatResults.AutoSize = true; this.xRepeatResults.Enabled = false; - this.xRepeatResults.Location = new System.Drawing.Point(34, 43); + this.xRepeatResults.Location = new System.Drawing.Point(34, 65); this.xRepeatResults.Name = "xRepeatResults"; this.xRepeatResults.Size = new System.Drawing.Size(155, 17); this.xRepeatResults.TabIndex = 2; this.xRepeatResults.Text = "nieskończone przeglądanie"; this.xRepeatResults.UseVisualStyleBackColor = true; // - // xShowPercentage - // - this.xShowPercentage.AutoSize = true; - this.xShowPercentage.Enabled = false; - this.xShowPercentage.Location = new System.Drawing.Point(34, 66); - this.xShowPercentage.Name = "xShowPercentage"; - this.xShowPercentage.Size = new System.Drawing.Size(102, 17); - this.xShowPercentage.TabIndex = 3; - this.xShowPercentage.Text = "pokaż % wyniku"; - this.xShowPercentage.UseVisualStyleBackColor = true; - // // xShowContract // this.xShowContract.AutoSize = true; - this.xShowContract.Location = new System.Drawing.Point(13, 112); + this.xShowContract.Location = new System.Drawing.Point(11, 159); this.xShowContract.Name = "xShowContract"; this.xShowContract.Size = new System.Drawing.Size(150, 17); this.xShowContract.TabIndex = 20; @@ -817,7 +868,7 @@ "traveler, 6x1", "traveler, 6x2", "traveler, 4x1"}); - this.xResultsOverview.Location = new System.Drawing.Point(178, 18); + this.xResultsOverview.Location = new System.Drawing.Point(178, 40); this.xResultsOverview.Name = "xResultsOverview"; this.xResultsOverview.Size = new System.Drawing.Size(103, 21); this.xResultsOverview.TabIndex = 28; @@ -832,7 +883,7 @@ this.tpNames.Location = new System.Drawing.Point(4, 23); this.tpNames.Name = "tpNames"; this.tpNames.Padding = new System.Windows.Forms.Padding(3); - this.tpNames.Size = new System.Drawing.Size(569, 524); + this.tpNames.Size = new System.Drawing.Size(612, 557); this.tpNames.TabIndex = 1; this.tpNames.Text = "Nazwiska"; this.tpNames.UseVisualStyleBackColor = true; @@ -846,9 +897,9 @@ this.sectionToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.cbNamesSection}); - this.sectionToolStrip.Location = new System.Drawing.Point(3, 471); + this.sectionToolStrip.Location = new System.Drawing.Point(3, 504); this.sectionToolStrip.Name = "sectionToolStrip"; - this.sectionToolStrip.Size = new System.Drawing.Size(563, 25); + this.sectionToolStrip.Size = new System.Drawing.Size(606, 25); this.sectionToolStrip.TabIndex = 30; this.sectionToolStrip.Text = "toolStrip5"; // @@ -1126,9 +1177,9 @@ this.bSync, this.eInterval, this.bAutoSync}); - this.syncToolStrip.Location = new System.Drawing.Point(3, 496); + this.syncToolStrip.Location = new System.Drawing.Point(3, 529); this.syncToolStrip.Name = "syncToolStrip"; - this.syncToolStrip.Size = new System.Drawing.Size(563, 25); + this.syncToolStrip.Size = new System.Drawing.Size(606, 25); this.syncToolStrip.TabIndex = 27; this.syncToolStrip.Text = "toolStrip5"; // @@ -1172,7 +1223,7 @@ this.bTruncate}); this.toolStrip4.Location = new System.Drawing.Point(3, 3); this.toolStrip4.Name = "toolStrip4"; - this.toolStrip4.Size = new System.Drawing.Size(563, 25); + this.toolStrip4.Size = new System.Drawing.Size(606, 25); this.toolStrip4.TabIndex = 26; this.toolStrip4.Text = "toolStrip4"; // @@ -1255,7 +1306,7 @@ this.tpRecords.Location = new System.Drawing.Point(4, 23); this.tpRecords.Name = "tpRecords"; this.tpRecords.Padding = new System.Windows.Forms.Padding(3); - this.tpRecords.Size = new System.Drawing.Size(569, 524); + this.tpRecords.Size = new System.Drawing.Size(612, 557); this.tpRecords.TabIndex = 2; this.tpRecords.Text = "Rozkłady"; this.tpRecords.UseVisualStyleBackColor = true; @@ -1350,14 +1401,14 @@ this.gwSections.AllowUserToResizeRows = false; this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + 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.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gwSections.Location = new System.Drawing.Point(9, 118); this.gwSections.MultiSelect = false; @@ -1382,9 +1433,9 @@ this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bLoadHands, this.bClearHands}); - this.toolStrip3.Location = new System.Drawing.Point(3, 496); + this.toolStrip3.Location = new System.Drawing.Point(3, 529); this.toolStrip3.Name = "toolStrip3"; - this.toolStrip3.Size = new System.Drawing.Size(563, 25); + this.toolStrip3.Size = new System.Drawing.Size(606, 25); this.toolStrip3.TabIndex = 9; this.toolStrip3.Text = "toolStrip3"; // @@ -1455,7 +1506,7 @@ this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 10, 1, 5); - this.toolStrip1.Size = new System.Drawing.Size(583, 42); + this.toolStrip1.Size = new System.Drawing.Size(632, 42); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -1498,7 +1549,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(583, 620); + this.ClientSize = new System.Drawing.Size(632, 655); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.groupBox1); this.Controls.Add(this.statusStrip1); @@ -1522,6 +1573,8 @@ this.toolStrip2.PerformLayout(); this.statusStrip2.ResumeLayout(false); this.statusStrip2.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); this.groupBox7.ResumeLayout(false); this.groupBox7.PerformLayout(); this.groupBox2.ResumeLayout(false); @@ -1530,8 +1583,6 @@ this.groupBox6.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); this.tpNames.ResumeLayout(false); @@ -1681,6 +1732,10 @@ private System.Windows.Forms.Button bRandomPIN; private System.Windows.Forms.ImageList ilTabIcons; public System.Windows.Forms.CheckBox xCallTD; + private System.Windows.Forms.RadioButton rbIMPButler; + private System.Windows.Forms.RadioButton rbIMPCavendish; + private System.Windows.Forms.RadioButton rbIMPTeams; + private System.Windows.Forms.RadioButton rbMatchpoints; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 09e191d..ecf52c5 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -85,20 +85,48 @@ namespace Aktywator bindSettingChanges(); bws.loadSettings(); + this.checkRecordsForSectionGroups(); + tournament = this.detectTeamyTournament(); if (tournament != null) { updateTournamentInfo(tournament); + this.rbIMPTeams.Checked = true; } else { syncToolStrip.Visible = false; namesPanel.Visible = false; + this.rbMatchpoints.Checked = true; } this.WindowState = FormWindowState.Normal; } + internal void checkRecordsForSectionGroups() + { + xGroupSections.Enabled = false; + if (this.detectTeamyTournament() == null) + { + if (cbSettingsSection.Items.Count > 2) + { + if (bws.detectDifferentRecordsInSections()) + { + bws.sectionGroupWarning(); + xGroupSections.Checked = false; + } + else + { + xGroupSections.Enabled = true; + } + } + } + else + { + xGroupSections.Checked = false; + } + } + private void shortenFilenameLabel() { String originalLabel = (String)labelFilename.Text.Clone(); @@ -326,41 +354,13 @@ namespace Aktywator public void xShowResults_CheckedChanged(object sender, EventArgs e) { - if (xShowResults.Checked) - { - xRepeatResults.Enabled = true; - xShowPercentage.Enabled = true; - xResultsOverview.Enabled = true; - xGroupSections.Enabled = !bws.detectDifferentRecordsInSections(); - } - else - { - xRepeatResults.Enabled = false; - xShowPercentage.Enabled = false; - xShowPercentage.Checked = false; - xResultsOverview.Enabled = false; - xGroupSections.Enabled = false; - } - if (cbSettingsSection.Items.Count > 2 || bws.detectDifferentRecordsInSections()) - { - bws.sectionGroupWarning(); - } - if (cbSettingsSection.Items.Count <= 2) - { - xGroupSections.Enabled = false; - } + xRepeatResults.Enabled = xShowResults.Checked; + xResultsOverview.Enabled = xShowResults.Checked; } private void xMemberNumbers_CheckedChanged(object sender, EventArgs e) { - if (xMemberNumbers.Checked) - { - xMemberNumbersNoBlankEntry.Enabled = true; - } - else - { - xMemberNumbersNoBlankEntry.Enabled = false; - } + xMemberNumbersNoBlankEntry.Enabled = xMemberNumbers.Checked; } private void bMySQLTournament_Click(object sender, EventArgs e) @@ -734,5 +734,15 @@ namespace Aktywator e.Cancel = true; } } + + private void xShowPercentage_CheckedChanged(object sender, EventArgs e) + { + bool teamsTournament = (this.detectTeamyTournament() != null); + this.rbMatchpoints.Enabled = xShowPercentage.Checked && !teamsTournament; + this.rbIMPButler.Enabled = xShowPercentage.Checked && !teamsTournament; + this.rbIMPCavendish.Enabled = xShowPercentage.Checked && !teamsTournament; + this.rbIMPTeams.Enabled = xShowPercentage.Checked && teamsTournament; + } + } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 841d6f6..2150c10 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -126,10 +126,38 @@ 760, 20 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s + hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f + v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 + 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN + mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// + f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU + ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 + fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa + mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa + QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII + s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW + l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO + 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t + EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt + 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA + AABJRU5ErkJggg== + + 237, 20 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -161,104 +189,6 @@ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC - - - - 352, 59 - - - 17, 59 - - - 865, 20 - - - 142, 59 - - - 353, 20 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL - BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 - AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ - AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES - ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK - ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ - At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa - AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ - AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs - AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa - AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG - AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET - Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA - AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu - Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs - AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ - BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA - AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA - AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 - AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE+SURBVDhPY6Aa2HToxn90vG7flf8rd57/v2Tzyf+LN5/s - hirFDkAacIE5qw/8N/NKwW/I+v1XocoxwdqdJ//vOnoFbMiiTSd6oFpQwerdF6HKUUHBTOX/566d+V/f - v+S/lV862BCoFlSwfNsZqJb//x++PAfWCMPh1QL/1+089X/you24DVi86QRUO8TWY1dXgdlBZYL/bz+6 - 8P/l269gA0w9k7EbMG/dYbAGEAAZAAM/f/35/+7j9/8Pn3/Eb8CslfugWhDgz99//z99/Qk28NbDd/gN - mLZ0F1Tb//9vPt4Da/r+4/f/qw+PgNmXb7/GbwBIEgZAGpDxntN7/p+++px4A56+vf7fP0sAHHB3Hr// - f/Hmq/9Hzj8h3gDkgLt6983/k5ef/d976iFxBoBofBivASBJYjBUCzUAAwMAeL/WUt07dwcAAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU - ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 - fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa - mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa - QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII - s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW - l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO - 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t - EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt - 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA - AABJRU5ErkJggg== @@ -320,15 +250,6 @@ True - - True - - - True - - - True - 17, 59 @@ -361,23 +282,6 @@ 865, 20 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY - Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 - hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt - ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL - n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 - UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX - 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM - dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg - O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj - ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW - rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 - xNmtFAAAAABJRU5ErkJggg== - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -409,6 +313,23 @@ YVXLVS8xE6wHcShj+5DDqparXmImWA/iUMb2yXZGgKZliKNmKpyFzFRrBr5AZYO1zmJW4Sxkhq767jdc yld72a9wWdvDmRpyPX53RLbnXb8mhaZH4F3ibpbz13pDviT76h14p3ofpD/5uOBd+T4fflz8xBu/xePx BZRDJQYQ19gkAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY + Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 + hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt + ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL + n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 + UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX + 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM + dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg + O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj + ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW + rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 + xNmtFAAAAABJRU5ErkJggg== @@ -446,57 +367,56 @@ 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 - gg== + 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 @@ -560,6 +480,64 @@ W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upl 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. + + + 353, 20 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs + CwAAAk1TRnQBSQFMAgEBBAEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL + BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 + AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ + AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES + ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK + ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ + At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa + AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ + AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs + AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa + AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG + AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET + Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA + AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu + Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs + AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ + BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA + AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA + AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 + AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L + 459, 20 @@ -599,7 +577,7 @@ to także należy ręcznie zrobić Upload. 539, 20 - 90 + 25 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 8ac668a..b17142d 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-10-23 +2018-10-24 -- cgit v1.2.3 From 4e9d6eba89fe0c53ffd4629d3911e476fce518d0 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 13:07:08 +0200 Subject: Expanding tab content width --- Aktywator/MainForm.Designer.cs | 26 +++++------ Aktywator/MainForm.resx | 102 ++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index e21e2b3..faed1a2 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -939,7 +939,7 @@ this.namesPanel.Controls.Add(this.lTables); this.namesPanel.Location = new System.Drawing.Point(3, 31); this.namesPanel.Name = "namesPanel"; - this.namesPanel.Size = new System.Drawing.Size(562, 425); + this.namesPanel.Size = new System.Drawing.Size(607, 470); this.namesPanel.TabIndex = 29; // // bTeamsNamesSettings @@ -1009,7 +1009,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(3, 389); + this.label9.Location = new System.Drawing.Point(1, 436); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(499, 13); this.label9.TabIndex = 31; @@ -1065,7 +1065,7 @@ this.EastWest}); this.namesGridView.Location = new System.Drawing.Point(2, 98); this.namesGridView.Name = "namesGridView"; - this.namesGridView.Size = new System.Drawing.Size(557, 287); + this.namesGridView.Size = new System.Drawing.Size(601, 335); this.namesGridView.TabIndex = 28; this.namesGridView.CellMouseEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.namesGridView_CellMouseEnter); this.namesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.namesGridView_CellValueChanged); @@ -1144,7 +1144,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(5, 406); + this.label8.Location = new System.Drawing.Point(3, 453); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(323, 13); this.label8.TabIndex = 12; @@ -1314,7 +1314,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(458, 460); + this.label17.Location = new System.Drawing.Point(460, 507); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(71, 13); this.label17.TabIndex = 18; @@ -1324,7 +1324,7 @@ // this.label18.AutoSize = true; this.label18.BackColor = System.Drawing.SystemColors.ControlDark; - this.label18.Location = new System.Drawing.Point(432, 456); + this.label18.Location = new System.Drawing.Point(434, 503); this.label18.MinimumSize = new System.Drawing.Size(20, 20); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(20, 20); @@ -1334,7 +1334,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(322, 460); + this.label15.Location = new System.Drawing.Point(324, 507); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(104, 13); this.label15.TabIndex = 16; @@ -1344,7 +1344,7 @@ // this.label16.AutoSize = true; this.label16.BackColor = System.Drawing.Color.Crimson; - this.label16.Location = new System.Drawing.Point(296, 456); + this.label16.Location = new System.Drawing.Point(298, 503); this.label16.MinimumSize = new System.Drawing.Size(20, 20); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(20, 20); @@ -1354,7 +1354,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(156, 460); + this.label13.Location = new System.Drawing.Point(158, 507); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(134, 13); this.label13.TabIndex = 14; @@ -1365,7 +1365,7 @@ this.label14.AutoSize = true; this.label14.BackColor = System.Drawing.Color.LimeGreen; this.label14.ForeColor = System.Drawing.Color.White; - this.label14.Location = new System.Drawing.Point(130, 456); + this.label14.Location = new System.Drawing.Point(132, 503); this.label14.MinimumSize = new System.Drawing.Size(20, 20); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(20, 20); @@ -1376,7 +1376,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(34, 460); + this.label12.Location = new System.Drawing.Point(36, 507); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(90, 13); this.label12.TabIndex = 12; @@ -1386,7 +1386,7 @@ // this.label10.AutoSize = true; this.label10.BackColor = System.Drawing.Color.LimeGreen; - this.label10.Location = new System.Drawing.Point(8, 456); + this.label10.Location = new System.Drawing.Point(10, 503); this.label10.MinimumSize = new System.Drawing.Size(20, 20); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(20, 20); @@ -1418,7 +1418,7 @@ this.gwSections.ShowCellErrors = false; this.gwSections.ShowEditingIcon = false; this.gwSections.ShowRowErrors = false; - this.gwSections.Size = new System.Drawing.Size(554, 335); + this.gwSections.Size = new System.Drawing.Size(597, 382); this.gwSections.TabIndex = 10; this.gwSections.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gwSections_CellDoubleClick); this.gwSections.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gwSections_CellDoubleClick); diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 2150c10..bdb81f9 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -367,56 +367,56 @@ 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 @@ -489,7 +489,7 @@ to także należy ręcznie zrobić Upload. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBAEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From 6aedfb8b024edba840c792050403c05209896703 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 13:48:01 +0200 Subject: Rearranging UI for the scoring type options --- Aktywator/MainForm.Designer.cs | 16 ++++++++-------- Aktywator/MainForm.resx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index faed1a2..6f4bd7d 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -752,7 +752,7 @@ // this.rbIMPButler.AutoSize = true; this.rbIMPButler.Enabled = false; - this.rbIMPButler.Location = new System.Drawing.Point(126, 136); + this.rbIMPButler.Location = new System.Drawing.Point(127, 90); this.rbIMPButler.Name = "rbIMPButler"; this.rbIMPButler.Size = new System.Drawing.Size(79, 17); this.rbIMPButler.TabIndex = 33; @@ -763,7 +763,7 @@ // this.rbIMPCavendish.AutoSize = true; this.rbIMPCavendish.Enabled = false; - this.rbIMPCavendish.Location = new System.Drawing.Point(126, 112); + this.rbIMPCavendish.Location = new System.Drawing.Point(127, 66); this.rbIMPCavendish.Name = "rbIMPCavendish"; this.rbIMPCavendish.Size = new System.Drawing.Size(102, 17); this.rbIMPCavendish.TabIndex = 32; @@ -774,7 +774,7 @@ // this.rbIMPTeams.AutoSize = true; this.rbIMPTeams.Enabled = false; - this.rbIMPTeams.Location = new System.Drawing.Point(34, 136); + this.rbIMPTeams.Location = new System.Drawing.Point(35, 90); this.rbIMPTeams.Name = "rbIMPTeams"; this.rbIMPTeams.Size = new System.Drawing.Size(81, 17); this.rbIMPTeams.TabIndex = 31; @@ -785,7 +785,7 @@ // this.rbMatchpoints.AutoSize = true; this.rbMatchpoints.Enabled = false; - this.rbMatchpoints.Location = new System.Drawing.Point(34, 112); + this.rbMatchpoints.Location = new System.Drawing.Point(35, 66); this.rbMatchpoints.Name = "rbMatchpoints"; this.rbMatchpoints.Size = new System.Drawing.Size(67, 17); this.rbMatchpoints.TabIndex = 30; @@ -806,7 +806,7 @@ // xShowResults // this.xShowResults.AutoSize = true; - this.xShowResults.Location = new System.Drawing.Point(11, 42); + this.xShowResults.Location = new System.Drawing.Point(12, 113); this.xShowResults.Name = "xShowResults"; this.xShowResults.Size = new System.Drawing.Size(161, 17); this.xShowResults.TabIndex = 1; @@ -827,7 +827,7 @@ // xShowPercentage // this.xShowPercentage.AutoSize = true; - this.xShowPercentage.Location = new System.Drawing.Point(11, 88); + this.xShowPercentage.Location = new System.Drawing.Point(12, 42); this.xShowPercentage.Name = "xShowPercentage"; this.xShowPercentage.Size = new System.Drawing.Size(128, 17); this.xShowPercentage.TabIndex = 3; @@ -839,7 +839,7 @@ // this.xRepeatResults.AutoSize = true; this.xRepeatResults.Enabled = false; - this.xRepeatResults.Location = new System.Drawing.Point(34, 65); + this.xRepeatResults.Location = new System.Drawing.Point(35, 136); this.xRepeatResults.Name = "xRepeatResults"; this.xRepeatResults.Size = new System.Drawing.Size(155, 17); this.xRepeatResults.TabIndex = 2; @@ -868,7 +868,7 @@ "traveler, 6x1", "traveler, 6x2", "traveler, 4x1"}); - this.xResultsOverview.Location = new System.Drawing.Point(178, 40); + this.xResultsOverview.Location = new System.Drawing.Point(179, 111); this.xResultsOverview.Name = "xResultsOverview"; this.xResultsOverview.Size = new System.Drawing.Size(103, 21); this.xResultsOverview.TabIndex = 28; diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index bdb81f9..e7ec248 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -489,7 +489,7 @@ to także należy ręcznie zrobić Upload. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBAEAAXABAAFwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From fe71701968627f6ee3e1066dbb1ee6d2ab08afcc Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 14:55:33 +0200 Subject: Grouping tables in sections extended to support teams IMP results --- Aktywator/Bws.cs | 9 +++++++-- Aktywator/Setting.cs | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 4c4586e..e89996f 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -126,7 +126,7 @@ namespace Aktywator MessageBox.Show(MainForm.differentRecordsInSections, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Warning); main.xGroupSections.Checked = false; } - Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked); + Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); } main.checkRecordsForSectionGroups(); } @@ -583,7 +583,7 @@ namespace Aktywator Setting.save("BM2NameSource", "2", this, errors, section); Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section); Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section); - Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked); + Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); this.loadSettings(); } @@ -613,6 +613,11 @@ namespace Aktywator } private int getBWSNumber(OleDbDataReader reader, int index) + { + return Bws.bwsNumber(reader, index); + } + + public static int bwsNumber(OleDbDataReader reader, int index) { switch (Type.GetTypeCode(reader.GetFieldType(index))) { diff --git a/Aktywator/Setting.cs b/Aktywator/Setting.cs index bde6fd1..802e92a 100644 --- a/Aktywator/Setting.cs +++ b/Aktywator/Setting.cs @@ -171,12 +171,43 @@ namespace Aktywator } } - public static void saveSectionGroups(Sql sql, bool value) + public static void saveSectionGroups(Sql sql, bool value, int teamTableOffset = 0) { - StringBuilder sb = new StringBuilder("UPDATE Tables SET `Group` = "); - sb.Append(value ? "1" : "`Section`"); - sb.Append(";"); - sql.query(sb.ToString()); + if (teamTableOffset == 0) + { + StringBuilder sb = new StringBuilder("UPDATE Tables SET `Group` = "); + sb.Append(value ? "1" : "`Section`"); + sb.Append(";"); + sql.query(sb.ToString()); + } + else + { + int group = 1; + StringBuilder tablesQuery = new StringBuilder("SELECT `Section`, (`Table` MOD "); + tablesQuery.Append(teamTableOffset); + tablesQuery.Append(") FROM `Tables` GROUP BY `Section`, (`Table` MOD "); + tablesQuery.Append(teamTableOffset); + tablesQuery.Append(");"); + OleDbDataReader tables = sql.select(tablesQuery.ToString()); + List queries = new List(); + while (tables.Read()) + { + StringBuilder sb = new StringBuilder("UPDATE `Tables` SET `Group` = "); + sb.Append(group++); + sb.Append(" WHERE `Section` = "); + sb.Append(Bws.bwsNumber(tables, 0)); + sb.Append(" AND (`Table` MOD "); + sb.Append(teamTableOffset); + sb.Append(") = "); + sb.Append(Bws.bwsNumber(tables, 1)); + sb.Append(";"); + queries.Add(sb.ToString()); + } + foreach (string query in queries) + { + sql.query(query); + } + } } } } -- cgit v1.2.3 From 68b73444035103941c45e24a96b05f6cf40334c9 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 14:56:47 +0200 Subject: Extending Setting.load to read settings from other BWS tables --- Aktywator/Setting.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Aktywator/Setting.cs b/Aktywator/Setting.cs index 802e92a..2cf1120 100644 --- a/Aktywator/Setting.cs +++ b/Aktywator/Setting.cs @@ -42,15 +42,18 @@ namespace Aktywator field.Checked = a.ToUpper() == "TRUE" ? true : false; } - public static string load(string name, Bws bws, StringBuilder errors, string section = null) + public static string load(string name, Bws bws, StringBuilder errors, string section = null, string table = "Settings", string sectionField = "`Section`") { StringBuilder str = new StringBuilder(); str.Append("SELECT "); str.Append(name); - str.Append(" FROM Settings"); + str.Append(" FROM "); + str.Append(table); if (section != null) { - str.Append(" WHERE `Section` = "); + str.Append(" WHERE "); + str.Append(sectionField); + str.Append(" = "); str.Append(section); } try -- cgit v1.2.3 From 5b9b179e9623c8b6935976ac537b2f9a1996486a Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 14:57:21 +0200 Subject: Scoring type configuration support Fixes michzimny/aktywator#43 --- Aktywator/Bws.cs | 8 +++++++- Aktywator/MainForm.cs | 30 +++++++++++++++++++++++++++++- Aktywator/Setting.cs | 13 +++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index e89996f..c112158 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -250,7 +250,7 @@ namespace Aktywator settings = new List(); settings.Add(new Setting("ShowResults", main.xShowResults, this, new Version(2, 0, 0), new Version(1, 3, 1))); settings.Add(new Setting("RepeatResults", main.xRepeatResults, this, null, null)); - settings.Add(new Setting("ShowPercentage", main.xShowPercentage, this, null, null)); + settings.Add(new Setting("ShowPercentage", main.xShowPercentage, this, new Version(3, 6, 0), new Version(3, 0, 1))); settings.Add(new Setting("GroupSections", main.xGroupSections, this, new Version(2, 1, 10), new Version(1, 3, 1))); settings.Add(new Setting("ShowPairNumbers", main.xShowPairNumbers, this, null, null)); settings.Add(new Setting("IntermediateResults", main.xIntermediateResults, this, null, new Version(1, 4, 1))); @@ -347,6 +347,7 @@ namespace Aktywator settings.Add(new Setting("BM2ValidateLeadCard", "bit", "false")); settings.Add(new Setting("BM2TDCall", "bit", "false")); settings.Add(new Setting("BM2ShowPlayerNames", "integer", "0")); + settings.Add(new Setting("ScoringType", "integer", "1", "`Section`")); foreach (Setting s in settings) { @@ -525,6 +526,10 @@ namespace Aktywator int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview); main.xResultsOverview.SelectedIndex = resultsOverview; + int scoringType = 1; + Int32.TryParse(Setting.load("ScoringType", this, errors, section, "`Section`", "`ID`"), out scoringType); + main.setScoringType(scoringType); + main.checkRecordsForSectionGroups(); if (section == null && main.cbSettingsSection.Items.Count > 2) @@ -584,6 +589,7 @@ namespace Aktywator Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section); Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section); Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); + Setting.saveScoringType(this.sql, main.getScoringType(), section); this.loadSettings(); } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index ecf52c5..0f456ea 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -26,6 +26,8 @@ namespace Aktywator public static Version requiredBCSVersion; public static Version requiredFWVersion; + private Dictionary _scoringType; + public MainForm() { InitializeComponent(); @@ -34,6 +36,11 @@ namespace Aktywator private void MainForm_Load(object sender, EventArgs e) { if (!MySQL.getConfigured()) (new MysqlSettings()).ShowDialog(); + this._scoringType = new Dictionary(); + this._scoringType.Add(this.rbMatchpoints, 1); + this._scoringType.Add(this.rbIMPCavendish, 2); + this._scoringType.Add(this.rbIMPButler, 3); + this._scoringType.Add(this.rbIMPTeams, 4); } private void MainForm_Shown(object sender, EventArgs e) @@ -97,7 +104,6 @@ namespace Aktywator { syncToolStrip.Visible = false; namesPanel.Visible = false; - this.rbMatchpoints.Checked = true; } this.WindowState = FormWindowState.Normal; @@ -744,5 +750,27 @@ namespace Aktywator this.rbIMPTeams.Enabled = xShowPercentage.Checked && teamsTournament; } + internal int getScoringType() + { + if (this.xShowPercentage.Checked) + { + foreach (KeyValuePair type in this._scoringType) + { + if (type.Key.Checked) + { + return type.Value; + } + } + } + return 0; + } + + internal void setScoringType(int scoringType) + { + foreach (KeyValuePair type in this._scoringType) + { + type.Key.Checked = (type.Value == scoringType); + } + } } } diff --git a/Aktywator/Setting.cs b/Aktywator/Setting.cs index 2cf1120..657c822 100644 --- a/Aktywator/Setting.cs +++ b/Aktywator/Setting.cs @@ -174,6 +174,19 @@ namespace Aktywator } } + public static void saveScoringType(Sql sql, int value, string section) + { + StringBuilder sb = new StringBuilder("UPDATE `Section` SET `ScoringType` = "); + sb.Append(value); + if (section != null) + { + sb.Append(" WHERE `ID` = "); + sb.Append(section); + } + sb.Append(";"); + sql.query(sb.ToString()); + } + public static void saveSectionGroups(Sql sql, bool value, int teamTableOffset = 0) { if (teamTableOffset == 0) -- cgit v1.2.3 From 8c1d77e431d969ab9fb6e81a07ae8da631a9beb0 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 24 Oct 2018 14:58:17 +0200 Subject: Changelog updated --- Aktywator.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Aktywator.txt b/Aktywator.txt index f10a95c..11bc1bf 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -9,6 +9,7 @@ Aktywator 1.1.5 (dev) - możliwość ręcznego wylosowania PINu - wyłączanie rozkładów przy wykryciu "łatwego" PINu * opcja wezwania sędziego z pierniczka + * obsługa wyświetlania wyniku w IMP, również dla turnieju teamów Aktywator 1.1.4 05.10.2018 [mkl] -- cgit v1.2.3 From f20dc6512a46f7a567fc752eb653a764d9b6af3b Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 16 Nov 2018 22:46:50 +0100 Subject: Bugfixes for scoring type options --- Aktywator/Bws.cs | 2 +- Aktywator/MainForm.cs | 4 ++-- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index c112158..55b83a2 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -528,7 +528,7 @@ namespace Aktywator int scoringType = 1; Int32.TryParse(Setting.load("ScoringType", this, errors, section, "`Section`", "`ID`"), out scoringType); - main.setScoringType(scoringType); + main.setScoringType((scoringType > 0) ? scoringType : 1); main.checkRecordsForSectionGroups(); diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 0f456ea..aad3170 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -38,8 +38,8 @@ namespace Aktywator if (!MySQL.getConfigured()) (new MysqlSettings()).ShowDialog(); this._scoringType = new Dictionary(); this._scoringType.Add(this.rbMatchpoints, 1); - this._scoringType.Add(this.rbIMPCavendish, 2); - this._scoringType.Add(this.rbIMPButler, 3); + this._scoringType.Add(this.rbIMPButler, 2); + this._scoringType.Add(this.rbIMPCavendish, 3); this._scoringType.Add(this.rbIMPTeams, 4); } diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index b17142d..ee6b425 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-10-24 +2018-11-16 -- cgit v1.2.3 From a6d968da1ea8031767fbdef02ccc89953d3de2a2 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 16 Nov 2018 23:20:31 +0100 Subject: Scoring settings warnings expanded --- Aktywator/Bws.cs | 14 ++++++++------ Aktywator/MainForm.Designer.cs | 17 ++++++++++++++++- Aktywator/MainForm.cs | 22 +++++++++++++++++++--- Aktywator/MainForm.resx | 19 ++++++++++++++++++- 4 files changed, 61 insertions(+), 11 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 55b83a2..3d111e2 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -548,11 +548,7 @@ namespace Aktywator public void sectionGroupWarning() { - main.lGroupSectionsWarning.Visible = false; - if (main.xShowResults.Checked || this.detectDifferentRecordsInSections()) - { - main.lGroupSectionsWarning.Visible = true; - } + main.lGroupSectionsWarning.Visible = this.detectDifferentRecordsInSections(); } private int getSectionGroupCount() @@ -589,7 +585,13 @@ namespace Aktywator Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section); Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section); Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); - Setting.saveScoringType(this.sql, main.getScoringType(), section); + int scoringType = main.getScoringType(); + Setting.saveScoringType(this.sql, scoringType, section); + if (scoringType > 1 && scoringType < 4) + { + MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } this.loadSettings(); } diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 6f4bd7d..91ed12b 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -84,6 +84,7 @@ this.xAutoBoardNumber = new System.Windows.Forms.CheckBox(); this.xCollectBidding = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.lScoringOptionsWarning = new System.Windows.Forms.Label(); this.rbIMPButler = new System.Windows.Forms.RadioButton(); this.rbIMPCavendish = new System.Windows.Forms.RadioButton(); this.rbIMPTeams = new System.Windows.Forms.RadioButton(); @@ -730,6 +731,7 @@ // // groupBox4 // + this.groupBox4.Controls.Add(this.lScoringOptionsWarning); this.groupBox4.Controls.Add(this.rbIMPButler); this.groupBox4.Controls.Add(this.rbIMPCavendish); this.groupBox4.Controls.Add(this.rbIMPTeams); @@ -748,6 +750,17 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "Protokół"; // + // lScoringOptionsWarning + // + this.lScoringOptionsWarning.Cursor = System.Windows.Forms.Cursors.Help; + this.lScoringOptionsWarning.Image = ((System.Drawing.Image)(resources.GetObject("lScoringOptionsWarning.Image"))); + this.lScoringOptionsWarning.Location = new System.Drawing.Point(9, 41); + this.lScoringOptionsWarning.Name = "lScoringOptionsWarning"; + this.lScoringOptionsWarning.Size = new System.Drawing.Size(22, 18); + this.lScoringOptionsWarning.TabIndex = 34; + this.lScoringOptionsWarning.Visible = false; + this.lScoringOptionsWarning.Click += new System.EventHandler(this.lScoringOptionsWarning_Click); + // // rbIMPButler // this.rbIMPButler.AutoSize = true; @@ -823,11 +836,12 @@ this.xGroupSections.TabIndex = 4; this.xGroupSections.Text = "wspólny dla wszystkich sektorów"; this.xGroupSections.UseVisualStyleBackColor = true; + this.xGroupSections.CheckedChanged += new System.EventHandler(this.xGroupSections_CheckedChanged); // // xShowPercentage // this.xShowPercentage.AutoSize = true; - this.xShowPercentage.Location = new System.Drawing.Point(12, 42); + this.xShowPercentage.Location = new System.Drawing.Point(34, 42); this.xShowPercentage.Name = "xShowPercentage"; this.xShowPercentage.Size = new System.Drawing.Size(128, 17); this.xShowPercentage.TabIndex = 3; @@ -1736,6 +1750,7 @@ private System.Windows.Forms.RadioButton rbIMPCavendish; private System.Windows.Forms.RadioButton rbIMPTeams; private System.Windows.Forms.RadioButton rbMatchpoints; + public System.Windows.Forms.Label lScoringOptionsWarning; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index aad3170..2b413ad 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -93,6 +93,7 @@ namespace Aktywator bws.loadSettings(); this.checkRecordsForSectionGroups(); + this.scoringOptionsWarning(); tournament = this.detectTeamyTournament(); if (tournament != null) @@ -355,7 +356,7 @@ namespace Aktywator bws.loadSettings(); } - static public string sectionGroupWarningLabel = "Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!"; + static public string sectionGroupWarningLabel = "Opcje sposobu liczenia wyników i grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie mogą być zaktualizowane w trakcie trwania sesji!"; static public string differentRecordsInSections = "BWS zawiera różne rozkłady w różnych sektorach, opcja grupowania sektorów musi być wyłączona."; public void xShowResults_CheckedChanged(object sender, EventArgs e) @@ -649,8 +650,7 @@ namespace Aktywator private void lGroupSectionsWarning_Click(object sender, EventArgs e) { - string message = bws.detectDifferentRecordsInSections() ? MainForm.differentRecordsInSections : MainForm.sectionGroupWarningLabel; - MessageBox.Show(message, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question); + MessageBox.Show(MainForm.differentRecordsInSections, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question); } private void bTeamsNamesSettings_Click(object sender, EventArgs e) @@ -748,6 +748,7 @@ namespace Aktywator this.rbIMPButler.Enabled = xShowPercentage.Checked && !teamsTournament; this.rbIMPCavendish.Enabled = xShowPercentage.Checked && !teamsTournament; this.rbIMPTeams.Enabled = xShowPercentage.Checked && teamsTournament; + this.scoringOptionsWarning(); } internal int getScoringType() @@ -772,5 +773,20 @@ namespace Aktywator type.Key.Checked = (type.Value == scoringType); } } + + private void scoringOptionsWarning() + { + lScoringOptionsWarning.Visible = (xGroupSections.Checked || xShowPercentage.Checked); + } + + private void lScoringOptionsWarning_Click(object sender, EventArgs e) + { + MessageBox.Show(MainForm.sectionGroupWarningLabel, "Ustawienia wyświetlania wyników", MessageBoxButtons.OK, MessageBoxIcon.Question); + } + + private void xGroupSections_CheckedChanged(object sender, EventArgs e) + { + this.scoringOptionsWarning(); + } } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index e7ec248..842be7b 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -189,6 +189,23 @@ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE + QVQ4T6WRX0hTYRjGdxMkikcqmeWURbeamAg60pVK82KgppIzCh3WNvwzRtjCuahhCYabyzRrFcQyVEbQ + hSj+YaKrkCBnDpuSTsu55lEXG1mG29PZuRiunau6+MH3PTzPw/u9HwvAf8EoBlmcKOa+GTi7p68ndrsV + xGEmTxBGMcjbgfz5JfvN3/MzSn9HLTHI5AnCKFr68oTzU5f9vp9PsbnWCNsID50NxEkmb4QQ5P3rQvLz + chdUzTUQiYpgGZOht4XjYvJGCGYjX2mflvibVFdgMpmg0WiQyEmAdTADulpC8rc/7EItLurjkHA3OLqo + shw6nQ5SqRRsNgFyqRovNfG/qIUe2J8JKxh/ntO3sqCm3v4MzepqKBQK5PLPQFGfg+2vcixbTge0MsK4 + PxM6WPrzkuyTInpxvh0DzGY1Ss+XIj0tBeahKnhWrmJroQyjj7gB6mu5EQVmY67V/U27Rxd49XA7WyAQ + nIKoPBO2dxXY/FRCUYTVMY5fX0fYwgqGDDy+Y0YWoMO+Tni3W7G6qIThQTG62gVYmy3DxgceNqx8uKa4 + GNTGBNqlscJQgaU/3+3beUKN/pgOf3erqLEluFhZguzsLOg1KSDnCkDOFsA1mYQvw1HoUhBeuuBVR4bS + 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i + emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6 + EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC @@ -489,7 +506,7 @@ to także należy ręcznie zrobić Upload. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAXABAAFwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBAEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From 4a536d0799685f3e530bc1782420e32a24b58ca2 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 17 Nov 2018 10:39:29 +0100 Subject: Only set scoring type if scoring is enabled, to avoid unnecessary table grouping (so that suspicious contracts work better) --- Aktywator/Bws.cs | 20 ++++++++++++++------ Aktywator/Resources/BuildDate.txt | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 3d111e2..75e9b13 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -584,13 +584,21 @@ namespace Aktywator Setting.save("BM2NameSource", "2", this, errors, section); Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section); Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section); - Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); - int scoringType = main.getScoringType(); - Setting.saveScoringType(this.sql, scoringType, section); - if (scoringType > 1 && scoringType < 4) + if (main.xShowResults.Checked) { - MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników", - MessageBoxButtons.OK, MessageBoxIcon.Information); + Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); + int scoringType = main.getScoringType(); + Setting.saveScoringType(this.sql, scoringType, section); + if (scoringType > 1 && scoringType < 4) + { + MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + else + { + Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, 0); + Setting.saveScoringType(this.sql, 1, section); } this.loadSettings(); } diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index ee6b425..0ddc042 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-11-16 +2018-11-17 -- cgit v1.2.3 From bf9e05698f3353de3a37e1f6fd5ca640381df623 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 17 Nov 2018 15:42:39 +0100 Subject: "Enter first board number manually" supported --- Aktywator/Bws.cs | 2 ++ Aktywator/MainForm.Designer.cs | 15 +++++++++++++++ Aktywator/MainForm.cs | 9 +++++++++ Aktywator/MainForm.resx | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 75e9b13..0ee09c2 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -267,6 +267,7 @@ namespace Aktywator settings.Add(new Setting("BM2AutoShowScoreRecap", main.xAutoShowScoreRecap, this, new Version(2, 5, 1), new Version(1, 0, 1))); settings.Add(new Setting("BM2ScoreCorrection", main.xScoreCorrection, this, new Version(2, 0, 0), new Version(1, 0, 1))); settings.Add(new Setting("BM2AutoBoardNumber", main.xAutoBoardNumber, this, new Version(2, 0, 0), new Version(2, 0, 1))); + settings.Add(new Setting("BM2FirstBoardManually", main.xFirstBoardManually, this, new Version(2, 7, 9), new Version(2, 7, 6))); settings.Add(new Setting("BM2ResetFunctionKey", main.xResetFunctionKey, this, new Version(2, 0, 0), new Version(1, 0, 1))); settings.Add(new Setting("BM2ViewHandrecord", main.xViewHandrecord, this, new Version(2, 6, 1), new Version(1, 6, 1))); settings.Add(new Setting("BM2RecordBidding", main.xCollectBidding, this, new Version(2, 0, 0), new Version(1, 3, 1))); @@ -348,6 +349,7 @@ namespace Aktywator settings.Add(new Setting("BM2TDCall", "bit", "false")); settings.Add(new Setting("BM2ShowPlayerNames", "integer", "0")); settings.Add(new Setting("ScoringType", "integer", "1", "`Section`")); + settings.Add(new Setting("BM2FirstBoardManually", "bit", "false")); foreach (Setting s in settings) { diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 91ed12b..435485f 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -156,6 +156,7 @@ this.bLaunch = new System.Windows.Forms.ToolStripButton(); this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.namesTimer = new System.Windows.Forms.Timer(this.components); + this.xFirstBoardManually = new System.Windows.Forms.CheckBox(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -667,6 +668,7 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.xFirstBoardManually); this.groupBox3.Controls.Add(this.xCollectPlay); this.groupBox3.Controls.Add(this.xBoardOrderVerification); this.groupBox3.Controls.Add(this.xIntermediateResults); @@ -718,6 +720,7 @@ this.xAutoBoardNumber.TabIndex = 10; this.xAutoBoardNumber.Text = "automat. wpisuj numer rozdania"; this.xAutoBoardNumber.UseVisualStyleBackColor = true; + this.xAutoBoardNumber.CheckedChanged += new System.EventHandler(this.xAutoBoardNumber_CheckedChanged); // // xCollectBidding // @@ -1559,6 +1562,17 @@ this.namesTimer.Interval = 3000; this.namesTimer.Tick += new System.EventHandler(this.namesTimer_Tick); // + // xFirstBoardManually + // + this.xFirstBoardManually.AutoSize = true; + this.xFirstBoardManually.Enabled = false; + this.xFirstBoardManually.Location = new System.Drawing.Point(190, 22); + this.xFirstBoardManually.Name = "xFirstBoardManually"; + this.xFirstBoardManually.Size = new System.Drawing.Size(103, 17); + this.xFirstBoardManually.TabIndex = 4; + this.xFirstBoardManually.Text = "pierwszy ręcznie"; + this.xFirstBoardManually.UseVisualStyleBackColor = true; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1751,6 +1765,7 @@ private System.Windows.Forms.RadioButton rbIMPTeams; private System.Windows.Forms.RadioButton rbMatchpoints; public System.Windows.Forms.Label lScoringOptionsWarning; + public System.Windows.Forms.CheckBox xFirstBoardManually; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 2b413ad..6dc346f 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -788,5 +788,14 @@ namespace Aktywator { this.scoringOptionsWarning(); } + + private void xAutoBoardNumber_CheckedChanged(object sender, EventArgs e) + { + this.xFirstBoardManually.Enabled = xAutoBoardNumber.Checked; + if (!this.xFirstBoardManually.Enabled) + { + this.xFirstBoardManually.Checked = false; + } + } } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 842be7b..ba3dd57 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -506,7 +506,7 @@ to także należy ręcznie zrobić Upload. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBAEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From d02f346f40b2012ead6d534dcb3811bbc69d93d9 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 17 Nov 2018 15:45:44 +0100 Subject: Changelog updated --- Aktywator.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Aktywator.txt b/Aktywator.txt index 11bc1bf..12dfaab 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -1,8 +1,8 @@ Known issues: - nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze) -- nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa) +- nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa); nie da się również zmienić sposoby liczenia (maksy/butler/cavendish) w trakcie sesji - ograniczenia BCS -Aktywator 1.1.5 (dev) +Aktywator 1.1.5 (release candidate) ??.??.2018 [mkl] * poprawa bezpieczeństwa PINów - losowanie PINu przy inicjalizacji @@ -10,6 +10,7 @@ Aktywator 1.1.5 (dev) - wyłączanie rozkładów przy wykryciu "łatwego" PINu * opcja wezwania sędziego z pierniczka * obsługa wyświetlania wyniku w IMP, również dla turnieju teamów + * obsługa opcji "pierwszy numer ręcznie" przy automatycznym wpisywaniu numerów rozdań Aktywator 1.1.4 05.10.2018 [mkl] -- cgit v1.2.3 From e2f10a0dfcd102c76a7345a486c9614f20239467 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 17 Nov 2018 23:49:50 +0100 Subject: Bugfix --- Aktywator/Bws.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 0ee09c2..8c12537 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -586,7 +586,7 @@ namespace Aktywator Setting.save("BM2NameSource", "2", this, errors, section); Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section); Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section); - if (main.xShowResults.Checked) + if (main.xShowPercentage.Checked) { Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); int scoringType = main.getScoringType(); -- cgit v1.2.3 From 067227bbe0e8ca34fff7cf4ddac72175f94ec8b9 Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 18 Nov 2018 01:31:30 +0100 Subject: Game summary at the end of the session available Fixes #51 --- Aktywator/Bws.cs | 27 +++++++++++++++++++++++++-- Aktywator/MainForm.Designer.cs | 37 +++++++++++++++++++++++++------------ Aktywator/MainForm.cs | 1 + Aktywator/MainForm.resx | 2 +- Aktywator/Resources/BuildDate.txt | 2 +- 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 8c12537..79e5121 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -385,8 +385,8 @@ namespace Aktywator } catch (OleDbException) { - } - + } + try { sql.query("CREATE TABLE PlayerNames (ID integer, Name text(18));"); @@ -540,6 +540,10 @@ namespace Aktywator this.sectionGroupWarning(); } + int ranking = 0; + Int32.TryParse(Setting.load("BM2Ranking", this, errors, section), out ranking); + main.xShowRecap.Checked = (ranking > 0) && (Setting.load("BM2GameSummary", this, errors, section).ToUpper().Equals("TRUE")); + if (errors.Length > 0) { MessageBox.Show("Nie można uzyskać dostępu do pól: \n" + errors.ToString() + ".\nPrawdopodobnie te pola nie istnieją.", @@ -602,6 +606,25 @@ namespace Aktywator Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, 0); Setting.saveScoringType(this.sql, 1, section); } + if (main.xShowRecap.Checked) + { + if (this.getMySQLDatabaseForSection() != null) + { + Setting.saveScoringType(this.sql, 4, section); + Setting.save("BM2SummaryPoints", "0", this, errors, section); + } + else + { + Setting.save("BM2SummaryPoints", "1", this, errors, section); + } + Setting.save("BM2Ranking", "2", this, errors, section); + Setting.save("BM2GameSummary", "true", this, errors, section); + } + else + { + Setting.save("BM2Ranking", "0", this, errors, section); + Setting.save("BM2GameSummary", "false", this, errors, section); + } this.loadSettings(); } diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 435485f..1e4b6bc 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -73,11 +73,13 @@ this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox(); this.xShowPlayerNames = new System.Windows.Forms.CheckBox(); this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.xShowRecap = new System.Windows.Forms.CheckBox(); this.xRemainingBoards = new System.Windows.Forms.CheckBox(); this.xNextSeatings = new System.Windows.Forms.CheckBox(); this.xScoreRecap = new System.Windows.Forms.CheckBox(); this.xAutoShowScoreRecap = new System.Windows.Forms.CheckBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.xFirstBoardManually = new System.Windows.Forms.CheckBox(); this.xCollectPlay = new System.Windows.Forms.CheckBox(); this.xBoardOrderVerification = new System.Windows.Forms.CheckBox(); this.xIntermediateResults = new System.Windows.Forms.CheckBox(); @@ -156,7 +158,6 @@ this.bLaunch = new System.Windows.Forms.ToolStripButton(); this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.namesTimer = new System.Windows.Forms.Timer(this.components); - this.xFirstBoardManually = new System.Windows.Forms.CheckBox(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -615,6 +616,7 @@ // // groupBox6 // + this.groupBox6.Controls.Add(this.xShowRecap); this.groupBox6.Controls.Add(this.xRemainingBoards); this.groupBox6.Controls.Add(this.xNextSeatings); this.groupBox6.Controls.Add(this.xScoreRecap); @@ -626,6 +628,16 @@ this.groupBox6.TabStop = false; this.groupBox6.Text = "Koniec rundy"; // + // xShowRecap + // + this.xShowRecap.AutoSize = true; + this.xShowRecap.Location = new System.Drawing.Point(13, 114); + this.xShowRecap.Name = "xShowRecap"; + this.xShowRecap.Size = new System.Drawing.Size(214, 17); + this.xShowRecap.TabIndex = 14; + this.xShowRecap.Text = "podgląd kontrolki/historii na koniec sesji"; + this.xShowRecap.UseVisualStyleBackColor = true; + // // xRemainingBoards // this.xRemainingBoards.AutoSize = true; @@ -681,6 +693,17 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "Zapis rozdania"; // + // xFirstBoardManually + // + this.xFirstBoardManually.AutoSize = true; + this.xFirstBoardManually.Enabled = false; + this.xFirstBoardManually.Location = new System.Drawing.Point(190, 22); + this.xFirstBoardManually.Name = "xFirstBoardManually"; + this.xFirstBoardManually.Size = new System.Drawing.Size(103, 17); + this.xFirstBoardManually.TabIndex = 4; + this.xFirstBoardManually.Text = "pierwszy ręcznie"; + this.xFirstBoardManually.UseVisualStyleBackColor = true; + // // xCollectPlay // this.xCollectPlay.AutoSize = true; @@ -1562,17 +1585,6 @@ this.namesTimer.Interval = 3000; this.namesTimer.Tick += new System.EventHandler(this.namesTimer_Tick); // - // xFirstBoardManually - // - this.xFirstBoardManually.AutoSize = true; - this.xFirstBoardManually.Enabled = false; - this.xFirstBoardManually.Location = new System.Drawing.Point(190, 22); - this.xFirstBoardManually.Name = "xFirstBoardManually"; - this.xFirstBoardManually.Size = new System.Drawing.Size(103, 17); - this.xFirstBoardManually.TabIndex = 4; - this.xFirstBoardManually.Text = "pierwszy ręcznie"; - this.xFirstBoardManually.UseVisualStyleBackColor = true; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1766,6 +1778,7 @@ private System.Windows.Forms.RadioButton rbMatchpoints; public System.Windows.Forms.Label lScoringOptionsWarning; public System.Windows.Forms.CheckBox xFirstBoardManually; + public System.Windows.Forms.CheckBox xShowRecap; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 6dc346f..876388a 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -89,6 +89,7 @@ namespace Aktywator // cloning Setting List returned from Bws, because we're going to extend it for version tracking purposes this.bwsSettings = new List(bws.initSettings()); this.bwsSettings.Add(new Setting("BM2ShowPlayerNames", this.xShowPlayerNames, bws, new Version(2, 0, 0), new Version(1, 3, 1))); + this.bwsSettings.Add(new Setting("BM2GameSummary", this.xShowRecap, bws, new Version(3, 6, 0), new Version(3, 0, 1))); bindSettingChanges(); bws.loadSettings(); diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index ba3dd57..1d1bdc0 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -506,7 +506,7 @@ to także należy ręcznie zrobić Upload. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBAEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 0ddc042..aeb1927 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-11-17 +2018-11-18 -- cgit v1.2.3 From ac5fdb3b54077f1f42fdbc76ed05916c18dbf8f7 Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 18 Nov 2018 01:47:41 +0100 Subject: Setting movement to single-winner (to avoid entering direction in game summary screen and to optimize shit) --- Aktywator/Bws.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 79e5121..dfbbe23 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -387,6 +387,15 @@ namespace Aktywator { } + try + { + sql.query("ALTER TABLE `Section` ADD COLUMN `Winners` integer;"); + } + catch (OleDbException) + { + } + sql.query("UPDATE `Section` SET Winners = 1"); + try { sql.query("CREATE TABLE PlayerNames (ID integer, Name text(18));"); -- cgit v1.2.3 From 6e03cdb5b13c71b8b72d2188132a3e2a78f8f88b Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 18 Nov 2018 01:54:47 +0100 Subject: IMP scoring settings warning moved to warning icon instead of a message box --- Aktywator/Bws.cs | 5 - Aktywator/MainForm.Designer.cs | 36 ++++-- Aktywator/MainForm.cs | 33 ++++++ Aktywator/MainForm.resx | 262 +++++++++++++++++++++++------------------ 4 files changed, 210 insertions(+), 126 deletions(-) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index dfbbe23..eb4864c 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -604,11 +604,6 @@ namespace Aktywator Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0); int scoringType = main.getScoringType(); Setting.saveScoringType(this.sql, scoringType, section); - if (scoringType > 1 && scoringType < 4) - { - MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników", - MessageBoxButtons.OK, MessageBoxIcon.Information); - } } else { diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 1e4b6bc..ed92786 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -86,6 +86,7 @@ this.xAutoBoardNumber = new System.Windows.Forms.CheckBox(); this.xCollectBidding = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.lIMPScoringWarning = new System.Windows.Forms.Label(); this.lScoringOptionsWarning = new System.Windows.Forms.Label(); this.rbIMPButler = new System.Windows.Forms.RadioButton(); this.rbIMPCavendish = new System.Windows.Forms.RadioButton(); @@ -757,6 +758,7 @@ // // groupBox4 // + this.groupBox4.Controls.Add(this.lIMPScoringWarning); this.groupBox4.Controls.Add(this.lScoringOptionsWarning); this.groupBox4.Controls.Add(this.rbIMPButler); this.groupBox4.Controls.Add(this.rbIMPCavendish); @@ -776,6 +778,17 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "Protokół"; // + // lIMPScoringWarning + // + this.lIMPScoringWarning.Cursor = System.Windows.Forms.Cursors.Help; + this.lIMPScoringWarning.Image = ((System.Drawing.Image)(resources.GetObject("lIMPScoringWarning.Image"))); + this.lIMPScoringWarning.Location = new System.Drawing.Point(9, 76); + this.lIMPScoringWarning.Name = "lIMPScoringWarning"; + this.lIMPScoringWarning.Size = new System.Drawing.Size(22, 18); + this.lIMPScoringWarning.TabIndex = 35; + this.lIMPScoringWarning.Visible = false; + this.lIMPScoringWarning.Click += new System.EventHandler(this.lIMPScoringWarning_Click); + // // lScoringOptionsWarning // this.lScoringOptionsWarning.Cursor = System.Windows.Forms.Cursors.Help; @@ -797,6 +810,7 @@ this.rbIMPButler.TabIndex = 33; this.rbIMPButler.Text = "IMP (butler)"; this.rbIMPButler.UseVisualStyleBackColor = true; + this.rbIMPButler.CheckedChanged += new System.EventHandler(this.rbIMPButler_CheckedChanged); // // rbIMPCavendish // @@ -808,6 +822,7 @@ this.rbIMPCavendish.TabIndex = 32; this.rbIMPCavendish.Text = "IMP (cavendish)"; this.rbIMPCavendish.UseVisualStyleBackColor = true; + this.rbIMPCavendish.CheckedChanged += new System.EventHandler(this.rbIMPCavendish_CheckedChanged); // // rbIMPTeams // @@ -819,6 +834,7 @@ this.rbIMPTeams.TabIndex = 31; this.rbIMPTeams.Text = "IMP (teamy)"; this.rbIMPTeams.UseVisualStyleBackColor = true; + this.rbIMPTeams.CheckedChanged += new System.EventHandler(this.rbIMPTeams_CheckedChanged); // // rbMatchpoints // @@ -830,6 +846,7 @@ this.rbMatchpoints.TabIndex = 30; this.rbMatchpoints.Text = "% maksa"; this.rbMatchpoints.UseVisualStyleBackColor = true; + this.rbMatchpoints.CheckedChanged += new System.EventHandler(this.rbMatchpoints_CheckedChanged); // // lGroupSectionsWarning // @@ -1441,14 +1458,14 @@ this.gwSections.AllowUserToResizeRows = false; this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable; this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; - 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.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gwSections.Location = new System.Drawing.Point(9, 118); this.gwSections.MultiSelect = false; @@ -1779,6 +1796,7 @@ public System.Windows.Forms.Label lScoringOptionsWarning; public System.Windows.Forms.CheckBox xFirstBoardManually; public System.Windows.Forms.CheckBox xShowRecap; + public System.Windows.Forms.Label lIMPScoringWarning; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 876388a..e0de79f 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -773,6 +773,7 @@ namespace Aktywator { type.Key.Checked = (type.Value == scoringType); } + this.impScoringWarning(); } private void scoringOptionsWarning() @@ -780,6 +781,12 @@ namespace Aktywator lScoringOptionsWarning.Visible = (xGroupSections.Checked || xShowPercentage.Checked); } + private void impScoringWarning() + { + int scoringType = this.getScoringType(); + this.lIMPScoringWarning.Visible = (scoringType > 1 && scoringType < 4); + } + private void lScoringOptionsWarning_Click(object sender, EventArgs e) { MessageBox.Show(MainForm.sectionGroupWarningLabel, "Ustawienia wyświetlania wyników", MessageBoxButtons.OK, MessageBoxIcon.Question); @@ -798,5 +805,31 @@ namespace Aktywator this.xFirstBoardManually.Checked = false; } } + + private void lIMPScoringWarning_Click(object sender, EventArgs e) + { + MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void rbMatchpoints_CheckedChanged(object sender, EventArgs e) + { + this.impScoringWarning(); + } + + private void rbIMPCavendish_CheckedChanged(object sender, EventArgs e) + { + this.impScoringWarning(); + } + + private void rbIMPButler_CheckedChanged(object sender, EventArgs e) + { + this.impScoringWarning(); + } + + private void rbIMPTeams_CheckedChanged(object sender, EventArgs e) + { + this.impScoringWarning(); + } } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 1d1bdc0..980bd5e 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -126,7 +126,131 @@ 760, 20 + + 237, 20 + + + + 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 + + + + 352, 59 + + + 17, 59 + + + 865, 20 + + + 142, 59 + + + 353, 20 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs + CwAAAk1TRnQBSQFMAgEBBAEAAagBAAGoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL + BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 + AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ + AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES + ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK + ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ + At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa + AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ + AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs + AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa + AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG + AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET + Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA + AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu + Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs + AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ + BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA + AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA + AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 + AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -155,9 +279,6 @@ AABJRU5ErkJggg== - - 237, 20 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -189,40 +310,6 @@ 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 @@ -267,6 +354,15 @@ True + + True + + + True + + + True + 17, 59 @@ -299,6 +395,23 @@ 865, 20 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY + Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 + hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt + ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL + n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 + UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX + 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM + dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg + O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj + ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW + rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 + xNmtFAAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -330,23 +443,6 @@ YVXLVS8xE6wHcShj+5DDqparXmImWA/iUMb2yXZGgKZliKNmKpyFzFRrBr5AZYO1zmJW4Sxkhq767jdc yld72a9wWdvDmRpyPX53RLbnXb8mhaZH4F3ibpbz13pDviT76h14p3ofpD/5uOBd+T4fflz8xBu/xePx BZRDJQYQ19gkAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPvZJZSNRRHEb/Dz30kkVmJEKSJWKBGBhSPYgY - Ua6UKyipYblRZijmuDTjrrPoqFMq2ow6jTpaWYphhVAoEqHlQompWVBUiqmhkttpHEWyfAiCPvjgcu89 - hx+XK/yXZBZXu0iUOq7lVpKt0pMk1SSvHf1dQuJUeEfKg1bWlxIrzNIMsvgMtW9wXDFCgzbf31B+b0tt - ttxIb5JIUYmHT7Qcr8gCo4DBXg1zk/XG/pjQsTCmRl8pp1GbnrbGbIh3lAKvCCXu4UUI9VUKZidqNsBL - n0tY6I+l5lYu1aVZqIvTKCtI5aZMRFFOAmue1dRqpMx+1azDywaYQRH0h2/aPwS3y3P4/qlsHW5tkBr7 - UJ9Hky6He9VZ6NXp6MokVKquU6FMplQhQiVNXJVVl2Ux/b7QOPZIu5jGGgVLIxIYzdjYd4a94SQYiIPX - 0fTU+RET6lklqFXpTA3lwgcZ92vldD6SrV76dfRXwdDlw2KHG3OPnXlbZUfYOaepK2Eeh4RypZhvbySM - dqTQqJOxPCyGvohVsOe8AQxgsdOTubaTTLccZ7zhMJJIawJcTAuMb1CiSGG8N5E7WindzwyTDMQaBBeg - O4jl52eYf3qamVYnJhod+FJrS1fmDgLdrHCw2WZjFKjyRPS1pXJXmwdDqfDSMO4LX+bb3Zl54sxkkyNj - ejs+ag7QLzNFHL4f+4PmzUZ4JYXZCdRX5tL/IIqufGG9nbIttOVspTltO3XJZqgTLLhx1ZJA133LjvaW - rmu4IORnxJMvvkh2YghJl/2JOe9JqN8Jzp46issxO47YWWNrZcFe813s3mnCHlOTjf/g3yIIPwHVOuT9 - xNmtFAAAAABJRU5ErkJggg== @@ -497,64 +593,6 @@ W przeciwnym razie trzeba w BCS wybrać: Session->Upload hand records->Upl 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. - - - 353, 20 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs - CwAAAk1TRnQBSQFMAgEBBAEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL - BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1 - AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/ - AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES - ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK - ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ - At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa - AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ - AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs - AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa - AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG - AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET - Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA - AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu - Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs - AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+ - BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA - AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA - AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4 - AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L - 459, 20 -- cgit v1.2.3 From 0979c3aa182bbb48352a0ad4ee14cedd58e6c35d Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 18 Nov 2018 01:56:51 +0100 Subject: Changelog updated --- Aktywator.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Aktywator.txt b/Aktywator.txt index 12dfaab..060e3f2 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -10,6 +10,7 @@ Aktywator 1.1.5 (release candidate) - wyłączanie rozkładów przy wykryciu "łatwego" PINu * opcja wezwania sędziego z pierniczka * obsługa wyświetlania wyniku w IMP, również dla turnieju teamów + * obsługa podsumowania meczu/historii turnieju po zakońćzeniu sesji * obsługa opcji "pierwszy numer ręcznie" przy automatycznym wpisywaniu numerów rozdań Aktywator 1.1.4 -- cgit v1.2.3 From 90d87caf452248e951999d61793e9e7a59c6b2bd Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 18 Nov 2018 13:25:52 +0100 Subject: Grouping team tables if board-by-board results are disabled --- Aktywator/Bws.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index eb4864c..36ef372 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -615,6 +615,7 @@ namespace Aktywator if (this.getMySQLDatabaseForSection() != null) { Setting.saveScoringType(this.sql, 4, section); + Setting.saveSectionGroups(this.sql, true, Convert.ToInt32(main.numTeamsTableOffset.Value)); Setting.save("BM2SummaryPoints", "0", this, errors, section); } else -- cgit v1.2.3 From e010784a72017a46239504308c88a7199c65ff72 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 20 Feb 2019 16:19:15 +0100 Subject: Changelog indicating the release date of latest RC --- Aktywator.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Aktywator.txt b/Aktywator.txt index 060e3f2..b627842 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -2,8 +2,8 @@ - nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze) - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa); nie da się również zmienić sposoby liczenia (maksy/butler/cavendish) w trakcie sesji - ograniczenia BCS -Aktywator 1.1.5 (release candidate) -??.??.2018 [mkl] +Aktywator 1.1.5 +17.11.2018 [mkl] * poprawa bezpieczeństwa PINów - losowanie PINu przy inicjalizacji - możliwość ręcznego wylosowania PINu @@ -13,6 +13,7 @@ Aktywator 1.1.5 (release candidate) * obsługa podsumowania meczu/historii turnieju po zakońćzeniu sesji * obsługa opcji "pierwszy numer ręcznie" przy automatycznym wpisywaniu numerów rozdań +--------------------- Aktywator 1.1.4 05.10.2018 [mkl] * wczytywanie nazwisk do indywiduela granego parami -- cgit v1.2.3