From cda00c4a001a736524812fa9a62844a2da715651 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 22 Aug 2017 21:43:08 +0200 Subject: Automatic version number and build date loading --- Aktywator/Resources/BuildDate.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Aktywator/Resources/BuildDate.txt (limited to 'Aktywator/Resources') diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt new file mode 100644 index 0000000..2c6557e --- /dev/null +++ b/Aktywator/Resources/BuildDate.txt @@ -0,0 +1 @@ +2017-08-22 -- cgit v1.2.3 From e22168fba7677b945e9157c4ea5c6812db6ca262 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 23 Aug 2017 00:26:01 +0200 Subject: Major settings tab redesign --- Aktywator/MainForm.Designer.cs | 945 +++++++++++++++++++++----------------- Aktywator/MainForm.cs | 9 + Aktywator/MainForm.resx | 67 ++- Aktywator/Resources/BuildDate.txt | 2 +- 4 files changed, 586 insertions(+), 437 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 20066e0..59a8b73 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,14 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.groupBoxTop = new System.Windows.Forms.GroupBox(); - this.bLaunch = new System.Windows.Forms.Button(); - this.labelFilename = new System.Windows.Forms.Label(); this.open = new System.Windows.Forms.OpenFileDialog(); - this.menu = new System.Windows.Forms.MenuStrip(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.konwertujuzupelnijBrakiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); this.status2 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -45,36 +38,50 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.xCollectPlay = new System.Windows.Forms.CheckBox(); - this.xCollectBidding = new System.Windows.Forms.CheckBox(); - this.xCheckLeadCard = new System.Windows.Forms.CheckBox(); - this.xViewHandrecord = new System.Windows.Forms.CheckBox(); - this.xResultsOverview = new System.Windows.Forms.ComboBox(); - this.bLoad = new System.Windows.Forms.Button(); - this.bSave = new System.Windows.Forms.Button(); + this.statusStrip2 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lRequiredVersion = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lDetectedVersion = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lRequiredFirmware = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStrip2 = new System.Windows.Forms.ToolStrip(); + this.bLoad = new System.Windows.Forms.ToolStripButton(); + this.bSave = new System.Windows.Forms.ToolStripButton(); + this.groupBox7 = new System.Windows.Forms.GroupBox(); this.xResetFunctionKey = new System.Windows.Forms.CheckBox(); - this.xShowPlayerNames = new System.Windows.Forms.CheckBox(); - this.xAutoBoardNumber = new System.Windows.Forms.CheckBox(); - this.xScoreCorrection = new System.Windows.Forms.CheckBox(); - this.xAutoShowScoreRecap = new System.Windows.Forms.CheckBox(); - this.xScoreRecap = new System.Windows.Forms.CheckBox(); - this.xNextSeatings = new System.Windows.Forms.CheckBox(); - this.xRemainingBoards = new System.Windows.Forms.CheckBox(); - this.xConfirmNP = new System.Windows.Forms.CheckBox(); - this.xPINcode = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); + this.xPINcode = new System.Windows.Forms.TextBox(); + this.xConfirmNP = new System.Windows.Forms.CheckBox(); + this.xScoreCorrection = new System.Windows.Forms.CheckBox(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); this.xAutoShutDownBPC = new System.Windows.Forms.CheckBox(); - this.xIntermediateResults = new System.Windows.Forms.CheckBox(); - this.xBoardOrderVerification = new System.Windows.Forms.CheckBox(); - this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox(); - this.xMemberNumbers = 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.groupBox5 = new System.Windows.Forms.GroupBox(); + this.xCheckLeadCard = new System.Windows.Forms.CheckBox(); this.xLeadCard = new System.Windows.Forms.CheckBox(); - this.xShowContract = new System.Windows.Forms.CheckBox(); - this.xShowPairNumbers = new System.Windows.Forms.CheckBox(); + this.xViewHandrecord = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); this.xGroupSections = new System.Windows.Forms.CheckBox(); - this.xShowPercentage = new System.Windows.Forms.CheckBox(); - this.xRepeatResults = new System.Windows.Forms.CheckBox(); this.xShowResults = new System.Windows.Forms.CheckBox(); + this.xRepeatResults = new System.Windows.Forms.CheckBox(); + this.xShowPercentage = new System.Windows.Forms.CheckBox(); + this.xShowContract = new System.Windows.Forms.CheckBox(); + this.xResultsOverview = new System.Windows.Forms.ComboBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.xCollectPlay = new System.Windows.Forms.CheckBox(); + this.xBoardOrderVerification = new System.Windows.Forms.CheckBox(); + this.xIntermediateResults = new System.Windows.Forms.CheckBox(); + this.xAutoBoardNumber = new System.Windows.Forms.CheckBox(); + this.xCollectBidding = new System.Windows.Forms.CheckBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.xMemberNumbers = new System.Windows.Forms.CheckBox(); + this.xShowPairNumbers = new System.Windows.Forms.CheckBox(); + this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox(); + this.xShowPlayerNames = new System.Windows.Forms.CheckBox(); this.label1 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.bRRBTournament = new System.Windows.Forms.Button(); @@ -112,100 +119,40 @@ this.bLoadHands = new System.Windows.Forms.Button(); this.timer = new System.Windows.Forms.Timer(this.components); this.openPBN = new System.Windows.Forms.OpenFileDialog(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.lRequiredVersion = new System.Windows.Forms.Label(); - this.lDetectedVersion = new System.Windows.Forms.Label(); - this.lRequiredFirmware = new System.Windows.Forms.Label(); - this.groupBoxTop.SuspendLayout(); - this.menu.SuspendLayout(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.labelFilename = new System.Windows.Forms.ToolStripLabel(); + this.bLaunch = new System.Windows.Forms.ToolStripButton(); + this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.statusStrip2.SuspendLayout(); + this.toolStrip2.SuspendLayout(); + this.groupBox7.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // - // groupBoxTop - // - this.groupBoxTop.Controls.Add(this.bLaunch); - this.groupBoxTop.Controls.Add(this.labelFilename); - this.groupBoxTop.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBoxTop.Location = new System.Drawing.Point(0, 24); - this.groupBoxTop.Name = "groupBoxTop"; - this.groupBoxTop.Size = new System.Drawing.Size(577, 46); - this.groupBoxTop.TabIndex = 0; - this.groupBoxTop.TabStop = false; - // - // bLaunch - // - this.bLaunch.Dock = System.Windows.Forms.DockStyle.Right; - this.bLaunch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.bLaunch.Location = new System.Drawing.Point(470, 16); - this.bLaunch.Name = "bLaunch"; - this.bLaunch.Size = new System.Drawing.Size(104, 27); - this.bLaunch.TabIndex = 1; - this.bLaunch.Text = "Uruchom BCS"; - this.bLaunch.UseVisualStyleBackColor = true; - this.bLaunch.Click += new System.EventHandler(this.bLaunch_Click); - // - // labelFilename - // - this.labelFilename.AutoSize = true; - this.labelFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.labelFilename.Location = new System.Drawing.Point(6, 16); - this.labelFilename.Name = "labelFilename"; - this.labelFilename.Size = new System.Drawing.Size(0, 24); - this.labelFilename.TabIndex = 0; - // // open // this.open.Filter = "BWS|*.bws"; // - // menu - // - this.menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem1}); - this.menu.Location = new System.Drawing.Point(0, 0); - this.menu.Name = "menu"; - this.menu.Size = new System.Drawing.Size(577, 24); - this.menu.TabIndex = 3; - this.menu.Text = "menuStrip1"; - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.konwertujuzupelnijBrakiToolStripMenuItem, - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem}); - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(42, 20); - this.toolStripMenuItem1.Text = "Inne"; - // - // konwertujuzupelnijBrakiToolStripMenuItem - // - this.konwertujuzupelnijBrakiToolStripMenuItem.Name = "konwertujuzupelnijBrakiToolStripMenuItem"; - this.konwertujuzupelnijBrakiToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.konwertujuzupelnijBrakiToolStripMenuItem.Text = "Konwertuj (uzupelnij braki)"; - this.konwertujuzupelnijBrakiToolStripMenuItem.Click += new System.EventHandler(this.konwertujuzupelnijBrakiToolStripMenuItem_Click); - // - // updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem - // - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem.Name = "updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem"; - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem.Size = new System.Drawing.Size(237, 22); - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem.Text = "Update ustawień w trakcie sesji"; - this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem.Click += new System.EventHandler(this.updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem_Click); - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.status1, this.status2, this.status3}); - this.statusStrip1.Location = new System.Drawing.Point(0, 489); + this.statusStrip1.Location = new System.Drawing.Point(0, 568); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(577, 22); + this.statusStrip1.Size = new System.Drawing.Size(583, 22); this.statusStrip1.TabIndex = 2; this.statusStrip1.Text = "statusBar"; // @@ -233,9 +180,9 @@ // this.groupBox1.Controls.Add(this.tabControl1); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(0, 70); + this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(577, 419); + this.groupBox1.Size = new System.Drawing.Size(583, 568); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // @@ -244,381 +191,509 @@ this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(3, 16); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tabControl1.Location = new System.Drawing.Point(3, 28); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(571, 400); + this.tabControl1.Size = new System.Drawing.Size(577, 537); this.tabControl1.TabIndex = 0; // // tabPage1 // - this.tabPage1.Controls.Add(this.lRequiredFirmware); - this.tabPage1.Controls.Add(this.lDetectedVersion); - this.tabPage1.Controls.Add(this.lRequiredVersion); - this.tabPage1.Controls.Add(this.label17); - this.tabPage1.Controls.Add(this.label16); - this.tabPage1.Controls.Add(this.label15); - this.tabPage1.Controls.Add(this.xCollectPlay); - this.tabPage1.Controls.Add(this.xCollectBidding); - this.tabPage1.Controls.Add(this.xCheckLeadCard); - this.tabPage1.Controls.Add(this.xViewHandrecord); - this.tabPage1.Controls.Add(this.xResultsOverview); - this.tabPage1.Controls.Add(this.bLoad); - this.tabPage1.Controls.Add(this.bSave); - this.tabPage1.Controls.Add(this.xResetFunctionKey); - this.tabPage1.Controls.Add(this.xShowPlayerNames); - this.tabPage1.Controls.Add(this.xAutoBoardNumber); - this.tabPage1.Controls.Add(this.xScoreCorrection); - this.tabPage1.Controls.Add(this.xAutoShowScoreRecap); - this.tabPage1.Controls.Add(this.xScoreRecap); - this.tabPage1.Controls.Add(this.xNextSeatings); - this.tabPage1.Controls.Add(this.xRemainingBoards); - this.tabPage1.Controls.Add(this.xConfirmNP); - this.tabPage1.Controls.Add(this.xPINcode); - this.tabPage1.Controls.Add(this.label2); - this.tabPage1.Controls.Add(this.xAutoShutDownBPC); - this.tabPage1.Controls.Add(this.xIntermediateResults); - this.tabPage1.Controls.Add(this.xBoardOrderVerification); - this.tabPage1.Controls.Add(this.xMemberNumbersNoBlankEntry); - this.tabPage1.Controls.Add(this.xMemberNumbers); - this.tabPage1.Controls.Add(this.xLeadCard); - this.tabPage1.Controls.Add(this.xShowContract); - this.tabPage1.Controls.Add(this.xShowPairNumbers); - this.tabPage1.Controls.Add(this.xGroupSections); - this.tabPage1.Controls.Add(this.xShowPercentage); - this.tabPage1.Controls.Add(this.xRepeatResults); - this.tabPage1.Controls.Add(this.xShowResults); + this.tabPage1.Controls.Add(this.statusStrip2); + this.tabPage1.Controls.Add(this.toolStrip2); + this.tabPage1.Controls.Add(this.groupBox7); + this.tabPage1.Controls.Add(this.groupBox6); + this.tabPage1.Controls.Add(this.groupBox5); + this.tabPage1.Controls.Add(this.groupBox4); + this.tabPage1.Controls.Add(this.groupBox3); + this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.label1); 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(563, 374); + this.tabPage1.Size = new System.Drawing.Size(569, 511); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Ustawienia"; this.tabPage1.UseVisualStyleBackColor = true; // - // xCollectPlay + // statusStrip2 + // + this.statusStrip2.BackColor = System.Drawing.Color.White; + this.statusStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabel1, + this.lRequiredVersion, + this.toolStripStatusLabel2, + this.lDetectedVersion, + this.toolStripStatusLabel3, + this.lRequiredFirmware}); + this.statusStrip2.Location = new System.Drawing.Point(3, 486); + this.statusStrip2.Name = "statusStrip2"; + this.statusStrip2.Size = new System.Drawing.Size(563, 22); + this.statusStrip2.SizingGrip = false; + this.statusStrip2.TabIndex = 46; + this.statusStrip2.Text = "statusStrip2"; + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(130, 17); + this.toolStripStatusLabel1.Text = "Wymagana wersja BCS:"; // - this.xCollectPlay.AutoSize = true; - this.xCollectPlay.Location = new System.Drawing.Point(339, 138); - this.xCollectPlay.Name = "xCollectPlay"; - this.xCollectPlay.Size = new System.Drawing.Size(146, 17); - this.xCollectPlay.TabIndex = 31; - this.xCollectPlay.Text = "zbieraj przebieg rozgrywki"; - this.xCollectPlay.UseVisualStyleBackColor = true; + // lRequiredVersion // - // xCollectBidding + this.lRequiredVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.lRequiredVersion.Margin = new System.Windows.Forms.Padding(0, 3, 20, 2); + this.lRequiredVersion.Name = "lRequiredVersion"; + this.lRequiredVersion.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.lRequiredVersion.Size = new System.Drawing.Size(44, 17); + this.lRequiredVersion.Text = "0.0.0"; // - this.xCollectBidding.AutoSize = true; - this.xCollectBidding.Location = new System.Drawing.Point(339, 115); - this.xCollectBidding.Name = "xCollectBidding"; - this.xCollectBidding.Size = new System.Drawing.Size(97, 17); - this.xCollectBidding.TabIndex = 30; - this.xCollectBidding.Text = "zbieraj licytację"; - this.xCollectBidding.UseVisualStyleBackColor = true; + // toolStripStatusLabel2 // - // xCheckLeadCard + this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; + this.toolStripStatusLabel2.Size = new System.Drawing.Size(113, 17); + this.toolStripStatusLabel2.Text = "Wykryta wersja BCS:"; // - this.xCheckLeadCard.AutoSize = true; - this.xCheckLeadCard.Location = new System.Drawing.Point(339, 253); - 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; + // lDetectedVersion // - // xViewHandrecord + this.lDetectedVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.lDetectedVersion.Margin = new System.Windows.Forms.Padding(0, 3, 20, 2); + this.lDetectedVersion.Name = "lDetectedVersion"; + this.lDetectedVersion.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.lDetectedVersion.Size = new System.Drawing.Size(44, 17); + this.lDetectedVersion.Text = "0.0.0"; // - 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(6, 230); - 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; + // toolStripStatusLabel3 // - // xResultsOverview + this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; + this.toolStripStatusLabel3.Size = new System.Drawing.Size(120, 17); + this.toolStripStatusLabel3.Text = "Wymagany firmware:"; // - this.xResultsOverview.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.xResultsOverview.Enabled = false; - this.xResultsOverview.FormattingEnabled = true; - this.xResultsOverview.Items.AddRange(new object[] { - "frekwens, 6x1", - "frekwens, 6x2", - "frekwens, 4x1", - "traveler, 6x1", - "traveler, 6x2", - "traveler, 4x1"}); - this.xResultsOverview.Location = new System.Drawing.Point(160, 19); - this.xResultsOverview.Name = "xResultsOverview"; - this.xResultsOverview.Size = new System.Drawing.Size(103, 21); - this.xResultsOverview.TabIndex = 28; + // lRequiredFirmware + // + this.lRequiredFirmware.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.lRequiredFirmware.Name = "lRequiredFirmware"; + this.lRequiredFirmware.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.lRequiredFirmware.Size = new System.Drawing.Size(44, 17); + this.lRequiredFirmware.Text = "0.0.0"; + // + // toolStrip2 + // + this.toolStrip2.BackColor = System.Drawing.Color.White; + this.toolStrip2.GripMargin = new System.Windows.Forms.Padding(0); + this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bLoad, + this.bSave}); + this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; + this.toolStrip2.Location = new System.Drawing.Point(3, 3); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.Size = new System.Drawing.Size(563, 25); + this.toolStrip2.TabIndex = 45; + this.toolStrip2.Text = "toolStrip2"; // // bLoad // - this.bLoad.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.bLoad.Location = new System.Drawing.Point(3, 336); + this.bLoad.Image = ((System.Drawing.Image)(resources.GetObject("bLoad.Image"))); + this.bLoad.ImageTransparentColor = System.Drawing.Color.Magenta; this.bLoad.Name = "bLoad"; - this.bLoad.Size = new System.Drawing.Size(176, 23); - this.bLoad.TabIndex = 26; + this.bLoad.Size = new System.Drawing.Size(216, 22); this.bLoad.Text = "Ponownie wczytaj ustawienia z BWS"; - this.bLoad.UseVisualStyleBackColor = true; this.bLoad.Click += new System.EventHandler(this.bLoad_Click); // // bSave // - this.bSave.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.bSave.Location = new System.Drawing.Point(185, 336); + this.bSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.bSave.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.bSave.Image = ((System.Drawing.Image)(resources.GetObject("bSave.Image"))); + this.bSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.bSave.Name = "bSave"; - this.bSave.Size = new System.Drawing.Size(126, 23); - this.bSave.TabIndex = 25; + this.bSave.Size = new System.Drawing.Size(108, 22); this.bSave.Text = "Zapisz do BWS"; - this.bSave.UseVisualStyleBackColor = true; this.bSave.Click += new System.EventHandler(this.bSave_Click); // + // groupBox7 + // + this.groupBox7.Controls.Add(this.xResetFunctionKey); + this.groupBox7.Controls.Add(this.label2); + 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(267, 355); + this.groupBox7.Name = "groupBox7"; + this.groupBox7.Size = new System.Drawing.Size(294, 121); + this.groupBox7.TabIndex = 44; + this.groupBox7.TabStop = false; + this.groupBox7.Text = "Opcje sędziowskie"; + // // xResetFunctionKey // this.xResetFunctionKey.AutoSize = true; - this.xResetFunctionKey.Location = new System.Drawing.Point(339, 299); + this.xResetFunctionKey.Location = new System.Drawing.Point(13, 92); this.xResetFunctionKey.Name = "xResetFunctionKey"; this.xResetFunctionKey.Size = new System.Drawing.Size(207, 17); this.xResetFunctionKey.TabIndex = 24; this.xResetFunctionKey.Text = "zawodnik może zresetować pierniczka"; this.xResetFunctionKey.UseVisualStyleBackColor = true; // - // xShowPlayerNames + // label2 // - 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(6, 207); - this.xShowPlayerNames.Name = "xShowPlayerNames"; - this.xShowPlayerNames.Size = new System.Drawing.Size(126, 17); - this.xShowPlayerNames.TabIndex = 9; - this.xShowPlayerNames.Text = "pokazuj nazwiska"; - this.xShowPlayerNames.UseVisualStyleBackColor = true; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(10, 25); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(25, 13); + this.label2.TabIndex = 27; + this.label2.Text = "PIN"; // - // xAutoBoardNumber + // xPINcode // - this.xAutoBoardNumber.AutoSize = true; - this.xAutoBoardNumber.Location = new System.Drawing.Point(6, 253); - this.xAutoBoardNumber.Name = "xAutoBoardNumber"; - this.xAutoBoardNumber.Size = new System.Drawing.Size(174, 17); - this.xAutoBoardNumber.TabIndex = 10; - this.xAutoBoardNumber.Text = "automat. wpisuj numer rozdania"; - this.xAutoBoardNumber.UseVisualStyleBackColor = true; + this.xPINcode.Location = new System.Drawing.Point(41, 21); + 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"; + // + // xConfirmNP + // + this.xConfirmNP.AutoSize = true; + this.xConfirmNP.Location = new System.Drawing.Point(13, 46); + this.xConfirmNP.Name = "xConfirmNP"; + this.xConfirmNP.Size = new System.Drawing.Size(198, 17); + this.xConfirmNP.TabIndex = 22; + this.xConfirmNP.Text = "NoPlay potwierdzany przez sędziego"; + this.xConfirmNP.UseVisualStyleBackColor = true; // // xScoreCorrection // this.xScoreCorrection.AutoSize = true; - this.xScoreCorrection.Location = new System.Drawing.Point(339, 276); + this.xScoreCorrection.Location = new System.Drawing.Point(13, 69); this.xScoreCorrection.Name = "xScoreCorrection"; this.xScoreCorrection.Size = new System.Drawing.Size(186, 17); this.xScoreCorrection.TabIndex = 23; this.xScoreCorrection.Text = "zawodnicy sami poprawiają zapisy"; this.xScoreCorrection.UseVisualStyleBackColor = true; // - // xAutoShowScoreRecap - // - this.xAutoShowScoreRecap.AutoSize = true; - this.xAutoShowScoreRecap.Location = new System.Drawing.Point(339, 184); - this.xAutoShowScoreRecap.Name = "xAutoShowScoreRecap"; - this.xAutoShowScoreRecap.Size = new System.Drawing.Size(228, 17); - this.xAutoShowScoreRecap.TabIndex = 13; - this.xAutoShowScoreRecap.Text = "podgląd zapisów na koniec rundy automat."; - this.xAutoShowScoreRecap.UseVisualStyleBackColor = true; - // - // xScoreRecap + // groupBox6 // - this.xScoreRecap.AutoSize = true; - this.xScoreRecap.Location = new System.Drawing.Point(339, 161); - this.xScoreRecap.Name = "xScoreRecap"; - this.xScoreRecap.Size = new System.Drawing.Size(176, 17); - this.xScoreRecap.TabIndex = 12; - this.xScoreRecap.Text = "podgląd zapisów bieżącej rundy"; - this.xScoreRecap.UseVisualStyleBackColor = true; + 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(267, 209); + 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"; // - // xNextSeatings + // xAutoShutDownBPC // - this.xNextSeatings.AutoSize = true; - this.xNextSeatings.Location = new System.Drawing.Point(6, 184); - this.xNextSeatings.Name = "xNextSeatings"; - this.xNextSeatings.Size = new System.Drawing.Size(192, 17); - this.xNextSeatings.TabIndex = 8; - this.xNextSeatings.Text = "pokazuj rozstawienie kolejnej rundy"; - this.xNextSeatings.UseVisualStyleBackColor = true; + 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; - this.xRemainingBoards.Location = new System.Drawing.Point(6, 299); + this.xRemainingBoards.Location = new System.Drawing.Point(13, 68); this.xRemainingBoards.Name = "xRemainingBoards"; this.xRemainingBoards.Size = new System.Drawing.Size(205, 17); this.xRemainingBoards.TabIndex = 11; this.xRemainingBoards.Text = "pokazuj liczbę rozdań do końca rundy"; this.xRemainingBoards.UseVisualStyleBackColor = true; // - // xConfirmNP - // - this.xConfirmNP.AutoSize = true; - this.xConfirmNP.Location = new System.Drawing.Point(339, 46); - this.xConfirmNP.Name = "xConfirmNP"; - this.xConfirmNP.Size = new System.Drawing.Size(198, 17); - this.xConfirmNP.TabIndex = 22; - this.xConfirmNP.Text = "NoPlay potwierdzany przez sędziego"; - this.xConfirmNP.UseVisualStyleBackColor = true; - // - // xPINcode - // - this.xPINcode.Location = new System.Drawing.Point(367, 21); - 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"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(336, 24); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(25, 13); - this.label2.TabIndex = 27; - this.label2.Text = "PIN"; - // - // xAutoShutDownBPC + // xNextSeatings // - this.xAutoShutDownBPC.AutoSize = true; - this.xAutoShutDownBPC.Location = new System.Drawing.Point(339, 92); - 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; + this.xNextSeatings.AutoSize = true; + this.xNextSeatings.Location = new System.Drawing.Point(13, 91); + this.xNextSeatings.Name = "xNextSeatings"; + this.xNextSeatings.Size = new System.Drawing.Size(192, 17); + this.xNextSeatings.TabIndex = 8; + this.xNextSeatings.Text = "pokazuj rozstawienie kolejnej rundy"; + this.xNextSeatings.UseVisualStyleBackColor = true; // - // xIntermediateResults + // xScoreRecap // - this.xIntermediateResults.AutoSize = true; - this.xIntermediateResults.Location = new System.Drawing.Point(339, 69); - this.xIntermediateResults.Name = "xIntermediateResults"; - this.xIntermediateResults.Size = new System.Drawing.Size(161, 17); - this.xIntermediateResults.TabIndex = 16; - this.xIntermediateResults.Text = "zbieranie danych pośrednich"; - this.xIntermediateResults.UseVisualStyleBackColor = true; + this.xScoreRecap.AutoSize = true; + this.xScoreRecap.Location = new System.Drawing.Point(13, 22); + this.xScoreRecap.Name = "xScoreRecap"; + this.xScoreRecap.Size = new System.Drawing.Size(176, 17); + this.xScoreRecap.TabIndex = 12; + this.xScoreRecap.Text = "podgląd zapisów bieżącej rundy"; + this.xScoreRecap.UseVisualStyleBackColor = true; // - // xBoardOrderVerification + // xAutoShowScoreRecap // - this.xBoardOrderVerification.AutoSize = true; - this.xBoardOrderVerification.Location = new System.Drawing.Point(6, 276); - this.xBoardOrderVerification.Name = "xBoardOrderVerification"; - this.xBoardOrderVerification.Size = new System.Drawing.Size(156, 17); - this.xBoardOrderVerification.TabIndex = 15; - this.xBoardOrderVerification.Text = "sprawdzaj kolejność rozdań"; - this.xBoardOrderVerification.UseVisualStyleBackColor = true; + this.xAutoShowScoreRecap.AutoSize = true; + this.xAutoShowScoreRecap.Location = new System.Drawing.Point(13, 45); + this.xAutoShowScoreRecap.Name = "xAutoShowScoreRecap"; + this.xAutoShowScoreRecap.Size = new System.Drawing.Size(228, 17); + this.xAutoShowScoreRecap.TabIndex = 13; + this.xAutoShowScoreRecap.Text = "podgląd zapisów na koniec rundy automat."; + this.xAutoShowScoreRecap.UseVisualStyleBackColor = true; // - // xMemberNumbersNoBlankEntry + // groupBox5 // - this.xMemberNumbersNoBlankEntry.AutoSize = true; - this.xMemberNumbersNoBlankEntry.Enabled = false; - this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(27, 161); - this.xMemberNumbersNoBlankEntry.Name = "xMemberNumbersNoBlankEntry"; - this.xMemberNumbersNoBlankEntry.Size = new System.Drawing.Size(131, 17); - this.xMemberNumbersNoBlankEntry.TabIndex = 7; - this.xMemberNumbersNoBlankEntry.Text = "ID nie może być puste"; - this.xMemberNumbersNoBlankEntry.UseVisualStyleBackColor = true; + 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(1, 355); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(257, 121); + this.groupBox5.TabIndex = 42; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Rozkłady"; // - // xMemberNumbers + // xCheckLeadCard // - this.xMemberNumbers.AutoSize = true; - this.xMemberNumbers.Location = new System.Drawing.Point(6, 138); - this.xMemberNumbers.Name = "xMemberNumbers"; - this.xMemberNumbers.Size = new System.Drawing.Size(133, 17); - this.xMemberNumbers.TabIndex = 6; - this.xMemberNumbers.Text = "pytaj o ID zawodników"; - this.xMemberNumbers.UseVisualStyleBackColor = true; - this.xMemberNumbers.CheckedChanged += new System.EventHandler(this.xMemberNumbers_CheckedChanged); + 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(339, 230); + 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; // - // xShowContract - // - this.xShowContract.AutoSize = true; - this.xShowContract.Location = new System.Drawing.Point(339, 207); - this.xShowContract.Name = "xShowContract"; - this.xShowContract.Size = new System.Drawing.Size(150, 17); - this.xShowContract.TabIndex = 20; - this.xShowContract.Text = "pokazuj znaczki brydżowe"; - this.xShowContract.UseVisualStyleBackColor = true; + // xViewHandrecord // - // xShowPairNumbers + 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; // - this.xShowPairNumbers.AutoSize = true; - this.xShowPairNumbers.Location = new System.Drawing.Point(6, 115); - this.xShowPairNumbers.Name = "xShowPairNumbers"; - this.xShowPairNumbers.Size = new System.Drawing.Size(118, 17); - this.xShowPairNumbers.TabIndex = 5; - this.xShowPairNumbers.Text = "pokazuj numery par"; - this.xShowPairNumbers.UseVisualStyleBackColor = true; + // groupBox4 + // + this.groupBox4.Controls.Add(this.xGroupSections); + this.groupBox4.Controls.Add(this.xShowResults); + this.groupBox4.Controls.Add(this.xRepeatResults); + this.groupBox4.Controls.Add(this.xShowPercentage); + this.groupBox4.Controls.Add(this.xShowContract); + this.groupBox4.Controls.Add(this.xResultsOverview); + this.groupBox4.Location = new System.Drawing.Point(267, 65); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(294, 138); + this.groupBox4.TabIndex = 41; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Protokół"; // // xGroupSections // this.xGroupSections.AutoSize = true; this.xGroupSections.Enabled = false; - this.xGroupSections.Location = new System.Drawing.Point(27, 92); + this.xGroupSections.Location = new System.Drawing.Point(34, 89); this.xGroupSections.Name = "xGroupSections"; this.xGroupSections.Size = new System.Drawing.Size(215, 17); this.xGroupSections.TabIndex = 4; this.xGroupSections.Text = "oddzielne maksowanie każdego sektora"; this.xGroupSections.UseVisualStyleBackColor = true; // - // xShowPercentage + // xShowResults // - this.xShowPercentage.AutoSize = true; - this.xShowPercentage.Enabled = false; - this.xShowPercentage.Location = new System.Drawing.Point(27, 69); - 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; + 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); // // xRepeatResults // this.xRepeatResults.AutoSize = true; this.xRepeatResults.Enabled = false; - this.xRepeatResults.Location = new System.Drawing.Point(27, 46); + this.xRepeatResults.Location = new System.Drawing.Point(34, 43); 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; // - // xShowResults + // xShowPercentage // - this.xShowResults.AutoSize = true; - this.xShowResults.Location = new System.Drawing.Point(6, 23); - 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.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.Name = "xShowContract"; + this.xShowContract.Size = new System.Drawing.Size(150, 17); + this.xShowContract.TabIndex = 20; + this.xShowContract.Text = "pokazuj znaczki brydżowe"; + this.xShowContract.UseVisualStyleBackColor = true; + // + // xResultsOverview + // + this.xResultsOverview.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.xResultsOverview.Enabled = false; + this.xResultsOverview.FormattingEnabled = true; + this.xResultsOverview.Items.AddRange(new object[] { + "frekwens, 6x1", + "frekwens, 6x2", + "frekwens, 4x1", + "traveler, 6x1", + "traveler, 6x2", + "traveler, 4x1"}); + this.xResultsOverview.Location = new System.Drawing.Point(178, 18); + this.xResultsOverview.Name = "xResultsOverview"; + this.xResultsOverview.Size = new System.Drawing.Size(103, 21); + this.xResultsOverview.TabIndex = 28; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.xCollectPlay); + this.groupBox3.Controls.Add(this.xBoardOrderVerification); + 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(1, 209); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(257, 140); + this.groupBox3.TabIndex = 40; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Zapis rozdania"; + // + // xCollectPlay + // + this.xCollectPlay.AutoSize = true; + this.xCollectPlay.Location = new System.Drawing.Point(12, 114); + this.xCollectPlay.Name = "xCollectPlay"; + this.xCollectPlay.Size = new System.Drawing.Size(146, 17); + this.xCollectPlay.TabIndex = 31; + this.xCollectPlay.Text = "zbieraj przebieg rozgrywki"; + this.xCollectPlay.UseVisualStyleBackColor = true; + // + // xBoardOrderVerification + // + this.xBoardOrderVerification.AutoSize = true; + this.xBoardOrderVerification.Location = new System.Drawing.Point(12, 45); + this.xBoardOrderVerification.Name = "xBoardOrderVerification"; + this.xBoardOrderVerification.Size = new System.Drawing.Size(156, 17); + this.xBoardOrderVerification.TabIndex = 15; + this.xBoardOrderVerification.Text = "sprawdzaj kolejność rozdań"; + this.xBoardOrderVerification.UseVisualStyleBackColor = true; + // + // xIntermediateResults + // + this.xIntermediateResults.AutoSize = true; + this.xIntermediateResults.Location = new System.Drawing.Point(12, 68); + this.xIntermediateResults.Name = "xIntermediateResults"; + this.xIntermediateResults.Size = new System.Drawing.Size(161, 17); + this.xIntermediateResults.TabIndex = 16; + this.xIntermediateResults.Text = "zbieranie danych pośrednich"; + this.xIntermediateResults.UseVisualStyleBackColor = true; + // + // xAutoBoardNumber + // + this.xAutoBoardNumber.AutoSize = true; + this.xAutoBoardNumber.Location = new System.Drawing.Point(12, 22); + this.xAutoBoardNumber.Name = "xAutoBoardNumber"; + this.xAutoBoardNumber.Size = new System.Drawing.Size(174, 17); + this.xAutoBoardNumber.TabIndex = 10; + this.xAutoBoardNumber.Text = "automat. wpisuj numer rozdania"; + this.xAutoBoardNumber.UseVisualStyleBackColor = true; + // + // xCollectBidding + // + this.xCollectBidding.AutoSize = true; + this.xCollectBidding.Location = new System.Drawing.Point(12, 91); + this.xCollectBidding.Name = "xCollectBidding"; + this.xCollectBidding.Size = new System.Drawing.Size(97, 17); + this.xCollectBidding.TabIndex = 30; + this.xCollectBidding.Text = "zbieraj licytację"; + this.xCollectBidding.UseVisualStyleBackColor = true; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.xMemberNumbers); + this.groupBox2.Controls.Add(this.xShowPairNumbers); + this.groupBox2.Controls.Add(this.xMemberNumbersNoBlankEntry); + this.groupBox2.Controls.Add(this.xShowPlayerNames); + this.groupBox2.Location = new System.Drawing.Point(1, 65); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(257, 138); + this.groupBox2.TabIndex = 39; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Rozstawienie"; + // + // xMemberNumbers + // + this.xMemberNumbers.AutoSize = true; + this.xMemberNumbers.Location = new System.Drawing.Point(12, 67); + this.xMemberNumbers.Name = "xMemberNumbers"; + this.xMemberNumbers.Size = new System.Drawing.Size(133, 17); + this.xMemberNumbers.TabIndex = 6; + this.xMemberNumbers.Text = "pytaj o ID zawodników"; + this.xMemberNumbers.UseVisualStyleBackColor = true; + this.xMemberNumbers.CheckedChanged += new System.EventHandler(this.xMemberNumbers_CheckedChanged); + // + // xShowPairNumbers + // + this.xShowPairNumbers.AutoSize = true; + this.xShowPairNumbers.Location = new System.Drawing.Point(12, 44); + this.xShowPairNumbers.Name = "xShowPairNumbers"; + this.xShowPairNumbers.Size = new System.Drawing.Size(118, 17); + this.xShowPairNumbers.TabIndex = 5; + this.xShowPairNumbers.Text = "pokazuj numery par"; + this.xShowPairNumbers.UseVisualStyleBackColor = true; + // + // xMemberNumbersNoBlankEntry + // + this.xMemberNumbersNoBlankEntry.AutoSize = true; + this.xMemberNumbersNoBlankEntry.Enabled = false; + this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(33, 90); + this.xMemberNumbersNoBlankEntry.Name = "xMemberNumbersNoBlankEntry"; + this.xMemberNumbersNoBlankEntry.Size = new System.Drawing.Size(131, 17); + this.xMemberNumbersNoBlankEntry.TabIndex = 7; + this.xMemberNumbersNoBlankEntry.Text = "ID nie może być puste"; + this.xMemberNumbersNoBlankEntry.UseVisualStyleBackColor = true; + // + // xShowPlayerNames + // + 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.Name = "xShowPlayerNames"; + this.xShowPlayerNames.Size = new System.Drawing.Size(126, 17); + this.xShowPlayerNames.TabIndex = 9; + this.xShowPlayerNames.Text = "pokazuj nazwiska"; + this.xShowPlayerNames.UseVisualStyleBackColor = true; // // label1 // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.label1.ForeColor = System.Drawing.SystemColors.WindowText; - this.label1.Location = new System.Drawing.Point(83, 4); + this.label1.Location = new System.Drawing.Point(89, 37); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(398, 13); this.label1.TabIndex = 0; @@ -653,7 +728,7 @@ 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(563, 374); + this.tabPage2.Size = new System.Drawing.Size(569, 511); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Nazwiska"; this.tabPage2.UseVisualStyleBackColor = true; @@ -890,7 +965,7 @@ 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(563, 374); + this.tabPage3.Size = new System.Drawing.Size(569, 511); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Rozkłady"; this.tabPage3.UseVisualStyleBackColor = true; @@ -991,92 +1066,93 @@ // this.openPBN.Filter = "PBN|*.pbn"; // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(315, 319); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(121, 13); - this.label15.TabIndex = 33; - this.label15.Text = "Wymagana wersja BCS:"; - // - // label16 + // toolStrip1 // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(330, 336); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(106, 13); - this.label16.TabIndex = 34; - this.label16.Text = "Wykryta wersja BCS:"; + this.toolStrip1.GripMargin = new System.Windows.Forms.Padding(0); + this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.labelFilename, + this.bLaunch, + this.bUpdateSession}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(583, 25); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(330, 352); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(105, 13); - this.label17.TabIndex = 35; - this.label17.Text = "Wymagany firmware:"; - // - // lRequiredVersion + // labelFilename // - this.lRequiredVersion.AutoSize = true; - this.lRequiredVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lRequiredVersion.Location = new System.Drawing.Point(448, 319); - this.lRequiredVersion.Name = "lRequiredVersion"; - this.lRequiredVersion.Size = new System.Drawing.Size(0, 13); - this.lRequiredVersion.TabIndex = 36; + this.labelFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.labelFilename.Name = "labelFilename"; + this.labelFilename.Size = new System.Drawing.Size(0, 22); // - // lDetectedVersion + // bLaunch // - this.lDetectedVersion.AutoSize = true; - this.lDetectedVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lDetectedVersion.Location = new System.Drawing.Point(448, 336); - this.lDetectedVersion.Name = "lDetectedVersion"; - this.lDetectedVersion.Size = new System.Drawing.Size(0, 13); - this.lDetectedVersion.TabIndex = 37; + this.bLaunch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.bLaunch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.bLaunch.Image = ((System.Drawing.Image)(resources.GetObject("bLaunch.Image"))); + this.bLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bLaunch.Name = "bLaunch"; + this.bLaunch.Size = new System.Drawing.Size(54, 22); + this.bLaunch.Text = "BCS"; + this.bLaunch.ToolTipText = "Uruchom BCS"; + this.bLaunch.Click += new System.EventHandler(this.bLaunch_Click); // - // lRequiredFirmware + // bUpdateSession // - this.lRequiredFirmware.AutoSize = true; - this.lRequiredFirmware.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lRequiredFirmware.Location = new System.Drawing.Point(448, 352); - this.lRequiredFirmware.Name = "lRequiredFirmware"; - this.lRequiredFirmware.Size = new System.Drawing.Size(0, 13); - this.lRequiredFirmware.TabIndex = 38; + this.bUpdateSession.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.bUpdateSession.Image = ((System.Drawing.Image)(resources.GetObject("bUpdateSession.Image"))); + this.bUpdateSession.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bUpdateSession.Name = "bUpdateSession"; + this.bUpdateSession.Size = new System.Drawing.Size(65, 22); + this.bUpdateSession.Text = "Update"; + this.bUpdateSession.ToolTipText = "Update ustawień w trakcie sesji"; + this.bUpdateSession.Click += new System.EventHandler(this.updateSession_Click); // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(577, 511); + this.ClientSize = new System.Drawing.Size(583, 590); + this.Controls.Add(this.toolStrip1); this.Controls.Add(this.groupBox1); this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.groupBoxTop); - this.Controls.Add(this.menu); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menu; this.MaximizeBox = false; this.Name = "MainForm"; this.Text = "Aktywator"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); this.Load += new System.EventHandler(this.MainForm_Load); this.Shown += new System.EventHandler(this.MainForm_Shown); - this.groupBoxTop.ResumeLayout(false); - this.groupBoxTop.PerformLayout(); - this.menu.ResumeLayout(false); - this.menu.PerformLayout(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.groupBox1.ResumeLayout(false); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); + this.statusStrip2.ResumeLayout(false); + this.statusStrip2.PerformLayout(); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); + this.groupBox7.ResumeLayout(false); + this.groupBox7.PerformLayout(); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1084,14 +1160,7 @@ #endregion - private System.Windows.Forms.GroupBox groupBoxTop; - private System.Windows.Forms.Label labelFilename; private System.Windows.Forms.OpenFileDialog open; - private System.Windows.Forms.Button bLaunch; - private System.Windows.Forms.MenuStrip menu; - private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem konwertujuzupelnijBrakiToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem updateUstawieńWSerwerkuWTrakcieSesjiToolStripMenuItem; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel status1; private System.Windows.Forms.ToolStripStatusLabel status2; @@ -1124,8 +1193,6 @@ public System.Windows.Forms.CheckBox xNextSeatings; public System.Windows.Forms.CheckBox xRemainingBoards; public System.Windows.Forms.CheckBox xResetFunctionKey; - private System.Windows.Forms.Button bSave; - private System.Windows.Forms.Button bLoad; private System.Windows.Forms.Label lTournament; private System.Windows.Forms.Button bMySQLTournament; private System.Windows.Forms.Label label3; @@ -1166,12 +1233,26 @@ private System.Windows.Forms.Label lRecordSections; private System.Windows.Forms.Button bClearHands; private System.Windows.Forms.Button bRRBTournament; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label lRequiredFirmware; - private System.Windows.Forms.Label lDetectedVersion; - private System.Windows.Forms.Label lRequiredVersion; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.GroupBox groupBox7; + private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel labelFilename; + private System.Windows.Forms.ToolStripButton bLaunch; + private System.Windows.Forms.ToolStripButton bUpdateSession; + private System.Windows.Forms.StatusStrip statusStrip2; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; + private System.Windows.Forms.ToolStrip toolStrip2; + private System.Windows.Forms.ToolStripStatusLabel lRequiredVersion; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2; + private System.Windows.Forms.ToolStripStatusLabel lDetectedVersion; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3; + private System.Windows.Forms.ToolStripStatusLabel lRequiredFirmware; + private System.Windows.Forms.ToolStripButton bLoad; + private System.Windows.Forms.ToolStripButton bSave; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 5b3539e..2ffbbf2 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -484,5 +484,14 @@ namespace Aktywator } } + private void updateSession_Click(object sender, EventArgs e) + { + if (trySave()) + { + bws.updateSettings(); + MessageBox.Show("Wykonano!", "Settings update", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index eb1dcd5..e102f5f 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -120,22 +120,81 @@ 17, 17 - - 212, 17 - 411, 17 + + 17, 56 + + + 815, 17 + + + + + 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== + + 527, 17 607, 17 + + 710, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADkSURBVDhPY0AHAgV8/wUKeH2hXNIBxAAKDAFpLrxuR74h + MAPINgSkKe+q7f+si1b/U8+ak24ISEPaOYv/iSdN/0cfNfwfsl+fNENAimOOGf8PPaD/33+39n/3rer/ + HdYrE28ISGHgHt3/nts0/zttUP1vvVLhv8limf86cyXBhkCV4QYgRS4b1f7brFb8b7pU7r/efMn/6rPE + SHOB+XL5//oLpP9rzhL/rzRVmHjNIABSrD1H/L/qdJH/cpMESdMMAiAN8pOF/kv185OuGQRAmsS7ecnT + DAIQjWRqBgGKNJMOGBgA1G2C1Zl37FUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPYxj8YPrOP/9BuH/Tt//Ny9/+L5v1+H9W/63/ + UGlUULvid3D5/I+r/eqvS0GFwAZ0bPj/v2zRr/+Jfc/+u5WdnQqVQgWVi37qtKz6cyq1/8l/s6RNd6DC + DD3rv/wvmPftf0zfx/9uFbf/2+YeP2KefEATKo0AFUu+TahY/O2/c/7p/6pBc99BhRlqF774H9Z6779z + zs1PFtkX/hsn7fuvG72pByqNAFVLP17Imf7+v2ny/v+6kevnQoUZcifd+W+fdzrHqfTSNNu8c//1Yrb9 + 1w1beh4qjQCN8z99Tp/69r9xwt7/BjE7rEBiaWlnWJM6roADLKz1jnVw0z2wAYpesz+DxFBAGdCAtKnv + /pul7ocbgAyyZr6zSZvy5r9h3C7sBlQs+Hghdcrb//a5p/9bpR+ZCRWGg5plv+dlTPvwXz9mx3+dkCUX + oMIIkD31ZV9879P/XlU3/vtW3HybOvHFnDygreULv9k0rP47v3z59/fBzff/64av+q8VtmIiVBsCRDTd + 1g6svXrUo+zKf9/aO//jep//z5z27n/ezI//c2Z9+g/SrBe9+b9m6JLTGmFrdaDaUIFr8QVfu+xjR43j + d//XjdkKxqBA04vZAgz55UDNi07rhS0NhirHDgxjd2nqhK3p0wyYe1HJb8oXENYKnH1JN3TJJPWQlbpQ + ZYMGMDAAAFzIDh1JAY8rAAAAAElFTkSuQmCC + + 43 - AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 2c6557e..ae51942 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-08-22 +2017-08-23 -- cgit v1.2.3 From 3fec214d46a27ea8e15d7ae1a3d318ca361226f2 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 24 Aug 2017 00:40:07 +0200 Subject: Version number bump --- Aktywator.txt | 10 +++++++--- Aktywator/Properties/AssemblyInfo.cs | 4 ++-- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator.txt b/Aktywator.txt index acda57d..5112eb0 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -2,9 +2,8 @@ - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa) --------------------- -Aktywator 1.1.0 (beta) -30.07.2017 [mkl] - * wczytywanie nazwisk z plików RRBridge +Aktywator 1.1.1 (beta) +24.08.2017 [mkl] * edytor nazwisk ładowanych do BWS * zmiana wyglądu zakładek * zapamiętywanie ustawień MySQL również dla bezhasłowych kont @@ -12,6 +11,11 @@ Aktywator 1.1.0 (beta) * plik BWS jest automatycznie uzupełniany o wszystkie potrzebne pola * poprawiono błąd pobierania numerów graczy przy wyświetlonych nazwach teamów +--------------------- +Aktywator 1.1.0 (beta) +30.07.2017 [mkl] + * wczytywanie nazwisk z plików RRBridge + --------------------- Aktywator 1.0.8 27.07.2017 [mkl] diff --git a/Aktywator/Properties/AssemblyInfo.cs b/Aktywator/Properties/AssemblyInfo.cs index b3ba87f..f355857 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.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.1.0")] +[assembly: AssemblyFileVersion("1.1.1.0")] diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index ae51942..c3ff3d9 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-08-23 +2017-08-24 -- cgit v1.2.3 From d05cbbf605136785b0c213b69d088a7e1bdfd293 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 25 Aug 2017 13:40:42 +0200 Subject: More spacing in top toolstrip --- Aktywator/MainForm.Designer.cs | 24 ++-- Aktywator/MainForm.resx | 283 ++++++++++++++++++-------------------- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 147 insertions(+), 162 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index aa68346..e9f9952 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -169,7 +169,7 @@ this.status1, this.status2, this.status3}); - this.statusStrip1.Location = new System.Drawing.Point(0, 568); + this.statusStrip1.Location = new System.Drawing.Point(0, 586); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(583, 22); this.statusStrip1.TabIndex = 2; @@ -201,17 +201,17 @@ 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, 568); + this.groupBox1.Size = new System.Drawing.Size(583, 586); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; // // 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.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabControl1.Location = new System.Drawing.Point(3, 28); + this.tabControl1.Location = new System.Drawing.Point(0, 43); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(577, 537); @@ -1238,24 +1238,26 @@ this.bUpdateSession}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(583, 25); + this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 10, 1, 5); + this.toolStrip1.Size = new System.Drawing.Size(583, 42); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // // labelFilename // - this.labelFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.labelFilename.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.labelFilename.Name = "labelFilename"; - this.labelFilename.Size = new System.Drawing.Size(0, 22); + this.labelFilename.Size = new System.Drawing.Size(0, 24); // // bLaunch // this.bLaunch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.bLaunch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.bLaunch.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.bLaunch.Image = ((System.Drawing.Image)(resources.GetObject("bLaunch.Image"))); this.bLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bLaunch.Margin = new System.Windows.Forms.Padding(0, 1, 10, 2); this.bLaunch.Name = "bLaunch"; - this.bLaunch.Size = new System.Drawing.Size(54, 22); + this.bLaunch.Size = new System.Drawing.Size(65, 24); this.bLaunch.Text = "BCS"; this.bLaunch.ToolTipText = "Uruchom BCS"; this.bLaunch.Click += new System.EventHandler(this.bLaunch_Click); @@ -1266,7 +1268,7 @@ this.bUpdateSession.Image = ((System.Drawing.Image)(resources.GetObject("bUpdateSession.Image"))); this.bUpdateSession.ImageTransparentColor = System.Drawing.Color.Magenta; this.bUpdateSession.Name = "bUpdateSession"; - this.bUpdateSession.Size = new System.Drawing.Size(65, 22); + this.bUpdateSession.Size = new System.Drawing.Size(65, 24); this.bUpdateSession.Text = "Update"; this.bUpdateSession.ToolTipText = "Update ustawień w trakcie sesji"; this.bUpdateSession.Click += new System.EventHandler(this.updateSession_Click); @@ -1280,7 +1282,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(583, 590); + this.ClientSize = new System.Drawing.Size(583, 608); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.groupBox1); this.Controls.Add(this.statusStrip1); diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 408656c..4155459 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -130,44 +130,6 @@ 815, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABs0lEQVQ4T6WPz0uTcRzH/Sc8 - eIzI7lJBxzwE6SXq4Gld6lCHBGFB4iFiHkroILaoLGO2GA8LtzYwdG2zWcNNUYSt1qHDYotW+6HO3Pbs - 2fPq+31qDmqPDPs8fHh9Pjzv7ws+XcB/9f7gi6T4u+dCCZSFDZz+mEy1vj9v/hGYlSuQZmg0LJPmAk84 - KQBVVTfYLGewyIWxOP5wgkvDNpluL3AHNin/rPPQn+dlpEijAfeUDAPWFRzeODdsdgYtVk4NXBHxNgLX - /Brjz5Kcvvqea5NfuOPKcnYkisOXEDIdpzfCI1fAXPDct8Jupc6R8x6ODgXpvx5lYnYDVdWo1jQK23vM - uEOcPHdZxNsIZuaWBSBXrNB70YPlVoTE5wKauGWvqlLaqfDqzaq54LESEvhdW+UaW2eOUVAcaFrDoNyj - 65/MBQ9eLAq06tv9CUr9x/nx1G5Q7gcKpmZfC7SqUVP5/mSK/GCfwe1cnqVYsjOBrutkpu3kTvSQtd00 - KPd3a6nOBPLuUl836bu3KWe/GpR7R4JpJYhnMWaE5c1v4x+MeXn1I95A/GCB/NlJN9/I3h8O13T9AroZ - BuMIQa3eAAAAAElFTkSuQmCC - - - - True - - - True - - - True - - - 343, 21 - - - 238, 56 - - - 133, 56 - - - 17, 56 - - - 815, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -194,6 +156,20 @@ EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABs0lEQVQ4T6WPz0uTcRzH/Sc8 + eIzI7lJBxzwE6SXq4Gld6lCHBGFB4iFiHkroILaoLGO2GA8LtzYwdG2zWcNNUYSt1qHDYotW+6HO3Pbs + 2fPq+31qDmqPDPs8fHh9Pjzv7ws+XcB/9f7gi6T4u+dCCZSFDZz+mEy1vj9v/hGYlSuQZmg0LJPmAk84 + KQBVVTfYLGewyIWxOP5wgkvDNpluL3AHNin/rPPQn+dlpEijAfeUDAPWFRzeODdsdgYtVk4NXBHxNgLX + /Brjz5Kcvvqea5NfuOPKcnYkisOXEDIdpzfCI1fAXPDct8Jupc6R8x6ODgXpvx5lYnYDVdWo1jQK23vM + uEOcPHdZxNsIZuaWBSBXrNB70YPlVoTE5wKauGWvqlLaqfDqzaq54LESEvhdW+UaW2eOUVAcaFrDoNyj + 65/MBQ9eLAq06tv9CUr9x/nx1G5Q7gcKpmZfC7SqUVP5/mSK/GCfwe1cnqVYsjOBrutkpu3kTvSQtd00 + KPd3a6nOBPLuUl836bu3KWe/GpR7R4JpJYhnMWaE5c1v4x+MeXn1I95A/GCB/NlJN9/I3h8O13T9AroZ + BuMIQa3eAAAAAElFTkSuQmCC @@ -205,6 +181,9 @@ True + + 343, 21 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -231,23 +210,9 @@ AAAAAElFTkSuQmCC - - - 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== - - + + 238, 56 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL @@ -279,27 +244,45 @@ 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== iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAORSURBVFhH7ZX9S5NRFMeFoJ/93d+k8peyUElzjpmxckx0 - TR/XxLfNXrA0s/ZMTXHmS7pUnJpuTp0u87XybTN0vkYmkVGSBWaWlWmusv6CeXru5dnaFoS2ZxDhFw6D - cc/9nnPuvZ/HY0f/lc5enwYUZ0oeAv2XeyUiB0UJuSMgJo0kP9PgJS2cgtvj3yAxzwRh57q9eCl6UeyV - AQiX6EPoFGaVUjQFXZM/QKIYBw4xYdEaV3EB6v6PwOENWCIvdEHr0CpEnu90z0TEWcZsScEELkI3vA7t - E9+hY/wr3B79CnX3lrE5/1w7nJDeSqZTmJXwktE7QVG/qbu/jotIVU6DMHMQJPkmbF7TvQgcTqclQFjv - Tacwp/irwyC9NgmNhjXopDq/oJxxGLP48l1oGvgA5a3zcDS+AQIFlcweg0hmoEa+gaNjfANiyCEHg1Bx - HTT2LdvCj1fKbAHRGfcgPtcEDQOfoH3sC5wunHQwINI7KOO3cKPlObBja8GXW8hsAUjoqXH4gxZ17zvQ - 31+DBHk/hMVrgLjYCdq+JWr8c9Qd0FoOhlV60SmuyRk0LKEqjXdaj81re95As+EDNPW/By1VEDJHRRyO - qoBD4SUcvIGrQsbonSPgEETPrmChCpsfl+iAE9Zlqbj1EhegRJ3HKTYDo8pxEftYOdsfP6IcuulWyhFy - 0+NfpBsFImv4JUtUJ2NFVwOiHTex9WRonAYXEELUwIFjpd7+4SXZPiE54Mcv9ae33bqQOXrbifkTmHLF - +gWwJ11R87wD7dBF23Mkiwo5DnqbvxeinLUIRDn0a0+6NtO6jXbInHHaIcqh7q2UU7a9diBdXt1T99GO - UPTsFskNC8r2RZt5tMxgjkjrJaMy+jwjzneT4dI2c071DOiMH0FW8QBYp9RP6HTXhMYelz30G2YFGf0k - vQSLm9REWnGr1L3AuD0irHIdufaItccs6pxegsVJavF0xq3m7pLryEWIFaTdwZhV963YMCugxk4vwWLH - 1JDOuD14opg55FIdfy7QzlE33gwK7TPgp3aZudImEnWOzEMIlVlOnb22dwnSi0cgMLJqjk5lRs6cV6hn - HViPzd3Be6ucOd9iWHFgfQM1erfw3ior59HZIs5nqx6BPeszy8Zc5/2fRE0gJYBfBsHCquSgGLUXW3Tz - lT3rgwSqWV9++X6XeL9d+bCvgoa6dHuDs5jtdqti9GOzo39DHh4/AYBHAldd8cVRAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOSSURBVFhH7ZX9T5JRFMfd2vrZ3/nNVf5S2crlCzrUZmI4 + JeSJcKiBlqsss3hA04X5kpE2USMUDcV3zXwDnaGirZe1bOWyNjN7UdMks/4COj337oGAtlbxsLXWdztj + Y/fc7znn3vt5/P7rn9KxS/cAxdGyu0D/5VuJyCFRasFtEJNmkpdrYsmKp6Bt4hOkFVogJqubFZ9hFB06 + NwhcqTGCTmFWGSVT0DX5BaSqCeAIrXa9eQUXoBtYAg530J54sguah1cg8USnbyYiVprzpEVWXIRhdA3a + rZ+hY2Id2sbWQXvrLTbnZbVDnKzlCJ3CrARnzAGpKu1Xw8gaLuK4+h4IcodAesGCzWu654HD6bQHC64H + 0CnMSXJ+FGQXJ6HBtAqdVOcn1Q/cxiw+2wuNg4tQ0TwL0ZJ6COFfZfYYRHITNfINHB0TGyAkh90MosRa + aOh/64zd8eXMFpCccwskBRaoH3wP7eMfIbN40s2AONVBGb+GK01PIfJQLeyMLWa2ACT01DgHhuy6vjdg + HFmFVMUAxEjqgDjdCfr+BWr8M9Qd0NuDYq6y6BTv5AkatkCTHZ9pxOa1Pa/ghmkRGgfegZ4qCJmjIvYm + VcIubhkHb+CtkDF65wg4BNGzKVygweb7pQbgRHfZK1ue4wLUqPMU1deQpApcxDZ2/u+PH1EO3XQH5QiF + 5eF30o0BoRx9zhZp5ezkakC0i01rPhiVUocLiCBqYMe+8oA93LK8wIh82M0r30Nv++tC5uhtp12wYsqV + GufAlXQlN2bdaIcu2pYwJRUKHPQ2fy5EOUcRiHLo15V0rZY1J+2QOeO0Q5RD3Tsop2596Ua6Qu1j39GO + UPVsFilMc+r2ead5stxkS8juI5Ny+v0TTnSTXFmrLb/6ARjMSyCvvAPsw7pHdLp3QmNPyRv+AbP8nAGS + XoIVm95IOnCrNjzDuA0TVHmPXFfEumIWdU4vweKkN/l74raud8F75CLE8rNvYszq+pedmOVTY6eXYEUK + a0hP3AbFlTKHXKrjD0X6GerG20ClfwK84122WFkjiTpH5hGExqagzl7ftwCnSm9DSGLVDJ3KjDw5r9JN + u7Eem/uC9w55cr7JtOzG+npq9D7hvUMOzqOzRZzP09wHV9bnXh73nvc/EzWBjGDeZQgXVB0JFepYkaJr + L1xZH8rXTO/kVWz3ive/q8DI81BHXbqt4Upmu/1VMfqx+a+/Q35+3wAtOQJOg1CGnAAAAABJRU5ErkJg + gg== @@ -316,56 +299,56 @@ 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 gg== @@ -392,35 +375,35 @@ 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 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index c3ff3d9..b1e2ab1 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-08-24 +2017-08-25 -- cgit v1.2.3 From e2f9413e05d4565e16eff21cb3bb25f5a0b509d4 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 29 Aug 2017 01:31:03 +0200 Subject: Sometimes default value for BM2ShowPlayerNames is empty, this should parse to disabled option, too. --- Aktywator/Bws.cs | 3 ++- Aktywator/Resources/BuildDate.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 3906ed9..d7b5552 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -298,7 +298,8 @@ namespace Aktywator } } main.xShowContract.Checked = (Setting.load("ShowContract", this, errors, section) == "0"); - main.xShowPlayerNames.Checked = (Setting.load("BM2ShowPlayerNames", this, errors, section) != "0"); + 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); int resultsOverview = 0; int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview); diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index b1e2ab1..a485840 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-08-25 +2017-08-29 -- cgit v1.2.3 From 616b4d11f37fc4ad2cecb1a14a2d2cdc6b8486b9 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 12 Sep 2017 18:42:01 +0200 Subject: Warning about inability to update section grouping during active session --- Aktywator/Bws.cs | 10 ++ Aktywator/MainForm.Designer.cs | 94 +++++++++-------- Aktywator/MainForm.cs | 11 ++ Aktywator/MainForm.resx | 208 ++++++++++++++++++++------------------ Aktywator/Resources/BuildDate.txt | 2 +- 5 files changed, 188 insertions(+), 137 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index d7b5552..763b11d 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -309,6 +309,7 @@ namespace Aktywator if (section == null && main.cbSettingsSection.Items.Count > 2) { main.lFirstSectorSettings.Visible = true; + this.sectionGroupWarning(); } if (errors.Length > 0) @@ -318,6 +319,15 @@ namespace Aktywator } } + public void sectionGroupWarning() + { + main.lGroupSectionsWarning.Visible = false; + if (main.xShowResults.Checked) + { + main.lGroupSectionsWarning.Visible = true; + } + } + private int getSectionGroupCount() { OleDbDataReader rows = sql.select("SELECT DISTINCT `Group` FROM Tables"); diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 77036c5..8e96207 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -39,6 +39,9 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = 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(); + this.bSave = new System.Windows.Forms.ToolStripButton(); this.statusStrip2 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lRequiredVersion = new System.Windows.Forms.ToolStripStatusLabel(); @@ -77,6 +80,7 @@ this.xLeadCard = new System.Windows.Forms.CheckBox(); this.xViewHandrecord = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + 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(); @@ -133,14 +137,12 @@ this.bLaunch = new System.Windows.Forms.ToolStripButton(); this.bUpdateSession = new System.Windows.Forms.ToolStripButton(); this.namesTimer = new System.Windows.Forms.Timer(this.components); - this.toolStrip2 = new System.Windows.Forms.ToolStrip(); - this.bLoad = new System.Windows.Forms.ToolStripButton(); - this.bSave = new System.Windows.Forms.ToolStripButton(); this.statusStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); + this.toolStrip2.SuspendLayout(); this.statusStrip2.SuspendLayout(); this.groupBox7.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -158,7 +160,6 @@ this.tabPage3.SuspendLayout(); this.toolStrip3.SuspendLayout(); this.toolStrip1.SuspendLayout(); - this.toolStrip2.SuspendLayout(); this.SuspendLayout(); // // open @@ -250,6 +251,40 @@ this.panel1.Size = new System.Drawing.Size(563, 502); this.panel1.TabIndex = 29; // + // toolStrip2 + // + this.toolStrip2.BackColor = System.Drawing.Color.White; + this.toolStrip2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStrip2.GripMargin = new System.Windows.Forms.Padding(0); + this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bLoad, + this.bSave}); + this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; + this.toolStrip2.Location = new System.Drawing.Point(0, 455); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.Size = new System.Drawing.Size(563, 25); + this.toolStrip2.TabIndex = 51; + this.toolStrip2.Text = "toolStrip2"; + // + // bLoad + // + this.bLoad.Image = ((System.Drawing.Image)(resources.GetObject("bLoad.Image"))); + this.bLoad.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bLoad.Name = "bLoad"; + this.bLoad.Size = new System.Drawing.Size(216, 22); + this.bLoad.Text = "Ponownie wczytaj ustawienia z BWS"; + // + // bSave + // + this.bSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.bSave.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.bSave.Image = ((System.Drawing.Image)(resources.GetObject("bSave.Image"))); + this.bSave.ImageTransparentColor = System.Drawing.Color.Magenta; + this.bSave.Name = "bSave"; + this.bSave.Size = new System.Drawing.Size(108, 22); + this.bSave.Text = "Zapisz do BWS"; + // // statusStrip2 // this.statusStrip2.BackColor = System.Drawing.Color.White; @@ -633,6 +668,7 @@ // // groupBox4 // + this.groupBox4.Controls.Add(this.lGroupSectionsWarning); this.groupBox4.Controls.Add(this.xGroupSections); this.groupBox4.Controls.Add(this.xShowResults); this.groupBox4.Controls.Add(this.xRepeatResults); @@ -646,6 +682,17 @@ this.groupBox4.TabStop = false; this.groupBox4.Text = "Protokół"; // + // 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.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); + // // xGroupSections // this.xGroupSections.AutoSize = true; @@ -1255,40 +1302,6 @@ this.namesTimer.Interval = 3000; this.namesTimer.Tick += new System.EventHandler(this.namesTimer_Tick); // - // toolStrip2 - // - this.toolStrip2.BackColor = System.Drawing.Color.White; - this.toolStrip2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.toolStrip2.GripMargin = new System.Windows.Forms.Padding(0); - this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bLoad, - this.bSave}); - this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; - this.toolStrip2.Location = new System.Drawing.Point(0, 455); - this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(563, 25); - this.toolStrip2.TabIndex = 51; - this.toolStrip2.Text = "toolStrip2"; - // - // bLoad - // - this.bLoad.Image = ((System.Drawing.Image)(resources.GetObject("bLoad.Image"))); - this.bLoad.ImageTransparentColor = System.Drawing.Color.Magenta; - this.bLoad.Name = "bLoad"; - this.bLoad.Size = new System.Drawing.Size(216, 22); - this.bLoad.Text = "Ponownie wczytaj ustawienia z BWS"; - // - // bSave - // - this.bSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.bSave.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.bSave.Image = ((System.Drawing.Image)(resources.GetObject("bSave.Image"))); - this.bSave.ImageTransparentColor = System.Drawing.Color.Magenta; - this.bSave.Name = "bSave"; - this.bSave.Size = new System.Drawing.Size(108, 22); - this.bSave.Text = "Zapisz do BWS"; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1313,6 +1326,8 @@ this.tabPage1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); this.statusStrip2.ResumeLayout(false); this.statusStrip2.PerformLayout(); this.groupBox7.ResumeLayout(false); @@ -1344,8 +1359,6 @@ this.toolStrip3.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - this.toolStrip2.ResumeLayout(false); - this.toolStrip2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1459,6 +1472,7 @@ private System.Windows.Forms.ToolStrip toolStrip2; private System.Windows.Forms.ToolStripButton bLoad; private System.Windows.Forms.ToolStripButton bSave; + public System.Windows.Forms.Label lGroupSectionsWarning; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 11718a7..1942dd2 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -280,12 +280,18 @@ namespace Aktywator xRepeatResults.Enabled = true; xShowPercentage.Enabled = true; xResultsOverview.Enabled = true; + xGroupSections.Enabled = true; } else { xRepeatResults.Enabled = false; xShowPercentage.Enabled = false; xResultsOverview.Enabled = false; + xGroupSections.Enabled = false; + } + if (cbSettingsSection.Items.Count > 2) + { + bws.sectionGroupWarning(); } } @@ -557,5 +563,10 @@ namespace Aktywator namesTimer.Enabled = checkBox1.Checked; } + private void lGroupSectionsWarning_Click(object sender, EventArgs e) + { + MessageBox.Show("Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!", "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question); + } + } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 9399911..a776a07 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -158,6 +158,23 @@ 343, 56 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAACaklE + 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/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -266,22 +283,22 @@ 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 @@ -298,57 +315,56 @@ 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 - gg== + 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 @@ -374,35 +390,35 @@ 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 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index a485840..5463401 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-08-29 +2017-09-12 -- cgit v1.2.3 From 84d46db52fe6b9a215720f28f4efd7004bc08d76 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 19 Sep 2017 19:44:59 +0200 Subject: Bumping version number --- Aktywator.txt | 10 +++++++++- Aktywator/Properties/AssemblyInfo.cs | 4 ++-- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator.txt b/Aktywator.txt index 3488da1..e7afc67 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -1,6 +1,14 @@ Known issues: - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa) +--------------------- +Aktywator 1.1.2 (beta) +19.09.2017 [mkl] + * pobieranie i wyświetlanie jako nazwiska dodatkowych informacji z turniejóé JFR Teamy (lineup, wynik meczu, wynik turnieju) + * poprawki interfejsu edytora nazwisk + * poprawki interfejsu górnego menu + * ostrzeżenie o niemożności zmiany maksowania sektorów w czasie sesji + --------------------- Aktywator 1.1.1 (beta) 24.08.2017 [mkl] @@ -60,7 +68,7 @@ Aktywator 1.0.2 New: - pokazywanie rozkładów (wymaga BCS 2.5.15, serwera 1.3.107d i pierników 1.6.1) (nasz dotychczasowy firmware to serwer 1.3.1d i pierniki 1.4.1) -- pierniki i serwerki ze starym i nowym firmware'em można mieszać +- pierniki i serwerki ze starym i nowym firmware'em można mieszać (testy (na normalnych turniejach) pokazują, że te wersje ze sobą współpracują) Fixed: diff --git a/Aktywator/Properties/AssemblyInfo.cs b/Aktywator/Properties/AssemblyInfo.cs index f355857..423d93f 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.1.0")] -[assembly: AssemblyFileVersion("1.1.1.0")] +[assembly: AssemblyVersion("1.1.2.0")] +[assembly: AssemblyFileVersion("1.1.2.0")] diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 5463401..fd33c7a 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-12 +2017-09-19 -- cgit v1.2.3 From cf3b807f18c5cf73e9defaabe31b72ea41d0d1ca Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 20 Sep 2017 18:31:13 +0200 Subject: Fixing current round/segment load in tournaments which did not start yet at all --- Aktywator/Resources/BuildDate.txt | 2 +- Aktywator/TeamyTournament.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index fd33c7a..837d0f1 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-19 +2017-09-20 diff --git a/Aktywator/TeamyTournament.cs b/Aktywator/TeamyTournament.cs index 990583f..825cf84 100644 --- a/Aktywator/TeamyTournament.cs +++ b/Aktywator/TeamyTournament.cs @@ -79,6 +79,14 @@ namespace Aktywator segment[1] = this.getSegmentsNum(); } } + if (segment[0] < 1) + { + segment[0] = 1; + } + if (segment[1] < 1) + { + segment[1] = 1; + } finished.Close(); return segment; } -- cgit v1.2.3 From 56a67148efedf13969f6d16286d28c8e77d6fa6c Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 21 Sep 2017 08:58:43 +0200 Subject: Restoring click handler on settings load button --- Aktywator/MainForm.Designer.cs | 1 + Aktywator/MainForm.resx | 244 ++++++++++++++++++-------------------- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 115 insertions(+), 132 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 18beec0..6c5dc8e 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -275,6 +275,7 @@ this.bLoad.Name = "bLoad"; this.bLoad.Size = new System.Drawing.Size(216, 22); this.bLoad.Text = "Ponownie wczytaj ustawienia z BWS"; + this.bLoad.Click += new System.EventHandler(this.bLoad_Click); // // bSave // diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index ba01ecd..da61849 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -158,15 +158,6 @@ 343, 56 - - 343, 21 - - - 238, 56 - - - 133, 56 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -187,7 +178,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAACOUlE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACOUlE QVQ4T6WN30tTYRjHz1/QRRdddG8ZERlkYEKCRDDJYsOpFYgNnRkS5jLdYgqGo2CRpZCVNldqls62RGds beZmg3A/zM1xrJ3J6mJhaoOgdnTn23vO8BebEfTA933Oed/n83koAP+VlAvHiAZvDS0w6pTkd/tbugiH 6V0QwzY/dHcuYCXah5/Rx4gEtGhpKIfe+B66YQcZ20FgnJgjPVlPHygQ8rcj4GqKBewVbNX5EwiFwsJb @@ -223,15 +214,6 @@ True - - True - - - True - - - True - 343, 21 @@ -264,23 +246,6 @@ 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 @@ -312,27 +277,44 @@ 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== 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 @@ -349,56 +331,56 @@ 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 gg== @@ -425,35 +407,35 @@ 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 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 837d0f1..c915427 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-20 +2017-09-21 -- cgit v1.2.3 From d881985658c2df2f10ed855c71f67c4b993845f0 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 27 Sep 2017 13:40:15 +0200 Subject: Preview hand records present in BWS Fixes #2 --- Aktywator/Aktywator.csproj | 9 + Aktywator/Bws.cs | 210 ++++++++++-- Aktywator/HandRecordPreview.Designer.cs | 554 ++++++++++++++++++++++++++++++++ Aktywator/HandRecordPreview.cs | 39 +++ Aktywator/HandRecordPreview.resx | 120 +++++++ Aktywator/MainForm.Designer.cs | 167 ++++++++-- Aktywator/MainForm.cs | 19 ++ Aktywator/MainForm.resx | 194 +++++------ Aktywator/Resources/BuildDate.txt | 2 +- 9 files changed, 1173 insertions(+), 141 deletions(-) create mode 100644 Aktywator/HandRecordPreview.Designer.cs create mode 100644 Aktywator/HandRecordPreview.cs create mode 100644 Aktywator/HandRecordPreview.resx (limited to 'Aktywator/Resources') diff --git a/Aktywator/Aktywator.csproj b/Aktywator/Aktywator.csproj index 2e4c4ac..bdcdba6 100644 --- a/Aktywator/Aktywator.csproj +++ b/Aktywator/Aktywator.csproj @@ -86,6 +86,12 @@ + + Form + + + HandRecordPreview.cs + Form @@ -121,6 +127,9 @@ ChooseTournament.cs + + HandRecordPreview.cs + MainForm.cs diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 1b96159..2662b88 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Data.OleDb; using System.Windows.Forms; +using System.Drawing; namespace Aktywator { @@ -20,43 +21,183 @@ namespace Aktywator public bool settingsChanged = false; private static string applicationPath = Common.ProgramFilesx86() + "\\Bridgemate Pro\\"; - private class SectionCheckBox + class HandInfo { - private string section; - private string label; + public List record; + public bool analysis = false; + } + + public Bws(string filename, MainForm main) + { + this._filename = filename; + sql = new Sql(filename); + this.main = main; + string[] sections = this.getSections().Split(','); + this.displaySectionBoardsInfo(sections); + } - public SectionCheckBox(string section, string label) + private void displaySectionBoardsInfo(string[] sections) + { + main.gwSections.Columns.Add(new DataGridViewCheckBoxColumn { Frozen = true, Width = 20, DefaultCellStyle = { ForeColor = Color.White, Alignment = DataGridViewContentAlignment.MiddleCenter } }); + foreach (string section in sections) + { + DataGridViewRow row = new DataGridViewRow(); + row.Height = 20; + row.HeaderCell.Value = this.sectorNumberToLetter(Int16.Parse(section)); + main.gwSections.Rows.Add(row); + } + Dictionary> boards = this.loadSectionBoards(sections); + foreach (KeyValuePair> boardList in boards) + { + main.gwSections.Columns.Add(new DataGridViewTextBoxColumn { HeaderText = boardList.Key.ToString(), Width = 22, DefaultCellStyle = { ForeColor = Color.White, Alignment = DataGridViewContentAlignment.MiddleCenter } }); + foreach (DataGridViewRow row in main.gwSections.Rows) + { + if (boardList.Value.Contains(row.HeaderCell.Value.ToString())) + { + row.Cells[row.Cells.Count - 1].Style.BackColor = Color.White; + } + else + { + row.Cells[row.Cells.Count - 1].Style.BackColor = Color.Gray; + } + row.Cells[row.Cells.Count - 1].ReadOnly = true; + } + } + foreach (DataGridViewRow row in main.gwSections.Rows) { - this.section = section; - this.label = label; + row.Cells[0].Value = true; + ((DataGridViewCheckBoxCell)row.Cells[0]).TrueValue = true; + ((DataGridViewCheckBoxCell)row.Cells[0]).FalseValue = false; } + this.displayHandRecordInfo(boards); + } - override public string ToString() + private Dictionary> loadSectionBoards(string[] sections) { + Dictionary> boards = new Dictionary>(); + foreach (string section in sections) { - return this.label; + string sectionLetter = this.sectorNumberToLetter(Int16.Parse(section)); + int lowBoard = this.lowBoard(section); + int highBoard = this.highBoard(section); + for (int board = lowBoard; board <= highBoard; board++) + { + if (!boards.ContainsKey(board)) + { + boards.Add(board, new List()); + } + boards[board].Add(sectionLetter); + } } + return boards; + } - public string getSection() + private void displayHandRecordInfo(Dictionary> boards) + { + Dictionary> handInfo = this.loadHandRecordInfo(); + foreach (KeyValuePair> board in boards) { - return this.section; + if (handInfo.ContainsKey(board.Key)) + { + foreach (string section in board.Value) + { + this.setHandRecordInfo(board.Key, section, (board.Value.Contains(section) && handInfo[board.Key].ContainsKey(section)) ? handInfo[board.Key][section].record : null, handInfo[board.Key].ContainsKey(section) && handInfo[board.Key][section].analysis); + } + } + else + { + this.setHandRecordInfo(board.Key); + } } } - public Bws(string filename, MainForm main) + private void setHandRecordInfo(int board, string section = null, List layout = null, bool analysis = false) { - this._filename = filename; - sql = new Sql(filename); - this.main = main; - string[] sections = this.getSections().Split(','); - foreach (string section in sections) + foreach (DataGridViewColumn column in main.gwSections.Columns) { - SectionCheckBox item = new SectionCheckBox(section, "sektor " + this.sectorNumberToLetter(Int16.Parse(section)) + " (rozdania " + this.lowBoard(section) + "-" + this.highBoard(section) + ")"); - main.cblSections.Items.Add(item); + if (column.HeaderText.Equals(board.ToString())) + { + foreach (DataGridViewRow row in main.gwSections.Rows) + { + if (row.HeaderCell.Value.Equals(section) || section == null) + { + if (row.Cells[column.Index].Style.BackColor != Color.Gray) + { + if (layout != null) + { + row.Cells[column.Index].Style.BackColor = Color.LimeGreen; + row.Cells[column.Index].Tag = new HandRecord(String.Join(" ", layout.ToArray())); + row.Cells[column.Index].Value = analysis ? "A" : ""; + row.Cells[column.Index].ToolTipText = "Dwukliknij, by podejrzeć rozkład"; + } + else + { + row.Cells[column.Index].Style.BackColor = Color.Crimson; + row.Cells[column.Index].Tag = null; + row.Cells[column.Index].Value = ""; + row.Cells[column.Index].ToolTipText = ""; + } + } + } + } + } + } + } + + private Dictionary> loadHandRecordInfo() + { + Dictionary> info = new Dictionary>(); + try + { + OleDbDataReader handData = sql.select("SELECT `Section`, Board, NorthSpades, NorthHearts, NorthDiamonds, NorthClubs, EastSpades, EastHearts, EastDiamonds, EastClubs, SouthSpades, SouthHearts, SouthDiamonds, SouthClubs, WestSpades, WestHearts, WestDiamonds, WestClubs FROM HandRecord"); + while (handData.Read()) + { + int boardNumber = Int16.Parse(handData[1].ToString()); + if (!info.ContainsKey(boardNumber)) + { + info.Add(boardNumber, new Dictionary()); + } + string section = this.sectorNumberToLetter(Int16.Parse(handData[0].ToString())); + info[boardNumber].Add(section, new HandInfo { record = new List(), analysis = false }); + for (int i = 0; i < 4; i++) + { + StringBuilder singleHand = new StringBuilder(); + for (int j = 0; j < 4; j++) + { + singleHand.Append(handData[2 + i * 4 + j].ToString()); + if (j != 3) + { + singleHand.Append('.'); + } + } + info[boardNumber][section].record.Add(singleHand.ToString().Trim()); + } + } + handData.Close(); } - for (int i = 0; i < main.cblSections.Items.Count; i++) + catch (OleDbException) + { + } + try { - main.cblSections.SetItemChecked(i, true); + OleDbDataReader handData = sql.select("SELECT `Section`, Board FROM HandEvaluation"); + while (handData.Read()) + { + int boardNumber = Int16.Parse(handData[1].ToString()); + string section = this.sectorNumberToLetter(Int16.Parse(handData[0].ToString())); + try + { + info[boardNumber][section].analysis = true; + } + catch (KeyNotFoundException) + { + } + } + handData.Close(); } + catch (OleDbException) + { + } + return info; } private int sectorLetterToNumber(string sector) @@ -73,9 +214,12 @@ namespace Aktywator public string[] getSelectedSections() { List sections = new List(); - foreach (SectionCheckBox section in main.cblSections.CheckedItems) + foreach (DataGridViewRow row in main.gwSections.Rows) { - sections.Add(section.getSection()); + if (Convert.ToBoolean(row.Cells[0].Value)) + { + sections.Add(this.sectorLetterToNumber(row.HeaderCell.Value.ToString()).ToString()); + } } return sections.ToArray(); } @@ -585,20 +729,29 @@ namespace Aktywator string sections = this.sectionsForHandRecords(); if (sections != null) { - foreach (string section in this.sectionsForHandRecords().Split(',')) + string[] sectionLetters = sections.Split(','); + for (int i = 0; i < sectionLetters.Length; i++) + { + sectionLetters[i] = sectionLetters[i].Trim(); + } + foreach (string section in sectionLetters) { - this.clearRecords(section.Trim()); + this.clearRecords(section); } + this.displayHandRecordInfo(this.loadSectionBoards(sectionLetters)); } } public int loadHandRecords(PBN pbn) { int count = 0; - foreach (string section in this.getSelectedSections()) + string[] sections = this.getSelectedSections(); + Dictionary> boards = new Dictionary>(); + foreach (string section in sections) { this.clearRecords(section); for (int i = this.lowBoard(section.Trim()); i <= this.highBoard(section.Trim()); i++) + { if (pbn.handRecords[i] != null) { HandRecord b = pbn.handRecords[i]; @@ -611,6 +764,11 @@ namespace Aktywator str.Append(String.Join("','", b.south)); str.Append("','"); str.Append(String.Join("','", b.west)); str.Append("')"); sql.query(str.ToString()); + if (!boards.ContainsKey(i)) + { + boards.Add(i, new List()); + } + boards[i].Add(this.sectorNumberToLetter(Int16.Parse(section))); int[,] ddTable = pbn.ddTables[i].GetDDTable(); if (ddTable != null) { @@ -639,7 +797,9 @@ namespace Aktywator } count++; } + } } + this.displayHandRecordInfo(this.loadSectionBoards(sections)); return count; } } diff --git a/Aktywator/HandRecordPreview.Designer.cs b/Aktywator/HandRecordPreview.Designer.cs new file mode 100644 index 0000000..83c58fb --- /dev/null +++ b/Aktywator/HandRecordPreview.Designer.cs @@ -0,0 +1,554 @@ +namespace Aktywator +{ + partial class HandRecordPreview + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.lNorthSpades = new System.Windows.Forms.Label(); + this.lNorthHearts = new System.Windows.Forms.Label(); + this.lNorthDiamonds = new System.Windows.Forms.Label(); + this.lNorthClubs = new System.Windows.Forms.Label(); + this.lEastSpades = new System.Windows.Forms.Label(); + this.lEastHearts = new System.Windows.Forms.Label(); + this.lEastDiamonds = new System.Windows.Forms.Label(); + this.lEastClubs = new System.Windows.Forms.Label(); + this.lSouthSpades = new System.Windows.Forms.Label(); + this.lSouthHearts = new System.Windows.Forms.Label(); + this.lSouthDiamonds = new System.Windows.Forms.Label(); + this.lSouthClubs = new System.Windows.Forms.Label(); + this.lWestClubs = new System.Windows.Forms.Label(); + this.lWestDiamonds = new System.Windows.Forms.Label(); + this.lWestHearts = new System.Windows.Forms.Label(); + this.lWestSpades = new System.Windows.Forms.Label(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 6; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.845966F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.48737F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.845966F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.48737F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.845966F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.48737F)); + this.tableLayoutPanel1.Controls.Add(this.label1, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.label3, 2, 2); + this.tableLayoutPanel1.Controls.Add(this.label4, 2, 3); + this.tableLayoutPanel1.Controls.Add(this.label5, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.label7, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.label8, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.label9, 2, 8); + this.tableLayoutPanel1.Controls.Add(this.label10, 2, 9); + this.tableLayoutPanel1.Controls.Add(this.label11, 2, 10); + this.tableLayoutPanel1.Controls.Add(this.label12, 2, 11); + this.tableLayoutPanel1.Controls.Add(this.label13, 4, 4); + this.tableLayoutPanel1.Controls.Add(this.label14, 4, 5); + this.tableLayoutPanel1.Controls.Add(this.label15, 4, 6); + this.tableLayoutPanel1.Controls.Add(this.label16, 4, 7); + this.tableLayoutPanel1.Controls.Add(this.lNorthSpades, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.lNorthHearts, 3, 1); + this.tableLayoutPanel1.Controls.Add(this.lNorthDiamonds, 3, 2); + this.tableLayoutPanel1.Controls.Add(this.lNorthClubs, 3, 3); + this.tableLayoutPanel1.Controls.Add(this.lEastSpades, 5, 4); + this.tableLayoutPanel1.Controls.Add(this.lEastHearts, 5, 5); + this.tableLayoutPanel1.Controls.Add(this.lEastDiamonds, 5, 6); + this.tableLayoutPanel1.Controls.Add(this.lEastClubs, 5, 7); + this.tableLayoutPanel1.Controls.Add(this.lSouthSpades, 3, 8); + this.tableLayoutPanel1.Controls.Add(this.lSouthHearts, 3, 9); + this.tableLayoutPanel1.Controls.Add(this.lSouthDiamonds, 3, 10); + this.tableLayoutPanel1.Controls.Add(this.lSouthClubs, 3, 11); + this.tableLayoutPanel1.Controls.Add(this.lWestClubs, 1, 7); + this.tableLayoutPanel1.Controls.Add(this.lWestDiamonds, 1, 6); + this.tableLayoutPanel1.Controls.Add(this.lWestHearts, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.lWestSpades, 1, 4); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 12; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.333332F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(292, 265); + this.tableLayoutPanel1.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label1.Location = new System.Drawing.Point(99, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(13, 22); + this.label1.TabIndex = 0; + this.label1.Text = "♠"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Dock = System.Windows.Forms.DockStyle.Fill; + this.label2.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label2.ForeColor = System.Drawing.Color.Red; + this.label2.Location = new System.Drawing.Point(99, 22); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(13, 22); + this.label2.TabIndex = 1; + this.label2.Text = "♥"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label3.ForeColor = System.Drawing.Color.Red; + this.label3.Location = new System.Drawing.Point(99, 44); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(13, 22); + this.label3.TabIndex = 2; + this.label3.Text = "♦"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label4.Location = new System.Drawing.Point(99, 66); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(13, 22); + this.label4.TabIndex = 3; + this.label4.Text = "♣"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label5.Location = new System.Drawing.Point(3, 88); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(13, 22); + this.label5.TabIndex = 4; + this.label5.Text = "♠"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label6.ForeColor = System.Drawing.Color.Red; + this.label6.Location = new System.Drawing.Point(3, 110); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(13, 22); + this.label6.TabIndex = 5; + this.label6.Text = "♥"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Dock = System.Windows.Forms.DockStyle.Fill; + this.label7.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label7.ForeColor = System.Drawing.Color.Red; + this.label7.Location = new System.Drawing.Point(3, 132); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(13, 22); + this.label7.TabIndex = 6; + this.label7.Text = "♦"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Dock = System.Windows.Forms.DockStyle.Fill; + this.label8.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label8.Location = new System.Drawing.Point(3, 154); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(13, 22); + this.label8.TabIndex = 7; + this.label8.Text = "♣"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Dock = System.Windows.Forms.DockStyle.Fill; + this.label9.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label9.Location = new System.Drawing.Point(99, 176); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(13, 22); + this.label9.TabIndex = 8; + this.label9.Text = "♠"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Dock = System.Windows.Forms.DockStyle.Fill; + this.label10.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label10.ForeColor = System.Drawing.Color.Red; + this.label10.Location = new System.Drawing.Point(99, 198); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(13, 22); + this.label10.TabIndex = 9; + this.label10.Text = "♥"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Dock = System.Windows.Forms.DockStyle.Fill; + this.label11.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label11.ForeColor = System.Drawing.Color.Red; + this.label11.Location = new System.Drawing.Point(99, 220); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(13, 22); + this.label11.TabIndex = 10; + this.label11.Text = "♦"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Dock = System.Windows.Forms.DockStyle.Fill; + this.label12.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label12.Location = new System.Drawing.Point(99, 242); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(13, 23); + this.label12.TabIndex = 11; + this.label12.Text = "♣"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Dock = System.Windows.Forms.DockStyle.Fill; + this.label13.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label13.Location = new System.Drawing.Point(195, 88); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(13, 22); + this.label13.TabIndex = 12; + this.label13.Text = "♠"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Dock = System.Windows.Forms.DockStyle.Fill; + this.label14.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label14.ForeColor = System.Drawing.Color.Red; + this.label14.Location = new System.Drawing.Point(195, 110); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(13, 22); + this.label14.TabIndex = 13; + this.label14.Text = "♥"; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Dock = System.Windows.Forms.DockStyle.Fill; + this.label15.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label15.ForeColor = System.Drawing.Color.Red; + this.label15.Location = new System.Drawing.Point(195, 132); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(13, 22); + this.label15.TabIndex = 14; + this.label15.Text = "♦"; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Dock = System.Windows.Forms.DockStyle.Fill; + this.label16.Font = new System.Drawing.Font("Lucida Sans Unicode", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.label16.Location = new System.Drawing.Point(195, 154); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(13, 22); + this.label16.TabIndex = 15; + this.label16.Text = "♣"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lNorthSpades + // + this.lNorthSpades.AutoSize = true; + this.lNorthSpades.Dock = System.Windows.Forms.DockStyle.Fill; + this.lNorthSpades.Location = new System.Drawing.Point(118, 0); + this.lNorthSpades.Name = "lNorthSpades"; + this.lNorthSpades.Size = new System.Drawing.Size(71, 22); + this.lNorthSpades.TabIndex = 16; + this.lNorthSpades.Text = "N-S"; + this.lNorthSpades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lNorthHearts + // + this.lNorthHearts.AutoSize = true; + this.lNorthHearts.Dock = System.Windows.Forms.DockStyle.Fill; + this.lNorthHearts.Location = new System.Drawing.Point(118, 22); + this.lNorthHearts.Name = "lNorthHearts"; + this.lNorthHearts.Size = new System.Drawing.Size(71, 22); + this.lNorthHearts.TabIndex = 17; + this.lNorthHearts.Text = "N-H"; + this.lNorthHearts.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lNorthDiamonds + // + this.lNorthDiamonds.AutoSize = true; + this.lNorthDiamonds.Dock = System.Windows.Forms.DockStyle.Fill; + this.lNorthDiamonds.Location = new System.Drawing.Point(118, 44); + this.lNorthDiamonds.Name = "lNorthDiamonds"; + this.lNorthDiamonds.Size = new System.Drawing.Size(71, 22); + this.lNorthDiamonds.TabIndex = 18; + this.lNorthDiamonds.Text = "N-D"; + this.lNorthDiamonds.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lNorthClubs + // + this.lNorthClubs.AutoSize = true; + this.lNorthClubs.Dock = System.Windows.Forms.DockStyle.Fill; + this.lNorthClubs.Location = new System.Drawing.Point(118, 66); + this.lNorthClubs.Name = "lNorthClubs"; + this.lNorthClubs.Size = new System.Drawing.Size(71, 22); + this.lNorthClubs.TabIndex = 19; + this.lNorthClubs.Text = "N-C"; + this.lNorthClubs.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lEastSpades + // + this.lEastSpades.AutoSize = true; + this.lEastSpades.Dock = System.Windows.Forms.DockStyle.Fill; + this.lEastSpades.Location = new System.Drawing.Point(214, 88); + this.lEastSpades.Name = "lEastSpades"; + this.lEastSpades.Size = new System.Drawing.Size(75, 22); + this.lEastSpades.TabIndex = 20; + this.lEastSpades.Text = "E-S"; + this.lEastSpades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lEastHearts + // + this.lEastHearts.AutoSize = true; + this.lEastHearts.Dock = System.Windows.Forms.DockStyle.Fill; + this.lEastHearts.Location = new System.Drawing.Point(214, 110); + this.lEastHearts.Name = "lEastHearts"; + this.lEastHearts.Size = new System.Drawing.Size(75, 22); + this.lEastHearts.TabIndex = 21; + this.lEastHearts.Text = "E-H"; + this.lEastHearts.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lEastDiamonds + // + this.lEastDiamonds.AutoSize = true; + this.lEastDiamonds.Dock = System.Windows.Forms.DockStyle.Fill; + this.lEastDiamonds.Location = new System.Drawing.Point(214, 132); + this.lEastDiamonds.Name = "lEastDiamonds"; + this.lEastDiamonds.Size = new System.Drawing.Size(75, 22); + this.lEastDiamonds.TabIndex = 22; + this.lEastDiamonds.Text = "E-D"; + this.lEastDiamonds.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lEastClubs + // + this.lEastClubs.AutoSize = true; + this.lEastClubs.Dock = System.Windows.Forms.DockStyle.Fill; + this.lEastClubs.Location = new System.Drawing.Point(214, 154); + this.lEastClubs.Name = "lEastClubs"; + this.lEastClubs.Size = new System.Drawing.Size(75, 22); + this.lEastClubs.TabIndex = 23; + this.lEastClubs.Text = "E-C"; + this.lEastClubs.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lSouthSpades + // + this.lSouthSpades.AutoSize = true; + this.lSouthSpades.Dock = System.Windows.Forms.DockStyle.Fill; + this.lSouthSpades.Location = new System.Drawing.Point(118, 176); + this.lSouthSpades.Name = "lSouthSpades"; + this.lSouthSpades.Size = new System.Drawing.Size(71, 22); + this.lSouthSpades.TabIndex = 24; + this.lSouthSpades.Text = "S-S"; + this.lSouthSpades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lSouthHearts + // + this.lSouthHearts.AutoSize = true; + this.lSouthHearts.Dock = System.Windows.Forms.DockStyle.Fill; + this.lSouthHearts.Location = new System.Drawing.Point(118, 198); + this.lSouthHearts.Name = "lSouthHearts"; + this.lSouthHearts.Size = new System.Drawing.Size(71, 22); + this.lSouthHearts.TabIndex = 25; + this.lSouthHearts.Text = "S-H"; + this.lSouthHearts.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lSouthDiamonds + // + this.lSouthDiamonds.AutoSize = true; + this.lSouthDiamonds.Dock = System.Windows.Forms.DockStyle.Fill; + this.lSouthDiamonds.Location = new System.Drawing.Point(118, 220); + this.lSouthDiamonds.Name = "lSouthDiamonds"; + this.lSouthDiamonds.Size = new System.Drawing.Size(71, 22); + this.lSouthDiamonds.TabIndex = 26; + this.lSouthDiamonds.Text = "S-D"; + this.lSouthDiamonds.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lSouthClubs + // + this.lSouthClubs.AutoSize = true; + this.lSouthClubs.Dock = System.Windows.Forms.DockStyle.Fill; + this.lSouthClubs.Location = new System.Drawing.Point(118, 242); + this.lSouthClubs.Name = "lSouthClubs"; + this.lSouthClubs.Size = new System.Drawing.Size(71, 23); + this.lSouthClubs.TabIndex = 27; + this.lSouthClubs.Text = "S-C"; + this.lSouthClubs.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lWestClubs + // + this.lWestClubs.AutoSize = true; + this.lWestClubs.Dock = System.Windows.Forms.DockStyle.Fill; + this.lWestClubs.Location = new System.Drawing.Point(22, 154); + this.lWestClubs.Name = "lWestClubs"; + this.lWestClubs.Size = new System.Drawing.Size(71, 22); + this.lWestClubs.TabIndex = 28; + this.lWestClubs.Text = "W-C"; + this.lWestClubs.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lWestDiamonds + // + this.lWestDiamonds.AutoSize = true; + this.lWestDiamonds.Dock = System.Windows.Forms.DockStyle.Fill; + this.lWestDiamonds.Location = new System.Drawing.Point(22, 132); + this.lWestDiamonds.Name = "lWestDiamonds"; + this.lWestDiamonds.Size = new System.Drawing.Size(71, 22); + this.lWestDiamonds.TabIndex = 29; + this.lWestDiamonds.Text = "W-D"; + this.lWestDiamonds.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lWestHearts + // + this.lWestHearts.AutoSize = true; + this.lWestHearts.Dock = System.Windows.Forms.DockStyle.Fill; + this.lWestHearts.Location = new System.Drawing.Point(22, 110); + this.lWestHearts.Name = "lWestHearts"; + this.lWestHearts.Size = new System.Drawing.Size(71, 22); + this.lWestHearts.TabIndex = 30; + this.lWestHearts.Text = "W-H"; + this.lWestHearts.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lWestSpades + // + this.lWestSpades.AutoSize = true; + this.lWestSpades.Dock = System.Windows.Forms.DockStyle.Fill; + this.lWestSpades.Location = new System.Drawing.Point(22, 88); + this.lWestSpades.Name = "lWestSpades"; + this.lWestSpades.Size = new System.Drawing.Size(71, 22); + this.lWestSpades.TabIndex = 31; + this.lWestSpades.Text = "W-S"; + this.lWestSpades.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // HandRecordPreview + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 265); + this.Controls.Add(this.tableLayoutPanel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "HandRecordPreview"; + this.ShowInTaskbar = false; + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label lNorthSpades; + private System.Windows.Forms.Label lNorthHearts; + private System.Windows.Forms.Label lNorthDiamonds; + private System.Windows.Forms.Label lNorthClubs; + private System.Windows.Forms.Label lEastSpades; + private System.Windows.Forms.Label lEastHearts; + private System.Windows.Forms.Label lEastDiamonds; + private System.Windows.Forms.Label lEastClubs; + private System.Windows.Forms.Label lSouthSpades; + private System.Windows.Forms.Label lSouthHearts; + private System.Windows.Forms.Label lSouthDiamonds; + private System.Windows.Forms.Label lSouthClubs; + private System.Windows.Forms.Label lWestClubs; + private System.Windows.Forms.Label lWestDiamonds; + private System.Windows.Forms.Label lWestHearts; + private System.Windows.Forms.Label lWestSpades; + } +} \ No newline at end of file diff --git a/Aktywator/HandRecordPreview.cs b/Aktywator/HandRecordPreview.cs new file mode 100644 index 0000000..d5e8446 --- /dev/null +++ b/Aktywator/HandRecordPreview.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Aktywator +{ + public partial class HandRecordPreview : Form + { + public HandRecordPreview() + { + InitializeComponent(); + } + + internal HandRecordPreview(HandRecord record, string boardNo) : this() + { + lNorthSpades.Text = record.north[0]; + lNorthHearts.Text = record.north[1]; + lNorthDiamonds.Text = record.north[2]; + lNorthClubs.Text = record.north[3]; + lEastSpades.Text = record.east[0]; + lEastHearts.Text = record.east[1]; + lEastDiamonds.Text = record.east[2]; + lEastClubs.Text = record.east[3]; + lSouthSpades.Text = record.south[0]; + lSouthHearts.Text = record.south[1]; + lSouthDiamonds.Text = record.south[2]; + lSouthClubs.Text = record.south[3]; + lWestSpades.Text = record.north[0]; + lWestHearts.Text = record.north[1]; + lWestDiamonds.Text = record.north[2]; + lWestClubs.Text = record.west[3]; + this.Text = "ROZDANIE " + boardNo; + } + } +} diff --git a/Aktywator/HandRecordPreview.resx b/Aktywator/HandRecordPreview.resx new file mode 100644 index 0000000..7080a7d --- /dev/null +++ b/Aktywator/HandRecordPreview.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 6c5dc8e..11af8cb 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -30,6 +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(); this.open = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.status1 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -125,11 +126,19 @@ this.bForceSync = new System.Windows.Forms.ToolStripButton(); this.bTruncate = new System.Windows.Forms.ToolStripButton(); this.tabPage3 = 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(); + this.label16 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.gwSections = new System.Windows.Forms.DataGridView(); this.toolStrip3 = new System.Windows.Forms.ToolStrip(); this.bLoadHands = new System.Windows.Forms.ToolStripButton(); this.bClearHands = new System.Windows.Forms.ToolStripButton(); this.lRecordSections = new System.Windows.Forms.Label(); - this.cblSections = new System.Windows.Forms.CheckedListBox(); this.label11 = new System.Windows.Forms.Label(); this.timer = new System.Windows.Forms.Timer(this.components); this.openPBN = new System.Windows.Forms.OpenFileDialog(); @@ -159,6 +168,7 @@ this.syncToolStrip.SuspendLayout(); this.toolStrip4.SuspendLayout(); this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gwSections)).BeginInit(); this.toolStrip3.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); @@ -1188,9 +1198,17 @@ // // 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.cblSections); this.tabPage3.Controls.Add(this.label11); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; @@ -1200,15 +1218,129 @@ this.tabPage3.Text = "Rozkłady"; this.tabPage3.UseVisualStyleBackColor = true; // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(458, 460); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(71, 13); + this.label17.TabIndex = 18; + this.label17.Text = "brak rozdania"; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.BackColor = System.Drawing.SystemColors.ControlDark; + this.label18.Location = new System.Drawing.Point(432, 456); + this.label18.MinimumSize = new System.Drawing.Size(20, 20); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 20); + this.label18.TabIndex = 17; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(322, 460); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(104, 13); + this.label15.TabIndex = 16; + this.label15.Text = "rozkład niewczytany"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.BackColor = System.Drawing.Color.Crimson; + this.label16.Location = new System.Drawing.Point(296, 456); + this.label16.MinimumSize = new System.Drawing.Size(20, 20); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(20, 20); + this.label16.TabIndex = 15; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(156, 460); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(134, 13); + this.label13.TabIndex = 14; + this.label13.Text = "rozkład wczytany z analizą"; + // + // label14 + // + 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.MinimumSize = new System.Drawing.Size(20, 20); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(20, 20); + this.label14.TabIndex = 13; + this.label14.Text = "A"; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(34, 460); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(90, 13); + this.label12.TabIndex = 12; + this.label12.Text = "rozkład wczytany"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.BackColor = System.Drawing.Color.LimeGreen; + this.label10.Location = new System.Drawing.Point(8, 456); + this.label10.MinimumSize = new System.Drawing.Size(20, 20); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(20, 20); + this.label10.TabIndex = 11; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // gwSections + // + this.gwSections.AllowUserToAddRows = false; + this.gwSections.AllowUserToDeleteRows = false; + this.gwSections.AllowUserToResizeColumns = false; + 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; + this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.gwSections.Location = new System.Drawing.Point(9, 118); + this.gwSections.MultiSelect = false; + this.gwSections.Name = "gwSections"; + this.gwSections.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; + this.gwSections.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.gwSections.ShowCellErrors = false; + this.gwSections.ShowEditingIcon = false; + this.gwSections.ShowRowErrors = false; + this.gwSections.Size = new System.Drawing.Size(554, 335); + 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); + this.gwSections.CurrentCellDirtyStateChanged += new System.EventHandler(this.gwSections_CurrentCellDirtyStateChanged); + // // toolStrip3 // this.toolStrip3.BackColor = System.Drawing.Color.White; + this.toolStrip3.Dock = System.Windows.Forms.DockStyle.Bottom; this.toolStrip3.GripMargin = new System.Windows.Forms.Padding(0); this.toolStrip3.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bLoadHands, this.bClearHands}); - this.toolStrip3.Location = new System.Drawing.Point(3, 3); + this.toolStrip3.Location = new System.Drawing.Point(3, 483); this.toolStrip3.Name = "toolStrip3"; this.toolStrip3.Size = new System.Drawing.Size(563, 25); this.toolStrip3.TabIndex = 9; @@ -1220,8 +1352,8 @@ this.bLoadHands.Image = ((System.Drawing.Image)(resources.GetObject("bLoadHands.Image"))); this.bLoadHands.ImageTransparentColor = System.Drawing.Color.Magenta; this.bLoadHands.Name = "bLoadHands"; - this.bLoadHands.Size = new System.Drawing.Size(122, 22); - this.bLoadHands.Text = "Wczytaj rozkłady"; + this.bLoadHands.Size = new System.Drawing.Size(274, 22); + this.bLoadHands.Text = "Wczytaj rozkłady do zaznaczonych sektorów"; this.bLoadHands.Click += new System.EventHandler(this.bLoadHands_Click); // // bClearHands @@ -1238,26 +1370,16 @@ // this.lRecordSections.AutoSize = true; this.lRecordSections.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lRecordSections.Location = new System.Drawing.Point(6, 138); + this.lRecordSections.Location = new System.Drawing.Point(6, 102); this.lRecordSections.Name = "lRecordSections"; this.lRecordSections.Size = new System.Drawing.Size(54, 13); this.lRecordSections.TabIndex = 7; this.lRecordSections.Text = "Sektory:"; // - // cblSections - // - this.cblSections.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.cblSections.CheckOnClick = true; - this.cblSections.FormattingEnabled = true; - this.cblSections.Location = new System.Drawing.Point(9, 162); - this.cblSections.Name = "cblSections"; - this.cblSections.Size = new System.Drawing.Size(546, 285); - this.cblSections.TabIndex = 6; - // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(6, 49); + this.label11.Location = new System.Drawing.Point(6, 12); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(479, 78); this.label11.TabIndex = 1; @@ -1374,6 +1496,7 @@ this.toolStrip4.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gwSections)).EndInit(); this.toolStrip3.ResumeLayout(false); this.toolStrip3.PerformLayout(); this.toolStrip1.ResumeLayout(false); @@ -1436,7 +1559,6 @@ public System.Windows.Forms.CheckBox xCollectPlay; public System.Windows.Forms.CheckBox xCollectBidding; public System.Windows.Forms.CheckBox xCheckLeadCard; - public System.Windows.Forms.CheckedListBox cblSections; private System.Windows.Forms.Label lRecordSections; private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox7; @@ -1493,6 +1615,15 @@ public System.Windows.Forms.Label lGroupSectionsWarning; internal System.Windows.Forms.Button bTeamsNamesSettings; public System.Windows.Forms.Timer namesTimer; + public System.Windows.Forms.DataGridView gwSections; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label12; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 10fa819..602a260 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -595,5 +595,24 @@ namespace Aktywator tabControl1.Enabled = true; this.Cursor = Cursors.Default; } + + private void gwSections_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex > -1 && e.ColumnIndex > 0 && gwSections.Rows[e.RowIndex].Cells[e.ColumnIndex].Tag != null) + { + HandRecordPreview preview = new HandRecordPreview((HandRecord)gwSections.Rows[e.RowIndex].Cells[e.ColumnIndex].Tag, gwSections.Rows[e.RowIndex].HeaderCell.Value + "-" + gwSections.Columns[e.ColumnIndex].HeaderCell.Value); + preview.ShowDialog(); + } + } + + private void gwSections_CurrentCellDirtyStateChanged(object sender, EventArgs e) + { + DataGridView grid = (DataGridView)sender; + if (grid.IsCurrentCellDirty) + { + grid.CommitEdit(DataGridViewDataErrorContexts.Commit); + } + } + } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index da61849..652834c 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -178,7 +178,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACOUlE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACOUlE QVQ4T6WN30tTYRjHz1/QRRdddG8ZERlkYEKCRDDJYsOpFYgNnRkS5jLdYgqGo2CRpZCVNldqls62RGds beZmg3A/zM1xrJ3J6mJhaoOgdnTn23vO8BebEfTA933Oed/n83koAP+VlAvHiAZvDS0w6pTkd/tbugiH 6V0QwzY/dHcuYCXah5/Rx4gEtGhpKIfe+B66YQcZ20FgnJgjPVlPHygQ8rcj4GqKBewVbNX5EwiFwsJb @@ -299,22 +299,22 @@ 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 @@ -331,56 +331,56 @@ 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 gg== @@ -407,35 +407,35 @@ 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 @@ -484,7 +484,7 @@ to także należy ręcznie zrobić Upload. 343, 21 - 43 + 55 diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index c915427..6d547b9 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-21 +2017-09-27 -- cgit v1.2.3 From f44c3ffab5d4146744cb45d57ff756c70453be75 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 30 Sep 2017 12:26:56 +0200 Subject: VP scores displayed in Teamy events include VP carry-over --- Aktywator/Resources/BuildDate.txt | 2 +- Aktywator/TeamNamesSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 6d547b9..5f59e05 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-27 +2017-09-30 diff --git a/Aktywator/TeamNamesSettings.cs b/Aktywator/TeamNamesSettings.cs index ae7f4e9..40b8613 100644 --- a/Aktywator/TeamNamesSettings.cs +++ b/Aktywator/TeamNamesSettings.cs @@ -92,7 +92,7 @@ namespace Aktywator ret.Append(" GROUP BY teams.id ORDER BY teams.id"); break; case 2: - ret.Append("CONCAT(SUM(IF(matches.homet = teams.id, vph+corrh, vpv+corrv)), ' VP') FROM teams LEFT JOIN matches ON (teams.id = matches.homet OR teams.id = matches.visit) AND matches.rnd <= "); + ret.Append("CONCAT(SUM(IF(matches.homet = teams.id, vph+corrh, vpv+corrv)) + teams.score, ' VP') FROM teams LEFT JOIN matches ON (teams.id = matches.homet OR teams.id = matches.visit) AND matches.rnd <= "); ret.Append(cbRounds.SelectedItem); ret.Append(" GROUP BY teams.id ORDER BY teams.id"); break; -- cgit v1.2.3 From cf23b76ef751912304c593443832d1410574119a Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 17 Oct 2017 14:33:07 +0200 Subject: Including match carry-over in displayed IMP results --- Aktywator/Resources/BuildDate.txt | 2 +- Aktywator/TeamNamesSettings.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 5f59e05..19d5ac5 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-30 +2017-10-17 diff --git a/Aktywator/TeamNamesSettings.cs b/Aktywator/TeamNamesSettings.cs index 82edee2..034e362 100644 --- a/Aktywator/TeamNamesSettings.cs +++ b/Aktywator/TeamNamesSettings.cs @@ -85,10 +85,17 @@ namespace Aktywator ret.Append("' ' FROM teams ORDER BY teams.id"); break; case 1: - ret.Append("CONCAT(SUM(IF(segments.homet = teams.id, impH+corrH, impV+corrV)), ' IMP') FROM teams LEFT JOIN segments ON (teams.id = segments.homet OR teams.id = segments.visit) AND segments.rnd = "); + ret.Append("CONCAT("); + ret.Append("SUM(IF(segments.homet = teams.id, segments.impH+segments.corrH, segments.impV+segments.corrV))"); + ret.Append(" + IF(matches.homet = teams.id AND matches.carry > 0, matches.carry, 0)"); + ret.Append("+ IF(matches.visit = teams.id AND matches.carry < 0, -matches.carry, 0),"); + ret.Append("' IMP')"); + ret.Append("FROM teams LEFT JOIN segments ON (teams.id = segments.homet OR teams.id = segments.visit) AND segments.rnd = "); ret.Append(cbRounds.SelectedItem); ret.Append(" AND segments.segment < "); ret.Append(cbSegments.SelectedItem); + ret.Append(" LEFT JOIN matches ON (teams.id = matches.homet OR teams.id = matches.visit) AND matches.rnd = "); + ret.Append(cbRounds.SelectedItem); ret.Append(" GROUP BY teams.id ORDER BY teams.id"); break; case 2: -- cgit v1.2.3 From a1ff38c72ff67fd980e7354645ed51159d10575e Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 10 Nov 2017 15:15:45 +0100 Subject: Ordering columns by board number in hand records grid. Fixes #3 --- Aktywator/Bws.cs | 8 ++++---- Aktywator/Resources/BuildDate.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index cde192a..9dedb84 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -46,7 +46,7 @@ namespace Aktywator row.HeaderCell.Value = this.sectorNumberToLetter(Int16.Parse(section)); main.gwSections.Rows.Add(row); } - Dictionary> boards = this.loadSectionBoards(sections); + SortedDictionary> boards = this.loadSectionBoards(sections); foreach (KeyValuePair> boardList in boards) { main.gwSections.Columns.Add(new DataGridViewTextBoxColumn { HeaderText = boardList.Key.ToString(), Width = 22, DefaultCellStyle = { ForeColor = Color.White, Alignment = DataGridViewContentAlignment.MiddleCenter } }); @@ -72,8 +72,8 @@ namespace Aktywator this.displayHandRecordInfo(boards); } - private Dictionary> loadSectionBoards(string[] sections) { - Dictionary> boards = new Dictionary>(); + private SortedDictionary> loadSectionBoards(string[] sections) { + SortedDictionary> boards = new SortedDictionary>(); foreach (string section in sections) { string sectionLetter = this.sectorNumberToLetter(Int16.Parse(section)); @@ -91,7 +91,7 @@ namespace Aktywator return boards; } - private void displayHandRecordInfo(Dictionary> boards) + private void displayHandRecordInfo(SortedDictionary> boards) { Dictionary> handInfo = this.loadHandRecordInfo(); foreach (KeyValuePair> board in boards) diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 19d5ac5..3649349 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-10-17 +2017-11-10 -- cgit v1.2.3 From 3e81ce7e22d6405d31425b835c3d1fb24c052daa Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 18 Nov 2017 13:01:22 +0100 Subject: Fixing issues with adding rows to data grid --- Aktywator/Resources/BuildDate.txt | 2 +- Aktywator/Tournament.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 3649349..4accc51 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-11-10 +2017-11-18 diff --git a/Aktywator/Tournament.cs b/Aktywator/Tournament.cs index fd6fec1..117b1da 100644 --- a/Aktywator/Tournament.cs +++ b/Aktywator/Tournament.cs @@ -61,6 +61,8 @@ namespace Aktywator { grid.Rows.Remove(r); } + grid.Update(); + grid.Refresh(); } virtual internal bool updateNameListRow(DataGridView grid, int pairNumber, List names) @@ -97,6 +99,7 @@ namespace Aktywator row.Cells.Add(cell); } grid.Rows.Add(row); + grid.FirstDisplayedScrollingRowIndex = grid.RowCount - 1; } virtual internal void clearCellLocks(DataGridView grid) -- cgit v1.2.3 From f12d2b996b165d66f4c32eef4a3bdfb89309670d Mon Sep 17 00:00:00 2001 From: emkael Date: Mon, 20 Nov 2017 21:36:09 +0100 Subject: Further improvement to DB listing performace. Fixes #25 (hopefully properly this time). --- Aktywator/ChooseTournament.cs | 23 +++++++++++++++-------- Aktywator/MySQLTournament.cs | 17 +++++++++++++---- Aktywator/Resources/BuildDate.txt | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) (limited to 'Aktywator/Resources') diff --git a/Aktywator/ChooseTournament.cs b/Aktywator/ChooseTournament.cs index 734b191..2a7316f 100644 --- a/Aktywator/ChooseTournament.cs +++ b/Aktywator/ChooseTournament.cs @@ -8,9 +8,16 @@ using System.Windows.Forms; namespace Aktywator { + public struct TournamentListItem + { + public int Type; + public string Name; + public string Label; + } + public partial class ChooseTournament : Form { - private MySQLTournament[] turns; + private TournamentListItem[] turns; public MySQLTournament chosenTournament; public ChooseTournament() @@ -20,13 +27,13 @@ namespace Aktywator private void ChooseTournament_Load(object sender, EventArgs e) { - List list = MySQLTournament.getTournaments(); - turns = new MySQLTournament[list.Count]; + List list = MySQLTournament.getTournaments(); + turns = new TournamentListItem[list.Count]; int c = 0; - foreach (MySQLTournament t in list) + foreach (TournamentListItem t in list) { turns[c++] = t; - listBox.Items.Add(t.ToString()); + listBox.Items.Add(t.Label); } } @@ -34,13 +41,13 @@ namespace Aktywator { if (listBox.SelectedIndex >= 0) { - switch (turns[listBox.SelectedIndex].type) + switch (turns[listBox.SelectedIndex].Type) { case Tournament.TYPE_PARY: - chosenTournament = new ParyTournament(turns[listBox.SelectedIndex].name); + chosenTournament = new ParyTournament(turns[listBox.SelectedIndex].Name); break; case Tournament.TYPE_TEAMY: - chosenTournament = new TeamyTournament(turns[listBox.SelectedIndex].name); + chosenTournament = new TeamyTournament(turns[listBox.SelectedIndex].Name); break; } Close(); diff --git a/Aktywator/MySQLTournament.cs b/Aktywator/MySQLTournament.cs index f745a91..3bc9acc 100644 --- a/Aktywator/MySQLTournament.cs +++ b/Aktywator/MySQLTournament.cs @@ -21,19 +21,28 @@ namespace Aktywator mysql = new MySQL(name); } + public static string getLabel(string name, int type) + { + return name + " [" + (type == Tournament.TYPE_PARY ? 'P' : 'T') + "]"; + } + public override string ToString() { - return this.name + " [" + (this.type == Tournament.TYPE_PARY ? 'P' : 'T') + "]"; + return MySQLTournament.getLabel(this.name, this.type); } - public static List getTournaments() + public static List getTournaments() { - List list = new List(); + List list = new List(); MySQL c = new MySQL(""); data dbs = c.select("SELECT TABLE_SCHEMA, COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_NAME = 'admin' AND COLUMN_NAME IN ('dnazwa', 'teamcnt') ORDER BY TABLE_SCHEMA;"); while (dbs.Read()) { - list.Add(new MySQLTournament(dbs.GetString(0), "dnazwa".Equals(dbs.GetString(1)) ? Tournament.TYPE_PARY : Tournament.TYPE_TEAMY)); + TournamentListItem item = new TournamentListItem(); + item.Name = dbs.GetString(0); + item.Type = "dnazwa".Equals(dbs.GetString(1)) ? Tournament.TYPE_PARY : Tournament.TYPE_TEAMY; + item.Label = MySQLTournament.getLabel(item.Name, item.Type); + list.Add(item); } dbs.Close(); return list; diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 4accc51..6b9b605 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-11-18 +2017-11-20 -- cgit v1.2.3