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