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(-) (limited to 'Aktywator') 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