summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Zimniewicz <michzimny@users.noreply.github.com>2019-02-20 18:41:06 +0100
committerGitHub <noreply@github.com>2019-02-20 18:41:06 +0100
commitc87e5eebb4d54a1b63439e7cf150486d9230274e (patch)
tree257c28f02c4acfd8f02b082953604aaf326d127f
parentcbf1e8ff15377e0bf4b9ddee0a868e4ab85a6cc0 (diff)
parente010784a72017a46239504308c88a7199c65ff72 (diff)
Merge pull request #53 from emkael/master
v1.1.5
-rw-r--r--Aktywator.txt24
-rw-r--r--Aktywator/Aktywator.csproj1
-rw-r--r--Aktywator/Bws.cs92
-rw-r--r--Aktywator/MainForm.Designer.cs591
-rw-r--r--Aktywator/MainForm.cs227
-rw-r--r--Aktywator/MainForm.resx311
-rw-r--r--Aktywator/PBN.cs4
-rw-r--r--Aktywator/Properties/AssemblyInfo.cs4
-rw-r--r--Aktywator/Resources/BuildDate.txt2
-rw-r--r--Aktywator/Setting.cs59
10 files changed, 959 insertions, 356 deletions
diff --git a/Aktywator.txt b/Aktywator.txt
index 82896cb..b627842 100644
--- a/Aktywator.txt
+++ b/Aktywator.txt
@@ -1,8 +1,20 @@
Known issues:
- nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze)
-- nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa)
+- nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa); nie da się również zmienić sposoby liczenia (maksy/butler/cavendish) w trakcie sesji - ograniczenia BCS
-Aktywator 1.1.4 (beta)
+Aktywator 1.1.5
+17.11.2018 [mkl]
+ * poprawa bezpieczeństwa PINów
+ - losowanie PINu przy inicjalizacji
+ - możliwość ręcznego wylosowania PINu
+ - wyłączanie rozkładów przy wykryciu "łatwego" PINu
+ * opcja wezwania sędziego z pierniczka
+ * obsługa wyświetlania wyniku w IMP, również dla turnieju teamów
+ * obsługa podsumowania meczu/historii turnieju po zakońćzeniu sesji
+ * obsługa opcji "pierwszy numer ręcznie" przy automatycznym wpisywaniu numerów rozdań
+
+---------------------
+Aktywator 1.1.4
05.10.2018 [mkl]
* wczytywanie nazwisk do indywiduela granego parami
* usprawnienie mechanizmu wczytywania nazwisk do różnych sektorów
@@ -12,7 +24,7 @@ Aktywator 1.1.4 (beta)
* dodany plik licencji do wersji binarnej wraz z odpowiednimi informacjami o licencjach zależności
---------------------
-Aktywator 1.1.3 (beta)
+Aktywator 1.1.3
04.01.2018 [mkl]
* niewymuszanie odświeżania listy nazwisk po wczytaniu turnieju
* wyświetlanie w pierniczku skróconej nazwy teamu zamiast pełnej
@@ -25,7 +37,7 @@ Aktywator 1.1.3 (beta)
* wizualne poprawki wyświetlania długich ścieżek i nazw plików BWS
---------------------
-Aktywator 1.1.2 (beta)
+Aktywator 1.1.2
30.09.2017 [mkl]
* pobieranie i wyświetlanie jako nazwiska dodatkowych informacji z turniejów JFR Teamy (lineup, wynik meczu, wynik turnieju)
* podgląd rozkładów z BWSa
@@ -36,7 +48,7 @@ Aktywator 1.1.2 (beta)
* ostrzeżenie o niemożności zmiany maksowania sektorów w czasie sesji
---------------------
-Aktywator 1.1.1 (beta)
+Aktywator 1.1.1
24.08.2017 [mkl]
* edytor nazwisk ładowanych do BWS
* zmiana wyglądu zakładek
@@ -46,7 +58,7 @@ Aktywator 1.1.1 (beta)
* poprawiono błąd pobierania numerów graczy przy wyświetlonych nazwach teamów
---------------------
-Aktywator 1.1.0 (beta)
+Aktywator 1.1.0
30.07.2017 [mkl]
* wczytywanie nazwisk z plików RRBridge
diff --git a/Aktywator/Aktywator.csproj b/Aktywator/Aktywator.csproj
index bdcdba6..acfc8c6 100644
--- a/Aktywator/Aktywator.csproj
+++ b/Aktywator/Aktywator.csproj
@@ -132,6 +132,7 @@
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MysqlSettings.resx">
<DependentUpon>MysqlSettings.cs</DependentUpon>
diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs
index 9121eb1..36ef372 100644
--- a/Aktywator/Bws.cs
+++ b/Aktywator/Bws.cs
@@ -119,7 +119,6 @@ namespace Aktywator
this.setHandRecordInfo(board.Key);
}
}
- main.xShowResults_CheckedChanged(null, EventArgs.Empty);
if (this.detectDifferentRecordsInSections())
{
if (main.xGroupSections.Checked)
@@ -127,8 +126,9 @@ namespace Aktywator
MessageBox.Show(MainForm.differentRecordsInSections, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Warning);
main.xGroupSections.Checked = false;
}
- Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked);
+ Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0);
}
+ main.checkRecordsForSectionGroups();
}
private void setHandRecordInfo(int board, string section = null, List<string> layout = null, bool analysis = false)
@@ -250,7 +250,7 @@ namespace Aktywator
settings = new List<Setting>();
settings.Add(new Setting("ShowResults", main.xShowResults, this, new Version(2, 0, 0), new Version(1, 3, 1)));
settings.Add(new Setting("RepeatResults", main.xRepeatResults, this, null, null));
- settings.Add(new Setting("ShowPercentage", main.xShowPercentage, this, null, null));
+ settings.Add(new Setting("ShowPercentage", main.xShowPercentage, this, new Version(3, 6, 0), new Version(3, 0, 1)));
settings.Add(new Setting("GroupSections", main.xGroupSections, this, new Version(2, 1, 10), new Version(1, 3, 1)));
settings.Add(new Setting("ShowPairNumbers", main.xShowPairNumbers, this, null, null));
settings.Add(new Setting("IntermediateResults", main.xIntermediateResults, this, null, new Version(1, 4, 1)));
@@ -267,11 +267,13 @@ namespace Aktywator
settings.Add(new Setting("BM2AutoShowScoreRecap", main.xAutoShowScoreRecap, this, new Version(2, 5, 1), new Version(1, 0, 1)));
settings.Add(new Setting("BM2ScoreCorrection", main.xScoreCorrection, this, new Version(2, 0, 0), new Version(1, 0, 1)));
settings.Add(new Setting("BM2AutoBoardNumber", main.xAutoBoardNumber, this, new Version(2, 0, 0), new Version(2, 0, 1)));
+ settings.Add(new Setting("BM2FirstBoardManually", main.xFirstBoardManually, this, new Version(2, 7, 9), new Version(2, 7, 6)));
settings.Add(new Setting("BM2ResetFunctionKey", main.xResetFunctionKey, this, new Version(2, 0, 0), new Version(1, 0, 1)));
settings.Add(new Setting("BM2ViewHandrecord", main.xViewHandrecord, this, new Version(2, 6, 1), new Version(1, 6, 1)));
settings.Add(new Setting("BM2RecordBidding", main.xCollectBidding, this, new Version(2, 0, 0), new Version(1, 3, 1)));
settings.Add(new Setting("BM2RecordPlay", main.xCollectPlay, this, new Version(2, 0, 0), new Version(1, 3, 1)));
settings.Add(new Setting("BM2ValidateLeadCard", main.xCheckLeadCard, this, new Version(3, 2, 1), new Version(2, 2, 1)));
+ settings.Add(new Setting("BM2TDCall", main.xCallTD, this, new Version(3, 3, 1), new Version(2, 3, 1)));
return settings;
}
@@ -344,7 +346,10 @@ namespace Aktywator
settings.Add(new Setting("BM2RecordBidding", "bit", "false"));
settings.Add(new Setting("BM2RecordPlay", "bit", "false"));
settings.Add(new Setting("BM2ValidateLeadCard", "bit", "false"));
+ settings.Add(new Setting("BM2TDCall", "bit", "false"));
settings.Add(new Setting("BM2ShowPlayerNames", "integer", "0"));
+ settings.Add(new Setting("ScoringType", "integer", "1", "`Section`"));
+ settings.Add(new Setting("BM2FirstBoardManually", "bit", "false"));
foreach (Setting s in settings)
{
@@ -352,7 +357,7 @@ namespace Aktywator
}
List<Setting> defaultSettings = new List<Setting>();
- defaultSettings.Add(new Setting("BM2PINcode", "text(4)", "'5431'"));
+ defaultSettings.Add(new Setting("BM2PINcode", "text(4)", "'" + this._getRandomPIN() + "'"));
defaultSettings.Add(new Setting("BM2Ranking", "integer", "0"));
defaultSettings.Add(new Setting("BM2GameSummary", "bit", "false"));
defaultSettings.Add(new Setting("BM2SummaryPoints", "integer", "0"));
@@ -380,8 +385,17 @@ namespace Aktywator
}
catch (OleDbException)
{
- }
-
+ }
+
+ try
+ {
+ sql.query("ALTER TABLE `Section` ADD COLUMN `Winners` integer;");
+ }
+ catch (OleDbException)
+ {
+ }
+ sql.query("UPDATE `Section` SET Winners = 1");
+
try
{
sql.query("CREATE TABLE PlayerNames (ID integer, Name text(18));");
@@ -416,6 +430,16 @@ namespace Aktywator
}
}
+ internal int[] _unsafePINs = { 0, 0x0457, 0x08AE, 0x0D05, 0x115C, 0x15B3, 0x1A0A, 0x1E61, 0x22B8, 0x270F, 0x04D2, 0x1537, 0x582, 0x1159 };
+ internal string _getRandomPIN(int oldPIN = 0)
+ {
+ while (Array.IndexOf(this._unsafePINs, oldPIN) > -1)
+ {
+ oldPIN = (new Random()).Next(10000);
+ }
+ return String.Format("{0,4:D4}", oldPIN);
+ }
+
private void _ensureHandRecordStructure()
{
try
@@ -508,10 +532,16 @@ namespace Aktywator
string playerNames = Setting.load("BM2ShowPlayerNames", this, errors, section);
main.xShowPlayerNames.Checked = !("".Equals(playerNames) || "0".Equals(playerNames));
main.xPINcode.Text = Setting.load("BM2PINcode", this, errors, section);
+ main.checkPINsafety(main.xPINcode.Text, this._unsafePINs);
int resultsOverview = 0;
int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview);
main.xResultsOverview.SelectedIndex = resultsOverview;
- main.xGroupSections.Checked = this.getSectionGroupCount() <= 1;
+
+ int scoringType = 1;
+ Int32.TryParse(Setting.load("ScoringType", this, errors, section, "`Section`", "`ID`"), out scoringType);
+ main.setScoringType((scoringType > 0) ? scoringType : 1);
+
+ main.checkRecordsForSectionGroups();
if (section == null && main.cbSettingsSection.Items.Count > 2)
{
@@ -519,6 +549,10 @@ namespace Aktywator
this.sectionGroupWarning();
}
+ int ranking = 0;
+ Int32.TryParse(Setting.load("BM2Ranking", this, errors, section), out ranking);
+ main.xShowRecap.Checked = (ranking > 0) && (Setting.load("BM2GameSummary", this, errors, section).ToUpper().Equals("TRUE"));
+
if (errors.Length > 0)
{
MessageBox.Show("Nie można uzyskać dostępu do pól: \n" + errors.ToString() + ".\nPrawdopodobnie te pola nie istnieją.",
@@ -529,11 +563,7 @@ namespace Aktywator
public void sectionGroupWarning()
{
- main.lGroupSectionsWarning.Visible = false;
- if (main.xShowResults.Checked || this.detectDifferentRecordsInSections())
- {
- main.lGroupSectionsWarning.Visible = true;
- }
+ main.lGroupSectionsWarning.Visible = this.detectDifferentRecordsInSections();
}
private int getSectionGroupCount()
@@ -550,6 +580,7 @@ namespace Aktywator
public void saveSettings()
{
string section = "*".Equals(main.cbSettingsSection.Text.Trim()) ? null : this.sectorLetterToNumber(main.cbSettingsSection.Text.Trim()).ToString();
+ main.checkPINsafety(main.xPINcode.Text, this._unsafePINs, true);
StringBuilder errors = new StringBuilder();
foreach (Setting s in settings)
{
@@ -568,7 +599,37 @@ namespace Aktywator
Setting.save("BM2NameSource", "2", this, errors, section);
Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors, section);
Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors, section);
- Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked);
+ if (main.xShowPercentage.Checked)
+ {
+ Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, (this.getMySQLDatabaseForSection() != null) ? Convert.ToInt32(main.numTeamsTableOffset.Value) : 0);
+ int scoringType = main.getScoringType();
+ Setting.saveScoringType(this.sql, scoringType, section);
+ }
+ else
+ {
+ Setting.saveSectionGroups(this.sql, main.xGroupSections.Checked, 0);
+ Setting.saveScoringType(this.sql, 1, section);
+ }
+ if (main.xShowRecap.Checked)
+ {
+ if (this.getMySQLDatabaseForSection() != null)
+ {
+ Setting.saveScoringType(this.sql, 4, section);
+ Setting.saveSectionGroups(this.sql, true, Convert.ToInt32(main.numTeamsTableOffset.Value));
+ Setting.save("BM2SummaryPoints", "0", this, errors, section);
+ }
+ else
+ {
+ Setting.save("BM2SummaryPoints", "1", this, errors, section);
+ }
+ Setting.save("BM2Ranking", "2", this, errors, section);
+ Setting.save("BM2GameSummary", "true", this, errors, section);
+ }
+ else
+ {
+ Setting.save("BM2Ranking", "0", this, errors, section);
+ Setting.save("BM2GameSummary", "false", this, errors, section);
+ }
this.loadSettings();
}
@@ -599,6 +660,11 @@ namespace Aktywator
private int getBWSNumber(OleDbDataReader reader, int index)
{
+ return Bws.bwsNumber(reader, index);
+ }
+
+ public static int bwsNumber(OleDbDataReader reader, int index)
+ {
switch (Type.GetTypeCode(reader.GetFieldType(index)))
{
case TypeCode.Int16:
diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs
index f8b03b9..ed92786 100644
--- a/Aktywator/MainForm.Designer.cs
+++ b/Aktywator/MainForm.Designer.cs
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.open = new System.Windows.Forms.OpenFileDialog();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.status1 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -38,7 +38,7 @@
this.status3 = new System.Windows.Forms.ToolStripStatusLabel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tabControl1 = new System.Windows.Forms.TabControl();
- this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.tpSettings = new System.Windows.Forms.TabPage();
this.panel1 = new System.Windows.Forms.Panel();
this.toolStrip2 = new System.Windows.Forms.ToolStrip();
this.bLoad = new System.Windows.Forms.ToolStripButton();
@@ -53,7 +53,15 @@
this.lFirstSectorSettings = new System.Windows.Forms.Label();
this.cbSettingsSection = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.xCheckLeadCard = new System.Windows.Forms.CheckBox();
+ this.xLeadCard = new System.Windows.Forms.CheckBox();
+ this.xViewHandrecord = new System.Windows.Forms.CheckBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.xAutoShutDownBPC = new System.Windows.Forms.CheckBox();
+ this.xCallTD = new System.Windows.Forms.CheckBox();
+ this.bRandomPIN = new System.Windows.Forms.Button();
+ this.lPINWarning = new System.Windows.Forms.Label();
this.xResetFunctionKey = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.xPINcode = new System.Windows.Forms.TextBox();
@@ -65,30 +73,33 @@
this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox();
this.xShowPlayerNames = new System.Windows.Forms.CheckBox();
this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.xAutoShutDownBPC = new System.Windows.Forms.CheckBox();
+ this.xShowRecap = new System.Windows.Forms.CheckBox();
this.xRemainingBoards = new System.Windows.Forms.CheckBox();
this.xNextSeatings = new System.Windows.Forms.CheckBox();
this.xScoreRecap = new System.Windows.Forms.CheckBox();
this.xAutoShowScoreRecap = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.xFirstBoardManually = new System.Windows.Forms.CheckBox();
this.xCollectPlay = new System.Windows.Forms.CheckBox();
this.xBoardOrderVerification = new System.Windows.Forms.CheckBox();
this.xIntermediateResults = new System.Windows.Forms.CheckBox();
this.xAutoBoardNumber = new System.Windows.Forms.CheckBox();
this.xCollectBidding = new System.Windows.Forms.CheckBox();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.xCheckLeadCard = new System.Windows.Forms.CheckBox();
- this.xLeadCard = new System.Windows.Forms.CheckBox();
- this.xViewHandrecord = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.lIMPScoringWarning = new System.Windows.Forms.Label();
+ this.lScoringOptionsWarning = new System.Windows.Forms.Label();
+ this.rbIMPButler = new System.Windows.Forms.RadioButton();
+ this.rbIMPCavendish = new System.Windows.Forms.RadioButton();
+ this.rbIMPTeams = new System.Windows.Forms.RadioButton();
+ this.rbMatchpoints = new System.Windows.Forms.RadioButton();
this.lGroupSectionsWarning = new System.Windows.Forms.Label();
- this.xGroupSections = new System.Windows.Forms.CheckBox();
this.xShowResults = new System.Windows.Forms.CheckBox();
- this.xRepeatResults = new System.Windows.Forms.CheckBox();
+ this.xGroupSections = new System.Windows.Forms.CheckBox();
this.xShowPercentage = new System.Windows.Forms.CheckBox();
+ this.xRepeatResults = new System.Windows.Forms.CheckBox();
this.xShowContract = new System.Windows.Forms.CheckBox();
this.xResultsOverview = new System.Windows.Forms.ComboBox();
- this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.tpNames = new System.Windows.Forms.TabPage();
this.sectionToolStrip = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cbNamesSection = new System.Windows.Forms.ToolStripComboBox();
@@ -125,7 +136,7 @@
this.bMysqlSettings = new System.Windows.Forms.ToolStripButton();
this.bForceSync = new System.Windows.Forms.ToolStripButton();
this.bTruncate = new System.Windows.Forms.ToolStripButton();
- this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.tpRecords = new System.Windows.Forms.TabPage();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
@@ -140,6 +151,7 @@
this.bClearHands = new System.Windows.Forms.ToolStripButton();
this.lRecordSections = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
+ this.ilTabIcons = new System.Windows.Forms.ImageList(this.components);
this.timer = new System.Windows.Forms.Timer(this.components);
this.openPBN = new System.Windows.Forms.OpenFileDialog();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -150,17 +162,17 @@
this.statusStrip1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabControl1.SuspendLayout();
- this.tabPage1.SuspendLayout();
+ this.tpSettings.SuspendLayout();
this.panel1.SuspendLayout();
this.toolStrip2.SuspendLayout();
this.statusStrip2.SuspendLayout();
+ this.groupBox5.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox3.SuspendLayout();
- this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
- this.tabPage2.SuspendLayout();
+ this.tpNames.SuspendLayout();
this.sectionToolStrip.SuspendLayout();
this.namesPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numNamesRefreshInterval)).BeginInit();
@@ -168,7 +180,7 @@
((System.ComponentModel.ISupportInitialize)(this.namesGridView)).BeginInit();
this.syncToolStrip.SuspendLayout();
this.toolStrip4.SuspendLayout();
- this.tabPage3.SuspendLayout();
+ this.tpRecords.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gwSections)).BeginInit();
this.toolStrip3.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -184,9 +196,9 @@
this.status1,
this.status2,
this.status3});
- this.statusStrip1.Location = new System.Drawing.Point(0, 586);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 633);
this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(583, 22);
+ this.statusStrip1.Size = new System.Drawing.Size(632, 22);
this.statusStrip1.SizingGrip = false;
this.statusStrip1.TabIndex = 2;
this.statusStrip1.Text = "statusBar";
@@ -217,32 +229,36 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Location = new System.Drawing.Point(0, 0);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(583, 586);
+ this.groupBox1.Size = new System.Drawing.Size(632, 633);
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.Location = new System.Drawing.Point(0, 43);
+ this.tabControl1.Controls.Add(this.tpSettings);
+ this.tabControl1.Controls.Add(this.tpNames);
+ this.tabControl1.Controls.Add(this.tpRecords);
+ this.tabControl1.ImageList = this.ilTabIcons;
+ this.tabControl1.Location = new System.Drawing.Point(6, 43);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(577, 537);
+ this.tabControl1.ShowToolTips = true;
+ this.tabControl1.Size = new System.Drawing.Size(620, 584);
this.tabControl1.TabIndex = 0;
+ this.tabControl1.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControl1_Selecting);
//
- // tabPage1
+ // tpSettings
//
- this.tabPage1.Controls.Add(this.panel1);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
- this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(569, 511);
- this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "Ustawienia";
- this.tabPage1.UseVisualStyleBackColor = true;
+ this.tpSettings.Controls.Add(this.panel1);
+ this.tpSettings.ImageIndex = 0;
+ this.tpSettings.Location = new System.Drawing.Point(4, 23);
+ this.tpSettings.Name = "tpSettings";
+ this.tpSettings.Padding = new System.Windows.Forms.Padding(3);
+ this.tpSettings.Size = new System.Drawing.Size(612, 557);
+ this.tpSettings.TabIndex = 0;
+ this.tpSettings.Text = "Ustawienia";
+ this.tpSettings.UseVisualStyleBackColor = true;
//
// panel1
//
@@ -251,16 +267,16 @@
this.panel1.Controls.Add(this.lFirstSectorSettings);
this.panel1.Controls.Add(this.cbSettingsSection);
this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox7);
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.groupBox6);
this.panel1.Controls.Add(this.groupBox3);
- this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel1.Location = new System.Drawing.Point(3, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(563, 502);
+ this.panel1.Size = new System.Drawing.Size(606, 548);
this.panel1.TabIndex = 29;
//
// toolStrip2
@@ -273,9 +289,9 @@
this.bLoad,
this.bSave});
this.toolStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
- this.toolStrip2.Location = new System.Drawing.Point(0, 455);
+ this.toolStrip2.Location = new System.Drawing.Point(0, 501);
this.toolStrip2.Name = "toolStrip2";
- this.toolStrip2.Size = new System.Drawing.Size(563, 25);
+ this.toolStrip2.Size = new System.Drawing.Size(606, 25);
this.toolStrip2.TabIndex = 51;
this.toolStrip2.Text = "toolStrip2";
//
@@ -309,9 +325,9 @@
this.lDetectedVersion,
this.toolStripStatusLabel3,
this.lRequiredFirmware});
- this.statusStrip2.Location = new System.Drawing.Point(0, 480);
+ this.statusStrip2.Location = new System.Drawing.Point(0, 526);
this.statusStrip2.Name = "statusStrip2";
- this.statusStrip2.Size = new System.Drawing.Size(563, 22);
+ this.statusStrip2.Size = new System.Drawing.Size(606, 22);
this.statusStrip2.SizingGrip = false;
this.statusStrip2.TabIndex = 50;
this.statusStrip2.Text = "statusStrip2";
@@ -391,20 +407,108 @@
this.label1.TabIndex = 47;
this.label1.Text = "Sektor:";
//
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.xCheckLeadCard);
+ this.groupBox5.Controls.Add(this.xLeadCard);
+ this.groupBox5.Controls.Add(this.xViewHandrecord);
+ this.groupBox5.Location = new System.Drawing.Point(309, 34);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(295, 114);
+ this.groupBox5.TabIndex = 42;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "Rozkłady";
+ //
+ // xCheckLeadCard
+ //
+ this.xCheckLeadCard.AutoSize = true;
+ this.xCheckLeadCard.Location = new System.Drawing.Point(13, 65);
+ this.xCheckLeadCard.Name = "xCheckLeadCard";
+ this.xCheckLeadCard.Size = new System.Drawing.Size(180, 17);
+ this.xCheckLeadCard.TabIndex = 32;
+ this.xCheckLeadCard.Text = "sprawdź kartę wistu z rozkładem";
+ this.xCheckLeadCard.UseVisualStyleBackColor = true;
+ //
+ // xLeadCard
+ //
+ this.xLeadCard.AutoSize = true;
+ this.xLeadCard.Location = new System.Drawing.Point(13, 42);
+ this.xLeadCard.Name = "xLeadCard";
+ this.xLeadCard.Size = new System.Drawing.Size(111, 17);
+ this.xLeadCard.TabIndex = 21;
+ this.xLeadCard.Text = "pytaj o kartę wistu";
+ this.xLeadCard.UseVisualStyleBackColor = true;
+ //
+ // xViewHandrecord
+ //
+ this.xViewHandrecord.AutoSize = true;
+ this.xViewHandrecord.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.xViewHandrecord.Location = new System.Drawing.Point(13, 19);
+ this.xViewHandrecord.Name = "xViewHandrecord";
+ this.xViewHandrecord.Size = new System.Drawing.Size(123, 17);
+ this.xViewHandrecord.TabIndex = 29;
+ this.xViewHandrecord.Text = "pokazuj rozkłady";
+ this.xViewHandrecord.UseVisualStyleBackColor = true;
+ //
// groupBox7
//
+ this.groupBox7.Controls.Add(this.xAutoShutDownBPC);
+ this.groupBox7.Controls.Add(this.xCallTD);
+ this.groupBox7.Controls.Add(this.bRandomPIN);
+ this.groupBox7.Controls.Add(this.lPINWarning);
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(268, 324);
+ this.groupBox7.Location = new System.Drawing.Point(309, 300);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(294, 121);
+ this.groupBox7.Size = new System.Drawing.Size(294, 190);
this.groupBox7.TabIndex = 44;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Opcje sędziowskie";
//
+ // xAutoShutDownBPC
+ //
+ this.xAutoShutDownBPC.AutoSize = true;
+ this.xAutoShutDownBPC.Location = new System.Drawing.Point(13, 138);
+ this.xAutoShutDownBPC.Name = "xAutoShutDownBPC";
+ this.xAutoShutDownBPC.Size = new System.Drawing.Size(166, 17);
+ this.xAutoShutDownBPC.TabIndex = 17;
+ this.xAutoShutDownBPC.Text = "automat. wyłącz BCS po sesji";
+ this.xAutoShutDownBPC.UseVisualStyleBackColor = true;
+ //
+ // xCallTD
+ //
+ this.xCallTD.AutoSize = true;
+ this.xCallTD.Location = new System.Drawing.Point(13, 115);
+ this.xCallTD.Name = "xCallTD";
+ this.xCallTD.Size = new System.Drawing.Size(186, 17);
+ this.xCallTD.TabIndex = 32;
+ this.xCallTD.Text = "zawodnik może wezwać sędziego";
+ this.xCallTD.UseVisualStyleBackColor = true;
+ //
+ // bRandomPIN
+ //
+ this.bRandomPIN.Image = ((System.Drawing.Image)(resources.GetObject("bRandomPIN.Image")));
+ this.bRandomPIN.Location = new System.Drawing.Point(94, 21);
+ this.bRandomPIN.Name = "bRandomPIN";
+ this.bRandomPIN.Size = new System.Drawing.Size(22, 22);
+ this.bRandomPIN.TabIndex = 31;
+ this.bRandomPIN.UseVisualStyleBackColor = true;
+ this.bRandomPIN.Click += new System.EventHandler(this.bRandomPIN_Click);
+ //
+ // lPINWarning
+ //
+ this.lPINWarning.Cursor = System.Windows.Forms.Cursors.Help;
+ this.lPINWarning.Image = ((System.Drawing.Image)(resources.GetObject("lPINWarning.Image")));
+ this.lPINWarning.Location = new System.Drawing.Point(10, 22);
+ this.lPINWarning.Name = "lPINWarning";
+ this.lPINWarning.Size = new System.Drawing.Size(22, 18);
+ this.lPINWarning.TabIndex = 30;
+ this.lPINWarning.Visible = false;
+ this.lPINWarning.Click += new System.EventHandler(this.lPINWarning_Click);
+ //
// xResetFunctionKey
//
this.xResetFunctionKey.AutoSize = true;
@@ -418,7 +522,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(10, 25);
+ this.label2.Location = new System.Drawing.Point(30, 25);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(25, 13);
this.label2.TabIndex = 27;
@@ -426,12 +530,14 @@
//
// xPINcode
//
- this.xPINcode.Location = new System.Drawing.Point(41, 21);
+ this.xPINcode.Location = new System.Drawing.Point(56, 22);
this.xPINcode.MaxLength = 4;
this.xPINcode.Name = "xPINcode";
this.xPINcode.Size = new System.Drawing.Size(37, 20);
this.xPINcode.TabIndex = 14;
this.xPINcode.Text = "0000";
+ this.xPINcode.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.xPINcode.TextChanged += new System.EventHandler(this.xPINcode_TextChanged);
//
// xConfirmNP
//
@@ -461,7 +567,7 @@
this.groupBox2.Controls.Add(this.xShowPlayerNames);
this.groupBox2.Location = new System.Drawing.Point(6, 34);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(256, 138);
+ this.groupBox2.Size = new System.Drawing.Size(294, 114);
this.groupBox2.TabIndex = 39;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Rozstawienie";
@@ -469,7 +575,7 @@
// xMemberNumbers
//
this.xMemberNumbers.AutoSize = true;
- this.xMemberNumbers.Location = new System.Drawing.Point(12, 67);
+ this.xMemberNumbers.Location = new System.Drawing.Point(11, 65);
this.xMemberNumbers.Name = "xMemberNumbers";
this.xMemberNumbers.Size = new System.Drawing.Size(133, 17);
this.xMemberNumbers.TabIndex = 6;
@@ -480,7 +586,7 @@
// xShowPairNumbers
//
this.xShowPairNumbers.AutoSize = true;
- this.xShowPairNumbers.Location = new System.Drawing.Point(12, 44);
+ this.xShowPairNumbers.Location = new System.Drawing.Point(11, 42);
this.xShowPairNumbers.Name = "xShowPairNumbers";
this.xShowPairNumbers.Size = new System.Drawing.Size(118, 17);
this.xShowPairNumbers.TabIndex = 5;
@@ -491,7 +597,7 @@
//
this.xMemberNumbersNoBlankEntry.AutoSize = true;
this.xMemberNumbersNoBlankEntry.Enabled = false;
- this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(33, 90);
+ this.xMemberNumbersNoBlankEntry.Location = new System.Drawing.Point(34, 88);
this.xMemberNumbersNoBlankEntry.Name = "xMemberNumbersNoBlankEntry";
this.xMemberNumbersNoBlankEntry.Size = new System.Drawing.Size(131, 17);
this.xMemberNumbersNoBlankEntry.TabIndex = 7;
@@ -502,7 +608,7 @@
//
this.xShowPlayerNames.AutoSize = true;
this.xShowPlayerNames.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.xShowPlayerNames.Location = new System.Drawing.Point(12, 21);
+ this.xShowPlayerNames.Location = new System.Drawing.Point(11, 19);
this.xShowPlayerNames.Name = "xShowPlayerNames";
this.xShowPlayerNames.Size = new System.Drawing.Size(126, 17);
this.xShowPlayerNames.TabIndex = 9;
@@ -511,27 +617,27 @@
//
// groupBox6
//
- this.groupBox6.Controls.Add(this.xAutoShutDownBPC);
+ this.groupBox6.Controls.Add(this.xShowRecap);
this.groupBox6.Controls.Add(this.xRemainingBoards);
this.groupBox6.Controls.Add(this.xNextSeatings);
this.groupBox6.Controls.Add(this.xScoreRecap);
this.groupBox6.Controls.Add(this.xAutoShowScoreRecap);
- this.groupBox6.Location = new System.Drawing.Point(268, 178);
+ this.groupBox6.Location = new System.Drawing.Point(309, 154);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(294, 140);
this.groupBox6.TabIndex = 43;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Koniec rundy";
//
- // xAutoShutDownBPC
+ // xShowRecap
//
- 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;
+ this.xShowRecap.AutoSize = true;
+ this.xShowRecap.Location = new System.Drawing.Point(13, 114);
+ this.xShowRecap.Name = "xShowRecap";
+ this.xShowRecap.Size = new System.Drawing.Size(214, 17);
+ this.xShowRecap.TabIndex = 14;
+ this.xShowRecap.Text = "podgląd kontrolki/historii na koniec sesji";
+ this.xShowRecap.UseVisualStyleBackColor = true;
//
// xRemainingBoards
//
@@ -575,18 +681,30 @@
//
// groupBox3
//
+ this.groupBox3.Controls.Add(this.xFirstBoardManually);
this.groupBox3.Controls.Add(this.xCollectPlay);
this.groupBox3.Controls.Add(this.xBoardOrderVerification);
this.groupBox3.Controls.Add(this.xIntermediateResults);
this.groupBox3.Controls.Add(this.xAutoBoardNumber);
this.groupBox3.Controls.Add(this.xCollectBidding);
- this.groupBox3.Location = new System.Drawing.Point(4, 178);
+ this.groupBox3.Location = new System.Drawing.Point(5, 154);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(257, 140);
+ this.groupBox3.Size = new System.Drawing.Size(295, 140);
this.groupBox3.TabIndex = 40;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Zapis rozdania";
//
+ // xFirstBoardManually
+ //
+ this.xFirstBoardManually.AutoSize = true;
+ this.xFirstBoardManually.Enabled = false;
+ this.xFirstBoardManually.Location = new System.Drawing.Point(190, 22);
+ this.xFirstBoardManually.Name = "xFirstBoardManually";
+ this.xFirstBoardManually.Size = new System.Drawing.Size(103, 17);
+ this.xFirstBoardManually.TabIndex = 4;
+ this.xFirstBoardManually.Text = "pierwszy ręcznie";
+ this.xFirstBoardManually.UseVisualStyleBackColor = true;
+ //
// xCollectPlay
//
this.xCollectPlay.AutoSize = true;
@@ -626,6 +744,7 @@
this.xAutoBoardNumber.TabIndex = 10;
this.xAutoBoardNumber.Text = "automat. wpisuj numer rozdania";
this.xAutoBoardNumber.UseVisualStyleBackColor = true;
+ this.xAutoBoardNumber.CheckedChanged += new System.EventHandler(this.xAutoBoardNumber_CheckedChanged);
//
// xCollectBidding
//
@@ -637,124 +756,157 @@
this.xCollectBidding.Text = "zbieraj licytację";
this.xCollectBidding.UseVisualStyleBackColor = true;
//
- // groupBox5
- //
- this.groupBox5.Controls.Add(this.xCheckLeadCard);
- this.groupBox5.Controls.Add(this.xLeadCard);
- this.groupBox5.Controls.Add(this.xViewHandrecord);
- this.groupBox5.Location = new System.Drawing.Point(5, 324);
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(257, 121);
- this.groupBox5.TabIndex = 42;
- this.groupBox5.TabStop = false;
- this.groupBox5.Text = "Rozkłady";
- //
- // xCheckLeadCard
- //
- this.xCheckLeadCard.AutoSize = true;
- this.xCheckLeadCard.Location = new System.Drawing.Point(12, 71);
- this.xCheckLeadCard.Name = "xCheckLeadCard";
- this.xCheckLeadCard.Size = new System.Drawing.Size(180, 17);
- this.xCheckLeadCard.TabIndex = 32;
- this.xCheckLeadCard.Text = "sprawdź kartę wistu z rozkładem";
- this.xCheckLeadCard.UseVisualStyleBackColor = true;
- //
- // xLeadCard
- //
- this.xLeadCard.AutoSize = true;
- this.xLeadCard.Location = new System.Drawing.Point(12, 48);
- this.xLeadCard.Name = "xLeadCard";
- this.xLeadCard.Size = new System.Drawing.Size(111, 17);
- this.xLeadCard.TabIndex = 21;
- this.xLeadCard.Text = "pytaj o kartę wistu";
- this.xLeadCard.UseVisualStyleBackColor = true;
- //
- // xViewHandrecord
- //
- this.xViewHandrecord.AutoSize = true;
- this.xViewHandrecord.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.xViewHandrecord.Location = new System.Drawing.Point(12, 25);
- this.xViewHandrecord.Name = "xViewHandrecord";
- this.xViewHandrecord.Size = new System.Drawing.Size(123, 17);
- this.xViewHandrecord.TabIndex = 29;
- this.xViewHandrecord.Text = "pokazuj rozkłady";
- this.xViewHandrecord.UseVisualStyleBackColor = true;
- //
// groupBox4
//
+ this.groupBox4.Controls.Add(this.lIMPScoringWarning);
+ this.groupBox4.Controls.Add(this.lScoringOptionsWarning);
+ this.groupBox4.Controls.Add(this.rbIMPButler);
+ this.groupBox4.Controls.Add(this.rbIMPCavendish);
+ this.groupBox4.Controls.Add(this.rbIMPTeams);
+ this.groupBox4.Controls.Add(this.rbMatchpoints);
this.groupBox4.Controls.Add(this.lGroupSectionsWarning);
- this.groupBox4.Controls.Add(this.xGroupSections);
this.groupBox4.Controls.Add(this.xShowResults);
- this.groupBox4.Controls.Add(this.xRepeatResults);
+ this.groupBox4.Controls.Add(this.xGroupSections);
this.groupBox4.Controls.Add(this.xShowPercentage);
+ this.groupBox4.Controls.Add(this.xRepeatResults);
this.groupBox4.Controls.Add(this.xShowContract);
this.groupBox4.Controls.Add(this.xResultsOverview);
- this.groupBox4.Location = new System.Drawing.Point(268, 34);
+ this.groupBox4.Location = new System.Drawing.Point(6, 300);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(294, 138);
+ this.groupBox4.Size = new System.Drawing.Size(294, 190);
this.groupBox4.TabIndex = 41;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Protokół";
//
+ // lIMPScoringWarning
+ //
+ this.lIMPScoringWarning.Cursor = System.Windows.Forms.Cursors.Help;
+ this.lIMPScoringWarning.Image = ((System.Drawing.Image)(resources.GetObject("lIMPScoringWarning.Image")));
+ this.lIMPScoringWarning.Location = new System.Drawing.Point(9, 76);
+ this.lIMPScoringWarning.Name = "lIMPScoringWarning";
+ this.lIMPScoringWarning.Size = new System.Drawing.Size(22, 18);
+ this.lIMPScoringWarning.TabIndex = 35;
+ this.lIMPScoringWarning.Visible = false;
+ this.lIMPScoringWarning.Click += new System.EventHandler(this.lIMPScoringWarning_Click);
+ //
+ // lScoringOptionsWarning
+ //
+ this.lScoringOptionsWarning.Cursor = System.Windows.Forms.Cursors.Help;
+ this.lScoringOptionsWarning.Image = ((System.Drawing.Image)(resources.GetObject("lScoringOptionsWarning.Image")));
+ this.lScoringOptionsWarning.Location = new System.Drawing.Point(9, 41);
+ this.lScoringOptionsWarning.Name = "lScoringOptionsWarning";
+ this.lScoringOptionsWarning.Size = new System.Drawing.Size(22, 18);
+ this.lScoringOptionsWarning.TabIndex = 34;
+ this.lScoringOptionsWarning.Visible = false;
+ this.lScoringOptionsWarning.Click += new System.EventHandler(this.lScoringOptionsWarning_Click);
+ //
+ // rbIMPButler
+ //
+ this.rbIMPButler.AutoSize = true;
+ this.rbIMPButler.Enabled = false;
+ this.rbIMPButler.Location = new System.Drawing.Point(127, 90);
+ this.rbIMPButler.Name = "rbIMPButler";
+ this.rbIMPButler.Size = new System.Drawing.Size(79, 17);
+ this.rbIMPButler.TabIndex = 33;
+ this.rbIMPButler.Text = "IMP (butler)";
+ this.rbIMPButler.UseVisualStyleBackColor = true;
+ this.rbIMPButler.CheckedChanged += new System.EventHandler(this.rbIMPButler_CheckedChanged);
+ //
+ // rbIMPCavendish
+ //
+ this.rbIMPCavendish.AutoSize = true;
+ this.rbIMPCavendish.Enabled = false;
+ this.rbIMPCavendish.Location = new System.Drawing.Point(127, 66);
+ this.rbIMPCavendish.Name = "rbIMPCavendish";
+ this.rbIMPCavendish.Size = new System.Drawing.Size(102, 17);
+ this.rbIMPCavendish.TabIndex = 32;
+ this.rbIMPCavendish.Text = "IMP (cavendish)";
+ this.rbIMPCavendish.UseVisualStyleBackColor = true;
+ this.rbIMPCavendish.CheckedChanged += new System.EventHandler(this.rbIMPCavendish_CheckedChanged);
+ //
+ // rbIMPTeams
+ //
+ this.rbIMPTeams.AutoSize = true;
+ this.rbIMPTeams.Enabled = false;
+ this.rbIMPTeams.Location = new System.Drawing.Point(35, 90);
+ this.rbIMPTeams.Name = "rbIMPTeams";
+ this.rbIMPTeams.Size = new System.Drawing.Size(81, 17);
+ this.rbIMPTeams.TabIndex = 31;
+ this.rbIMPTeams.Text = "IMP (teamy)";
+ this.rbIMPTeams.UseVisualStyleBackColor = true;
+ this.rbIMPTeams.CheckedChanged += new System.EventHandler(this.rbIMPTeams_CheckedChanged);
+ //
+ // rbMatchpoints
+ //
+ this.rbMatchpoints.AutoSize = true;
+ this.rbMatchpoints.Enabled = false;
+ this.rbMatchpoints.Location = new System.Drawing.Point(35, 66);
+ this.rbMatchpoints.Name = "rbMatchpoints";
+ this.rbMatchpoints.Size = new System.Drawing.Size(67, 17);
+ this.rbMatchpoints.TabIndex = 30;
+ this.rbMatchpoints.Text = "% maksa";
+ this.rbMatchpoints.UseVisualStyleBackColor = true;
+ this.rbMatchpoints.CheckedChanged += new System.EventHandler(this.rbMatchpoints_CheckedChanged);
+ //
// lGroupSectionsWarning
//
this.lGroupSectionsWarning.Cursor = System.Windows.Forms.Cursors.Help;
this.lGroupSectionsWarning.Image = ((System.Drawing.Image)(resources.GetObject("lGroupSectionsWarning.Image")));
- this.lGroupSectionsWarning.Location = new System.Drawing.Point(9, 87);
+ this.lGroupSectionsWarning.Location = new System.Drawing.Point(9, 18);
this.lGroupSectionsWarning.Name = "lGroupSectionsWarning";
this.lGroupSectionsWarning.Size = new System.Drawing.Size(22, 18);
this.lGroupSectionsWarning.TabIndex = 29;
this.lGroupSectionsWarning.Visible = false;
this.lGroupSectionsWarning.Click += new System.EventHandler(this.lGroupSectionsWarning_Click);
//
+ // xShowResults
+ //
+ this.xShowResults.AutoSize = true;
+ this.xShowResults.Location = new System.Drawing.Point(12, 113);
+ this.xShowResults.Name = "xShowResults";
+ this.xShowResults.Size = new System.Drawing.Size(161, 17);
+ this.xShowResults.TabIndex = 1;
+ this.xShowResults.Text = "pokazuj zapisy rozdania jako";
+ this.xShowResults.UseVisualStyleBackColor = true;
+ this.xShowResults.CheckedChanged += new System.EventHandler(this.xShowResults_CheckedChanged);
+ //
// xGroupSections
//
this.xGroupSections.AutoSize = true;
- this.xGroupSections.Enabled = false;
- this.xGroupSections.Location = new System.Drawing.Point(34, 89);
+ this.xGroupSections.Location = new System.Drawing.Point(34, 19);
this.xGroupSections.Name = "xGroupSections";
- this.xGroupSections.Size = new System.Drawing.Size(227, 17);
+ this.xGroupSections.Size = new System.Drawing.Size(181, 17);
this.xGroupSections.TabIndex = 4;
- this.xGroupSections.Text = "wspólne maksowanie wszystkich sektorów";
+ this.xGroupSections.Text = "wspólny dla wszystkich sektorów";
this.xGroupSections.UseVisualStyleBackColor = true;
+ this.xGroupSections.CheckedChanged += new System.EventHandler(this.xGroupSections_CheckedChanged);
//
- // xShowResults
+ // xShowPercentage
//
- this.xShowResults.AutoSize = true;
- this.xShowResults.Location = new System.Drawing.Point(13, 20);
- this.xShowResults.Name = "xShowResults";
- this.xShowResults.Size = new System.Drawing.Size(159, 17);
- this.xShowResults.TabIndex = 1;
- this.xShowResults.Text = "pokazuj wynik rozdania jako";
- this.xShowResults.UseVisualStyleBackColor = true;
- this.xShowResults.CheckedChanged += new System.EventHandler(this.xShowResults_CheckedChanged);
+ this.xShowPercentage.AutoSize = true;
+ this.xShowPercentage.Location = new System.Drawing.Point(34, 42);
+ this.xShowPercentage.Name = "xShowPercentage";
+ this.xShowPercentage.Size = new System.Drawing.Size(128, 17);
+ this.xShowPercentage.TabIndex = 3;
+ this.xShowPercentage.Text = "pokaż wynik rozdania";
+ this.xShowPercentage.UseVisualStyleBackColor = true;
+ this.xShowPercentage.CheckedChanged += new System.EventHandler(this.xShowPercentage_CheckedChanged);
//
// xRepeatResults
//
this.xRepeatResults.AutoSize = true;
this.xRepeatResults.Enabled = false;
- this.xRepeatResults.Location = new System.Drawing.Point(34, 43);
+ this.xRepeatResults.Location = new System.Drawing.Point(35, 136);
this.xRepeatResults.Name = "xRepeatResults";
this.xRepeatResults.Size = new System.Drawing.Size(155, 17);
this.xRepeatResults.TabIndex = 2;
this.xRepeatResults.Text = "nieskończone przeglądanie";
this.xRepeatResults.UseVisualStyleBackColor = true;
//
- // xShowPercentage
- //
- this.xShowPercentage.AutoSize = true;
- this.xShowPercentage.Enabled = false;
- this.xShowPercentage.Location = new System.Drawing.Point(34, 66);
- this.xShowPercentage.Name = "xShowPercentage";
- this.xShowPercentage.Size = new System.Drawing.Size(102, 17);
- this.xShowPercentage.TabIndex = 3;
- this.xShowPercentage.Text = "pokaż % wyniku";
- this.xShowPercentage.UseVisualStyleBackColor = true;
- //
// xShowContract
//
this.xShowContract.AutoSize = true;
- this.xShowContract.Location = new System.Drawing.Point(13, 112);
+ this.xShowContract.Location = new System.Drawing.Point(11, 159);
this.xShowContract.Name = "xShowContract";
this.xShowContract.Size = new System.Drawing.Size(150, 17);
this.xShowContract.TabIndex = 20;
@@ -773,24 +925,25 @@
"traveler, 6x1",
"traveler, 6x2",
"traveler, 4x1"});
- this.xResultsOverview.Location = new System.Drawing.Point(178, 18);
+ this.xResultsOverview.Location = new System.Drawing.Point(179, 111);
this.xResultsOverview.Name = "xResultsOverview";
this.xResultsOverview.Size = new System.Drawing.Size(103, 21);
this.xResultsOverview.TabIndex = 28;
//
- // tabPage2
- //
- this.tabPage2.Controls.Add(this.sectionToolStrip);
- this.tabPage2.Controls.Add(this.namesPanel);
- this.tabPage2.Controls.Add(this.syncToolStrip);
- this.tabPage2.Controls.Add(this.toolStrip4);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(569, 511);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "Nazwiska";
- this.tabPage2.UseVisualStyleBackColor = true;
+ // tpNames
+ //
+ this.tpNames.Controls.Add(this.sectionToolStrip);
+ this.tpNames.Controls.Add(this.namesPanel);
+ this.tpNames.Controls.Add(this.syncToolStrip);
+ this.tpNames.Controls.Add(this.toolStrip4);
+ this.tpNames.ImageIndex = 1;
+ this.tpNames.Location = new System.Drawing.Point(4, 23);
+ this.tpNames.Name = "tpNames";
+ this.tpNames.Padding = new System.Windows.Forms.Padding(3);
+ this.tpNames.Size = new System.Drawing.Size(612, 557);
+ this.tpNames.TabIndex = 1;
+ this.tpNames.Text = "Nazwiska";
+ this.tpNames.UseVisualStyleBackColor = true;
//
// sectionToolStrip
//
@@ -801,9 +954,9 @@
this.sectionToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.cbNamesSection});
- this.sectionToolStrip.Location = new System.Drawing.Point(3, 458);
+ this.sectionToolStrip.Location = new System.Drawing.Point(3, 504);
this.sectionToolStrip.Name = "sectionToolStrip";
- this.sectionToolStrip.Size = new System.Drawing.Size(563, 25);
+ this.sectionToolStrip.Size = new System.Drawing.Size(606, 25);
this.sectionToolStrip.TabIndex = 30;
this.sectionToolStrip.Text = "toolStrip5";
//
@@ -843,7 +996,7 @@
this.namesPanel.Controls.Add(this.lTables);
this.namesPanel.Location = new System.Drawing.Point(3, 31);
this.namesPanel.Name = "namesPanel";
- this.namesPanel.Size = new System.Drawing.Size(562, 425);
+ this.namesPanel.Size = new System.Drawing.Size(607, 470);
this.namesPanel.TabIndex = 29;
//
// bTeamsNamesSettings
@@ -913,7 +1066,7 @@
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(3, 389);
+ this.label9.Location = new System.Drawing.Point(1, 436);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(499, 13);
this.label9.TabIndex = 31;
@@ -969,7 +1122,7 @@
this.EastWest});
this.namesGridView.Location = new System.Drawing.Point(2, 98);
this.namesGridView.Name = "namesGridView";
- this.namesGridView.Size = new System.Drawing.Size(557, 287);
+ this.namesGridView.Size = new System.Drawing.Size(601, 335);
this.namesGridView.TabIndex = 28;
this.namesGridView.CellMouseEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.namesGridView_CellMouseEnter);
this.namesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.namesGridView_CellValueChanged);
@@ -1048,7 +1201,7 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(5, 406);
+ this.label8.Location = new System.Drawing.Point(3, 453);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(323, 13);
this.label8.TabIndex = 12;
@@ -1081,9 +1234,9 @@
this.bSync,
this.eInterval,
this.bAutoSync});
- this.syncToolStrip.Location = new System.Drawing.Point(3, 483);
+ this.syncToolStrip.Location = new System.Drawing.Point(3, 529);
this.syncToolStrip.Name = "syncToolStrip";
- this.syncToolStrip.Size = new System.Drawing.Size(563, 25);
+ this.syncToolStrip.Size = new System.Drawing.Size(606, 25);
this.syncToolStrip.TabIndex = 27;
this.syncToolStrip.Text = "toolStrip5";
//
@@ -1127,7 +1280,7 @@
this.bTruncate});
this.toolStrip4.Location = new System.Drawing.Point(3, 3);
this.toolStrip4.Name = "toolStrip4";
- this.toolStrip4.Size = new System.Drawing.Size(563, 25);
+ this.toolStrip4.Size = new System.Drawing.Size(606, 25);
this.toolStrip4.TabIndex = 26;
this.toolStrip4.Text = "toolStrip4";
//
@@ -1192,32 +1345,33 @@
this.bTruncate.Text = "Usuń nazwiska z BWS";
this.bTruncate.Click += new System.EventHandler(this.bTruncate_Click);
//
- // tabPage3
- //
- this.tabPage3.Controls.Add(this.label17);
- this.tabPage3.Controls.Add(this.label18);
- this.tabPage3.Controls.Add(this.label15);
- this.tabPage3.Controls.Add(this.label16);
- this.tabPage3.Controls.Add(this.label13);
- this.tabPage3.Controls.Add(this.label14);
- this.tabPage3.Controls.Add(this.label12);
- this.tabPage3.Controls.Add(this.label10);
- this.tabPage3.Controls.Add(this.gwSections);
- this.tabPage3.Controls.Add(this.toolStrip3);
- this.tabPage3.Controls.Add(this.lRecordSections);
- this.tabPage3.Controls.Add(this.label11);
- this.tabPage3.Location = new System.Drawing.Point(4, 22);
- this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(569, 511);
- this.tabPage3.TabIndex = 2;
- this.tabPage3.Text = "Rozkłady";
- this.tabPage3.UseVisualStyleBackColor = true;
+ // tpRecords
+ //
+ this.tpRecords.Controls.Add(this.label17);
+ this.tpRecords.Controls.Add(this.label18);
+ this.tpRecords.Controls.Add(this.label15);
+ this.tpRecords.Controls.Add(this.label16);
+ this.tpRecords.Controls.Add(this.label13);
+ this.tpRecords.Controls.Add(this.label14);
+ this.tpRecords.Controls.Add(this.label12);
+ this.tpRecords.Controls.Add(this.label10);
+ this.tpRecords.Controls.Add(this.gwSections);
+ this.tpRecords.Controls.Add(this.toolStrip3);
+ this.tpRecords.Controls.Add(this.lRecordSections);
+ this.tpRecords.Controls.Add(this.label11);
+ this.tpRecords.ImageIndex = 2;
+ this.tpRecords.Location = new System.Drawing.Point(4, 23);
+ this.tpRecords.Name = "tpRecords";
+ this.tpRecords.Padding = new System.Windows.Forms.Padding(3);
+ this.tpRecords.Size = new System.Drawing.Size(612, 557);
+ this.tpRecords.TabIndex = 2;
+ this.tpRecords.Text = "Rozkłady";
+ this.tpRecords.UseVisualStyleBackColor = true;
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(458, 460);
+ this.label17.Location = new System.Drawing.Point(460, 507);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(71, 13);
this.label17.TabIndex = 18;
@@ -1227,7 +1381,7 @@
//
this.label18.AutoSize = true;
this.label18.BackColor = System.Drawing.SystemColors.ControlDark;
- this.label18.Location = new System.Drawing.Point(432, 456);
+ this.label18.Location = new System.Drawing.Point(434, 503);
this.label18.MinimumSize = new System.Drawing.Size(20, 20);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(20, 20);
@@ -1237,7 +1391,7 @@
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(322, 460);
+ this.label15.Location = new System.Drawing.Point(324, 507);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(104, 13);
this.label15.TabIndex = 16;
@@ -1247,7 +1401,7 @@
//
this.label16.AutoSize = true;
this.label16.BackColor = System.Drawing.Color.Crimson;
- this.label16.Location = new System.Drawing.Point(296, 456);
+ this.label16.Location = new System.Drawing.Point(298, 503);
this.label16.MinimumSize = new System.Drawing.Size(20, 20);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(20, 20);
@@ -1257,7 +1411,7 @@
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(156, 460);
+ this.label13.Location = new System.Drawing.Point(158, 507);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(134, 13);
this.label13.TabIndex = 14;
@@ -1268,7 +1422,7 @@
this.label14.AutoSize = true;
this.label14.BackColor = System.Drawing.Color.LimeGreen;
this.label14.ForeColor = System.Drawing.Color.White;
- this.label14.Location = new System.Drawing.Point(130, 456);
+ this.label14.Location = new System.Drawing.Point(132, 503);
this.label14.MinimumSize = new System.Drawing.Size(20, 20);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(20, 20);
@@ -1279,7 +1433,7 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(34, 460);
+ this.label12.Location = new System.Drawing.Point(36, 507);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(90, 13);
this.label12.TabIndex = 12;
@@ -1289,7 +1443,7 @@
//
this.label10.AutoSize = true;
this.label10.BackColor = System.Drawing.Color.LimeGreen;
- this.label10.Location = new System.Drawing.Point(8, 456);
+ this.label10.Location = new System.Drawing.Point(10, 503);
this.label10.MinimumSize = new System.Drawing.Size(20, 20);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(20, 20);
@@ -1304,14 +1458,14 @@
this.gwSections.AllowUserToResizeRows = false;
this.gwSections.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
this.gwSections.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Sunken;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.gwSections.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.gwSections.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.gwSections.Location = new System.Drawing.Point(9, 118);
this.gwSections.MultiSelect = false;
@@ -1321,7 +1475,7 @@
this.gwSections.ShowCellErrors = false;
this.gwSections.ShowEditingIcon = false;
this.gwSections.ShowRowErrors = false;
- this.gwSections.Size = new System.Drawing.Size(554, 335);
+ this.gwSections.Size = new System.Drawing.Size(597, 382);
this.gwSections.TabIndex = 10;
this.gwSections.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gwSections_CellDoubleClick);
this.gwSections.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gwSections_CellDoubleClick);
@@ -1336,9 +1490,9 @@
this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bLoadHands,
this.bClearHands});
- this.toolStrip3.Location = new System.Drawing.Point(3, 483);
+ this.toolStrip3.Location = new System.Drawing.Point(3, 529);
this.toolStrip3.Name = "toolStrip3";
- this.toolStrip3.Size = new System.Drawing.Size(563, 25);
+ this.toolStrip3.Size = new System.Drawing.Size(606, 25);
this.toolStrip3.TabIndex = 9;
this.toolStrip3.Text = "toolStrip3";
//
@@ -1381,6 +1535,15 @@
this.label11.TabIndex = 1;
this.label11.Text = resources.GetString("label11.Text");
//
+ // ilTabIcons
+ //
+ this.ilTabIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilTabIcons.ImageStream")));
+ this.ilTabIcons.TransparentColor = System.Drawing.Color.Transparent;
+ this.ilTabIcons.Images.SetKeyName(0, "CheckBoxHS.png");
+ this.ilTabIcons.Images.SetKeyName(1, "EnvelopeHS.png");
+ this.ilTabIcons.Images.SetKeyName(2, "ShowAllCommentsHS.png");
+ this.ilTabIcons.Images.SetKeyName(3, "WarningHS.png");
+ //
// timer
//
this.timer.Tick += new System.EventHandler(this.timer_Tick);
@@ -1400,7 +1563,7 @@
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 10, 1, 5);
- this.toolStrip1.Size = new System.Drawing.Size(583, 42);
+ this.toolStrip1.Size = new System.Drawing.Size(632, 42);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
@@ -1443,7 +1606,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(583, 608);
+ this.ClientSize = new System.Drawing.Size(632, 655);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.statusStrip1);
@@ -1460,13 +1623,15 @@
this.statusStrip1.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
- this.tabPage1.ResumeLayout(false);
+ this.tpSettings.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.toolStrip2.ResumeLayout(false);
this.toolStrip2.PerformLayout();
this.statusStrip2.ResumeLayout(false);
this.statusStrip2.PerformLayout();
+ this.groupBox5.ResumeLayout(false);
+ this.groupBox5.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox2.ResumeLayout(false);
@@ -1475,12 +1640,10 @@
this.groupBox6.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
- this.groupBox5.ResumeLayout(false);
- this.groupBox5.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
- this.tabPage2.ResumeLayout(false);
- this.tabPage2.PerformLayout();
+ this.tpNames.ResumeLayout(false);
+ this.tpNames.PerformLayout();
this.sectionToolStrip.ResumeLayout(false);
this.sectionToolStrip.PerformLayout();
this.namesPanel.ResumeLayout(false);
@@ -1492,8 +1655,8 @@
this.syncToolStrip.PerformLayout();
this.toolStrip4.ResumeLayout(false);
this.toolStrip4.PerformLayout();
- this.tabPage3.ResumeLayout(false);
- this.tabPage3.PerformLayout();
+ this.tpRecords.ResumeLayout(false);
+ this.tpRecords.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.gwSections)).EndInit();
this.toolStrip3.ResumeLayout(false);
this.toolStrip3.PerformLayout();
@@ -1513,7 +1676,7 @@
private System.Windows.Forms.ToolStripStatusLabel status3;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tpSettings;
public System.Windows.Forms.TextBox xPINcode;
private System.Windows.Forms.Label label2;
public System.Windows.Forms.CheckBox xAutoShutDownBPC;
@@ -1528,7 +1691,7 @@
public System.Windows.Forms.CheckBox xShowPercentage;
public System.Windows.Forms.CheckBox xRepeatResults;
public System.Windows.Forms.CheckBox xShowResults;
- public System.Windows.Forms.TabPage tabPage2;
+ public System.Windows.Forms.TabPage tpNames;
public System.Windows.Forms.CheckBox xConfirmNP;
public System.Windows.Forms.CheckBox xShowPlayerNames;
public System.Windows.Forms.CheckBox xAutoBoardNumber;
@@ -1551,7 +1714,7 @@
private System.Windows.Forms.Label lSkok;
public System.Windows.Forms.ComboBox xResultsOverview;
public System.Windows.Forms.CheckBox xViewHandrecord;
- private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.TabPage tpRecords;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.OpenFileDialog openPBN;
public System.Windows.Forms.CheckBox xCollectPlay;
@@ -1622,6 +1785,18 @@
private System.Windows.Forms.ToolStrip sectionToolStrip;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripComboBox cbNamesSection;
+ public System.Windows.Forms.Label lPINWarning;
+ private System.Windows.Forms.Button bRandomPIN;
+ private System.Windows.Forms.ImageList ilTabIcons;
+ public System.Windows.Forms.CheckBox xCallTD;
+ private System.Windows.Forms.RadioButton rbIMPButler;
+ private System.Windows.Forms.RadioButton rbIMPCavendish;
+ private System.Windows.Forms.RadioButton rbIMPTeams;
+ private System.Windows.Forms.RadioButton rbMatchpoints;
+ public System.Windows.Forms.Label lScoringOptionsWarning;
+ public System.Windows.Forms.CheckBox xFirstBoardManually;
+ public System.Windows.Forms.CheckBox xShowRecap;
+ public System.Windows.Forms.Label lIMPScoringWarning;
}
}
diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs
index 6284419..e0de79f 100644
--- a/Aktywator/MainForm.cs
+++ b/Aktywator/MainForm.cs
@@ -26,6 +26,8 @@ namespace Aktywator
public static Version requiredBCSVersion;
public static Version requiredFWVersion;
+ private Dictionary<RadioButton, int> _scoringType;
+
public MainForm()
{
InitializeComponent();
@@ -34,6 +36,11 @@ namespace Aktywator
private void MainForm_Load(object sender, EventArgs e)
{
if (!MySQL.getConfigured()) (new MysqlSettings()).ShowDialog();
+ this._scoringType = new Dictionary<RadioButton, int>();
+ this._scoringType.Add(this.rbMatchpoints, 1);
+ this._scoringType.Add(this.rbIMPButler, 2);
+ this._scoringType.Add(this.rbIMPCavendish, 3);
+ this._scoringType.Add(this.rbIMPTeams, 4);
}
private void MainForm_Shown(object sender, EventArgs e)
@@ -82,13 +89,18 @@ namespace Aktywator
// cloning Setting List returned from Bws, because we're going to extend it for version tracking purposes
this.bwsSettings = new List<Setting>(bws.initSettings());
this.bwsSettings.Add(new Setting("BM2ShowPlayerNames", this.xShowPlayerNames, bws, new Version(2, 0, 0), new Version(1, 3, 1)));
+ this.bwsSettings.Add(new Setting("BM2GameSummary", this.xShowRecap, bws, new Version(3, 6, 0), new Version(3, 0, 1)));
bindSettingChanges();
bws.loadSettings();
+ this.checkRecordsForSectionGroups();
+ this.scoringOptionsWarning();
+
tournament = this.detectTeamyTournament();
if (tournament != null)
{
updateTournamentInfo(tournament);
+ this.rbIMPTeams.Checked = true;
}
else
{
@@ -99,6 +111,30 @@ namespace Aktywator
this.WindowState = FormWindowState.Normal;
}
+ internal void checkRecordsForSectionGroups()
+ {
+ xGroupSections.Enabled = false;
+ if (this.detectTeamyTournament() == null)
+ {
+ if (cbSettingsSection.Items.Count > 2)
+ {
+ if (bws.detectDifferentRecordsInSections())
+ {
+ bws.sectionGroupWarning();
+ xGroupSections.Checked = false;
+ }
+ else
+ {
+ xGroupSections.Enabled = true;
+ }
+ }
+ }
+ else
+ {
+ xGroupSections.Checked = false;
+ }
+ }
+
private void shortenFilenameLabel()
{
String originalLabel = (String)labelFilename.Text.Clone();
@@ -321,46 +357,18 @@ namespace Aktywator
bws.loadSettings();
}
- static public string sectionGroupWarningLabel = "Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!";
+ static public string sectionGroupWarningLabel = "Opcje sposobu liczenia wyników i grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie mogą być zaktualizowane w trakcie trwania sesji!";
static public string differentRecordsInSections = "BWS zawiera różne rozkłady w różnych sektorach, opcja grupowania sektorów musi być wyłączona.";
public void xShowResults_CheckedChanged(object sender, EventArgs e)
{
- if (xShowResults.Checked)
- {
- xRepeatResults.Enabled = true;
- xShowPercentage.Enabled = true;
- xResultsOverview.Enabled = true;
- xGroupSections.Enabled = !bws.detectDifferentRecordsInSections();
- }
- else
- {
- xRepeatResults.Enabled = false;
- xShowPercentage.Enabled = false;
- xShowPercentage.Checked = false;
- xResultsOverview.Enabled = false;
- xGroupSections.Enabled = false;
- }
- if (cbSettingsSection.Items.Count > 2 || bws.detectDifferentRecordsInSections())
- {
- bws.sectionGroupWarning();
- }
- if (cbSettingsSection.Items.Count <= 2)
- {
- xGroupSections.Enabled = false;
- }
+ xRepeatResults.Enabled = xShowResults.Checked;
+ xResultsOverview.Enabled = xShowResults.Checked;
}
private void xMemberNumbers_CheckedChanged(object sender, EventArgs e)
{
- if (xMemberNumbers.Checked)
- {
- xMemberNumbersNoBlankEntry.Enabled = true;
- }
- else
- {
- xMemberNumbersNoBlankEntry.Enabled = false;
- }
+ xMemberNumbersNoBlankEntry.Enabled = xMemberNumbers.Checked;
}
private void bMySQLTournament_Click(object sender, EventArgs e)
@@ -536,15 +544,19 @@ namespace Aktywator
confirmMsg.Append("\nNagłówek pliku: " + pbn.title);
}
confirmMsg.Append("\nPierwszy rozkład: ");
- for (int i = 0; i < pbn.handRecords[bws.lowBoard()].north.Length; i++)
+ int lowBoard = bws.lowBoard();
+ while (lowBoard < pbn.handRecords.Length && pbn.handRecords[lowBoard] == null) {
+ lowBoard++;
+ }
+ for (int i = 0; i < pbn.handRecords[lowBoard].north.Length; i++)
{
- if ("".Equals(pbn.handRecords[bws.lowBoard()].north[i]))
+ if ("".Equals(pbn.handRecords[lowBoard].north[i]))
{
confirmMsg.Append("renons, ");
}
else
{
- confirmMsg.Append(pbn.handRecords[bws.lowBoard()].north[i]);
+ confirmMsg.Append(pbn.handRecords[lowBoard].north[i]);
break;
}
}
@@ -639,8 +651,7 @@ namespace Aktywator
private void lGroupSectionsWarning_Click(object sender, EventArgs e)
{
- string message = bws.detectDifferentRecordsInSections() ? MainForm.differentRecordsInSections : MainForm.sectionGroupWarningLabel;
- MessageBox.Show(message, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question);
+ MessageBox.Show(MainForm.differentRecordsInSections, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question);
}
private void bTeamsNamesSettings_Click(object sender, EventArgs e)
@@ -678,5 +689,147 @@ namespace Aktywator
}
}
+
+ internal void checkPINsafety(string pin, int[] unsafePINs, bool explicitWarning = false)
+ {
+ try
+ {
+ if (Array.IndexOf(unsafePINs, Int32.Parse(pin)) > -1)
+ {
+ this.lPINWarning.Visible = true;
+ this.tpRecords.Enabled = false;
+ this.tpRecords.ImageIndex = 3;
+ this.tpRecords.ToolTipText = "Wczytanie rozkładów przy przewidywalnym PINie jest niedozwolone.";
+ if (explicitWarning)
+ {
+ MessageBox.Show("Próbujesz ustawić PIN, który jest łatwy do przewidzenia przez zawodników.\n\nMam nadzieję, że wiesz, co robisz!\n\nNiestety, nie możemy pozwolić Ci na wgranie do BWSa rozkładów.", "Przewidywalny PIN!", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ this.bws.clearHandRecords();
+ }
+ }
+ else
+ {
+ this.lPINWarning.Visible = false;
+ this.tpRecords.Enabled = true;
+ this.tpRecords.ImageIndex = 2;
+ this.tpRecords.ToolTipText = "";
+ }
+ }
+ catch (FormatException e)
+ {
+ }
+ }
+
+ private void xPINcode_TextChanged(object sender, EventArgs e)
+ {
+ this.checkPINsafety(this.xPINcode.Text, this.bws._unsafePINs);
+ }
+
+ private void lPINWarning_Click(object sender, EventArgs e)
+ {
+ this.checkPINsafety(this.xPINcode.Text, this.bws._unsafePINs, true);
+ }
+
+ private void bRandomPIN_Click(object sender, EventArgs e)
+ {
+ this.xPINcode.Text = this.bws._getRandomPIN();
+ }
+
+ private void tabControl1_Selecting(object sender, TabControlCancelEventArgs e)
+ {
+ if (!e.TabPage.Enabled)
+ {
+ e.Cancel = true;
+ }
+ }
+
+ private void xShowPercentage_CheckedChanged(object sender, EventArgs e)
+ {
+ bool teamsTournament = (this.detectTeamyTournament() != null);
+ this.rbMatchpoints.Enabled = xShowPercentage.Checked && !teamsTournament;
+ this.rbIMPButler.Enabled = xShowPercentage.Checked && !teamsTournament;
+ this.rbIMPCavendish.Enabled = xShowPercentage.Checked && !teamsTournament;
+ this.rbIMPTeams.Enabled = xShowPercentage.Checked && teamsTournament;
+ this.scoringOptionsWarning();
+ }
+
+ internal int getScoringType()
+ {
+ if (this.xShowPercentage.Checked)
+ {
+ foreach (KeyValuePair<RadioButton, int> type in this._scoringType)
+ {
+ if (type.Key.Checked)
+ {
+ return type.Value;
+ }
+ }
+ }
+ return 0;
+ }
+
+ internal void setScoringType(int scoringType)
+ {
+ foreach (KeyValuePair<RadioButton, int> type in this._scoringType)
+ {
+ type.Key.Checked = (type.Value == scoringType);
+ }
+ this.impScoringWarning();
+ }
+
+ private void scoringOptionsWarning()
+ {
+ lScoringOptionsWarning.Visible = (xGroupSections.Checked || xShowPercentage.Checked);
+ }
+
+ private void impScoringWarning()
+ {
+ int scoringType = this.getScoringType();
+ this.lIMPScoringWarning.Visible = (scoringType > 1 && scoringType < 4);
+ }
+
+ private void lScoringOptionsWarning_Click(object sender, EventArgs e)
+ {
+ MessageBox.Show(MainForm.sectionGroupWarningLabel, "Ustawienia wyświetlania wyników", MessageBoxButtons.OK, MessageBoxIcon.Question);
+ }
+
+ private void xGroupSections_CheckedChanged(object sender, EventArgs e)
+ {
+ this.scoringOptionsWarning();
+ }
+
+ private void xAutoBoardNumber_CheckedChanged(object sender, EventArgs e)
+ {
+ this.xFirstBoardManually.Enabled = xAutoBoardNumber.Checked;
+ if (!this.xFirstBoardManually.Enabled)
+ {
+ this.xFirstBoardManually.Checked = false;
+ }
+ }
+
+ private void lIMPScoringWarning_Click(object sender, EventArgs e)
+ {
+ MessageBox.Show("Pamiętaj o skonfigurowaniu opcji liczenia turnieju na IMP (średnia, odrzucanie w butlerze, uśrednianie cavendisha) w Bridgemate Control Software ***PRZED*** wystartowaniem sesji!", "Ustawienia obliczania wyników",
+ MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+
+ private void rbMatchpoints_CheckedChanged(object sender, EventArgs e)
+ {
+ this.impScoringWarning();
+ }
+
+ private void rbIMPCavendish_CheckedChanged(object sender, EventArgs e)
+ {
+ this.impScoringWarning();
+ }
+
+ private void rbIMPButler_CheckedChanged(object sender, EventArgs e)
+ {
+ this.impScoringWarning();
+ }
+
+ private void rbIMPTeams_CheckedChanged(object sender, EventArgs e)
+ {
+ this.impScoringWarning();
+ }
}
}
diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx
index 11af55c..980bd5e 100644
--- a/Aktywator/MainForm.resx
+++ b/Aktywator/MainForm.resx
@@ -121,12 +121,136 @@
<value>17, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>411, 17</value>
+ <value>100, 23</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>459, 56</value>
+ <value>760, 20</value>
+ </metadata>
+ <metadata name="statusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>237, 20</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="lIMPScoringWarning.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE
+ QVQ4T6WRX0hTYRjGdxMkikcqmeWURbeamAg60pVK82KgppIzCh3WNvwzRtjCuahhCYabyzRrFcQyVEbQ
+ hSj+YaKrkCBnDpuSTsu55lEXG1mG29PZuRiunau6+MH3PTzPw/u9HwvAf8EoBlmcKOa+GTi7p68ndrsV
+ xGEmTxBGMcjbgfz5JfvN3/MzSn9HLTHI5AnCKFr68oTzU5f9vp9PsbnWCNsID50NxEkmb4QQ5P3rQvLz
+ chdUzTUQiYpgGZOht4XjYvJGCGYjX2mflvibVFdgMpmg0WiQyEmAdTADulpC8rc/7EItLurjkHA3OLqo
+ shw6nQ5SqRRsNgFyqRovNfG/qIUe2J8JKxh/ntO3sqCm3v4MzepqKBQK5PLPQFGfg+2vcixbTge0MsK4
+ PxM6WPrzkuyTInpxvh0DzGY1Ss+XIj0tBeahKnhWrmJroQyjj7gB6mu5EQVmY67V/U27Rxd49XA7WyAQ
+ nIKoPBO2dxXY/FRCUYTVMY5fX0fYwgqGDDy+Y0YWoMO+Tni3W7G6qIThQTG62gVYmy3DxgceNqx8uKa4
+ GNTGBNqlscJQgaU/3+3beUKN/pgOf3erqLEluFhZguzsLOg1KSDnCkDOFsA1mYQvw1HoUhBeuuBVR4bS
+ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i
+ emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6
+ EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="lScoringOptionsWarning.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE
+ QVQ4T6WRX0hTYRjGdxMkikcqmeWURbeamAg60pVK82KgppIzCh3WNvwzRtjCuahhCYabyzRrFcQyVEbQ
+ hSj+YaKrkCBnDpuSTsu55lEXG1mG29PZuRiunau6+MH3PTzPw/u9HwvAf8EoBlmcKOa+GTi7p68ndrsV
+ xGEmTxBGMcjbgfz5JfvN3/MzSn9HLTHI5AnCKFr68oTzU5f9vp9PsbnWCNsID50NxEkmb4QQ5P3rQvLz
+ chdUzTUQiYpgGZOht4XjYvJGCGYjX2mflvibVFdgMpmg0WiQyEmAdTADulpC8rc/7EItLurjkHA3OLqo
+ shw6nQ5SqRRsNgFyqRovNfG/qIUe2J8JKxh/ntO3sqCm3v4MzepqKBQK5PLPQFGfg+2vcixbTge0MsK4
+ PxM6WPrzkuyTInpxvh0DzGY1Ss+XIj0tBeahKnhWrmJroQyjj7gB6mu5EQVmY67V/U27Rxd49XA7WyAQ
+ nIKoPBO2dxXY/FRCUYTVMY5fX0fYwgqGDDy+Y0YWoMO+Tni3W7G6qIThQTG62gVYmy3DxgceNqx8uKa4
+ GNTGBNqlscJQgaU/3+3beUKN/pgOf3erqLEluFhZguzsLOg1KSDnCkDOFsA1mYQvw1HoUhBeuuBVR4bS
+ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i
+ emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6
+ EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="lGroupSectionsWarning.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE
+ QVQ4T6WRX0hTYRjGdxMkikcqmeWURbeamAg60pVK82KgppIzCh3WNvwzRtjCuahhCYabyzRrFcQyVEbQ
+ hSj+YaKrkCBnDpuSTsu55lEXG1mG29PZuRiunau6+MH3PTzPw/u9HwvAf8EoBlmcKOa+GTi7p68ndrsV
+ xGEmTxBGMcjbgfz5JfvN3/MzSn9HLTHI5AnCKFr68oTzU5f9vp9PsbnWCNsID50NxEkmb4QQ5P3rQvLz
+ chdUzTUQiYpgGZOht4XjYvJGCGYjX2mflvibVFdgMpmg0WiQyEmAdTADulpC8rc/7EItLurjkHA3OLqo
+ shw6nQ5SqRRsNgFyqRovNfG/qIUe2J8JKxh/ntO3sqCm3v4MzepqKBQK5PLPQFGfg+2vcixbTge0MsK4
+ PxM6WPrzkuyTInpxvh0DzGY1Ss+XIj0tBeahKnhWrmJroQyjj7gB6mu5EQVmY67V/U27Rxd49XA7WyAQ
+ nIKoPBO2dxXY/FRCUYTVMY5fX0fYwgqGDDy+Y0YWoMO+Tni3W7G6qIThQTG62gVYmy3DxgceNqx8uKa4
+ GNTGBNqlscJQgaU/3+3beUKN/pgOf3erqLEluFhZguzsLOg1KSDnCkDOFsA1mYQvw1HoUhBeuuBVR4bS
+ 6bgN7w9DKOxZk2PVVgVhYTrSUo9hcSIL7ulUuCzHsT7BhnM0GuaH0YG74thelrYhOeDx9mCLbAuFtx1i
+ emHk3Dlq9Oyw8Po4AefIQQzrY3BPGk+yeho5U93XT8BwIxnd1xJp7suPQleXQNNaE09zR3wEty4domm6
+ EAdVRRzaJOwXoV/4N8D6AwpMvVRjyTFwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <metadata name="sectionToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>352, 59</value>
+ </metadata>
+ <metadata name="syncToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 59</value>
+ </metadata>
+ <metadata name="toolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>865, 20</value>
+ </metadata>
+ <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>142, 59</value>
+ </metadata>
+ <metadata name="ilTabIcons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>353, 20</value>
+ </metadata>
+ <data name="ilTabIcons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs
+ CwAAAk1TRnQBSQFMAgEBBAEAAagBAAGoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+ AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+ AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+ AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+ AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+ AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+ ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+ AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+ AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+ AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+ AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+ AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+ AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+ AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+ AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+ ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+ Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+ AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+ AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+ AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+ ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+ Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+ AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+ AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+ AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+ AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+ AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+ AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AdQABdAdL
+ BSoCKQGZAQABtQO8AvAB8QHyBfMiAAFLAqAB5QN6A1kBWAM3ATEBSwEAAe8BrgK7AQcCuwHvArUB7wG1
+ AfMDAAG1DWYHAAEcAnMBSwFKAhQB8QIAARoBmQKgAeUBegF5ARQBEQFYAVkBWAI3ATEBmQEAAbUBZgL/
+ AfQB8wEZBN0B7wHzAwABtQH/AvEB8AG8BAkBuwK1AWYHAAEcAZoDeQF0AUoBFQHxAgABeQOgAeUBeQES
+ ARUBUQJZAVgBNwFLAgABtQFmA/8B7QHzARkD3QG1AfIDAAG1BP8B9ALzAvEB3QEJAbUBZgQAARwBcwFK
+ ARwBGgKaAXoBeQFuAXkBFQHxAQAB9AF5A6ABeQFzAVEBeQJZAVgBMQHzAgAB7wFsAv8B7QERAe0B8wEZ
+ At0BtQHyAwABtQH/AbUB7wG1AvcD8wHxAd0BuwFmBAABHAGaAXQBHAIaApoBegFzAW4BSgEVAgABeQGa
+ AqABmgEUAUoBeQF6AVkBWAFzAwABuwFsAf8B7QEUAe0BFAHtAfMBGQHdAe8B8QMAAbUF/wL0A/MB8QEJ
+ AWYBAAEcAXMBSgEcARoBeQGZAcMCGgKaAXoBeQF0ARQCAAH/AXkCoAEcARIBQwF5AnoBUgH2AwABuwFs
+ AfQBbQHtAfQB7wEVAe0B8wEZAbsB8QMAAbUB/wS1AvcD8wHxAQkBZgEAARwBmgF0ARwBGgKZAsMCGgKa
+ AXoBeQFEAwABmQF5AaAC6wEUAUoBegFYAZkEAAEHAWwB/wH0A/8BBwFDAe0B8wG7AfADAAG1B/8C9AFG
+ AUUBCQFmAQABHAEaAXkBmQHDARoEmQMcA3MDAAH/AXkBoAESAewBbQEOAXoBUQH/BAABuwGuBv8BBwET
+ Ae0BBwHwAwABtQn/AU0BRgEJAWYBAAEcARoCmQLDAhoCmgF6AXkBRAcAARsBeQHrAe8B7AEPAVgBGgUA
+ AbsBrgf/AfIB/wG7AfADAAG1Cv8B9AHzAWYBAAGZAcMBGgSZAxwDcwgAAXkBmQHrARIBeQFSBgABBwGu
+ Cf8BuwG8AwABtQTxAfABvAQJArUBkgEAAZkCwwIaApoBegF5AUQLAAHzAXkBoAF6AVgB9AYAAQkErgRs
+ AmYBkQG8EgAEmQMcA3MMAAF5AZkBeQEcBwACCQEHA7sBBwK7Ae8CtQHvKAAB9gFSAUsB/0YAAUIBTQE+
+ BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAA7/AgABgAEDBP8CAAGAAQMBgAEBAfwBAwIA
+ AYABAwGAAQEB/AEBAYABAQGAAQMBgAEBAeABAAGAAQEBgAEDAYABAQHgAQABwAEDAYABAwGAAQECAAHA
+ AQMBgAEDAYABAQIAAeABBwGAAQMBgAEBAgAB4AEHAYABAwGAAQEBAAEHAfABDwGAAQMBgAEBAQABBwH4
+ AR8BgAEDAYABAQEAAT8B+AEfAYABAwL/AQABPwH8AT8BgAEDBP8B/AE/CP8L
+</value>
+ </data>
<data name="bLoad.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -155,10 +279,23 @@
AABJRU5ErkJggg==
</value>
</data>
- <metadata name="statusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>343, 56</value>
- </metadata>
- <data name="lGroupSectionsWarning.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="bRandomPIN.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACHElE
+ QVQ4T2P4//8/RRirICkYqyAynr7zz38Q7t/07X/z8rf/y2Y9/p/VfwsoBZFHUVy38k9w+YKPq32brkrB
+ xECaOzb8/1+26Nf/xL5n/z3Kzk1F1gNnVCz+rdOy+u+p1P4n/61St9yBifes//K/YN63/zF9H/+7Vdz+
+ b5t7/Ih56iFNmDzcgMql3yZULP723zn/9H+doAXvYOK1C1/8D2u999+59OYni+wL/42T9v3Xi97cA5OH
+ G1Cz9POFnOnv/5sm7/+vG7l+Lkw8d9Kd/w4Fp3NcSi9Ps807918vZtt/3bCl52HycAMal3/6nD717X/j
+ hL3/9eN2WIHE8vJusyZ1XAEy/zOEtd6xDm66BzZAK2D2Z5g+uAH1Sz99Tpv67r9Z6n64Acg4Z9Z7m7Qp
+ b/4bxu3CbkDFwo8XUqe8/W+fe/q/debRmTBxGK5d/mdexrQP//VjdvzXCV1yASYOV5A99WVffO/T/15V
+ N/4H1t98mzbxxZz8me9syhd8s2lY/Xd+/Yrf74Ob7//XDV/1XydsxUQMA8KabmsH1l8/6lF25b9v7Z3/
+ cb3P/2dOe/c/b+bH/zmzPv0HaQaGPsj209pha3UwDABh1+LzvnY5x44ax+/+rxuzFYxBgaYXswUY8suB
+ mhed1gtdFoysB8UAEDaM36upG7GmTyd4wUUtvylfQFg7cO4l3bAlk7RCV+qiq0fhkIOxChKP/zMAAKH7
+ vWcksHU/AAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="lPINWarning.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACaklE
@@ -176,7 +313,7 @@
</value>
</data>
<metadata name="sectionToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>564, 33</value>
+ <value>352, 59</value>
</metadata>
<data name="bTeamsNamesSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -217,8 +354,17 @@
<metadata name="EastWest.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="NorthSouth.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="EastWest.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="syncToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>343, 21</value>
+ <value>17, 59</value>
</metadata>
<data name="bSync.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -247,8 +393,25 @@
</value>
</data>
<metadata name="toolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>238, 56</value>
+ <value>865, 20</value>
</metadata>
+ <data name="toolStripSplitButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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==
+</value>
+ </data>
<data name="bMySQLTournament.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
@@ -282,23 +445,6 @@
BZRDJQYQ19gkAAAAAElFTkSuQmCC
</value>
</data>
- <data name="toolStripSplitButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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==
-</value>
- </data>
<data name="bMysqlSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -334,61 +480,60 @@
<data name="bTruncate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAuKSURBVGhD7ZkJVJNXFsdTkDWsgSwkkEACYd+RVRBRBK0C
- VVRENhFR1FrFra5oXRBbq3VprW2nc9ozHWuXUasz45y27ojQsFNQAilL2MIiinqcdvqfG/g602lPD8pA
- tef0d847Id/3fy/3vXfvfff7YP3O08ZASdGz9xVFb90588n7d86deq/v9Cc7NCdP+jO3nwiNmZnOrTnZ
- S5vmPfe+JjvtcklE6MUrYYEbmdtDfF9ayn2gKP5L/6d/QueutWjblIOunWvQezgfd/74BmoPvHwuwN7e
- mZGPOdVz5pg0Lc/JVm/IvXF77xZ0bl6BusRpOOPujCXm7LNiXd1EkhkPir9vUQU/VBS2aV7bhaaceWhe
- ngT1moVo35yDzh2r0bV7Le6/9hLUeXn/3D5j+ubBTmOEMjqaV580N7/zxRd77r1zEANv5KNx8XycdZUj
- 1dj4Y1MWawbJBENqImHqVP/DeXnfd+Q9T8bPQevqDKjXZ6Ej7wV07d0Izf48dB/Yju7929D/yhbg8E7c
- WLpIESgSeTNDjBoNqQs2t6xf33/33SN4+OGb6MjfiOuTw5FnafmVLUtnIUlsh5Q/4ui2LTvxwZtQ06q3
- r8uEekM22retJONfRDftSPeRPeg5mo/eQ7vQSxPppUn8q2AD7mxcgY2hwauZYf4vVFlZz6lXvaDsO7QH
- D/6wHwPv7MetFYtwQiodiNLTe5kkHtQMB8U/hc1m895cmHK1acsaaDYvg2bHKmho5btf24meY/vQe+wV
- 9L2+F33aCRzcMTiBvnyawPYV+Bft1MnYqI85LJYZM9xjoUpPF6gWZ36k2boat3etxr2C9dDsXIvi6VOw
- zcKimMadTTL6GB6TOH//zX9bsqSvc2subh/IQ/9b+9Gnbce1E6AdoAn10vXefZvQszMXPZuWouf5JGDZ
- HFTERX8TIRT6MmM9EsqUlAz1koy+7lWp6Fs+B/3rMtCYNRfnPFwRr294nCSeQ8rHwNjY2Ht1ePh7ipxF
- 6MnfRFv5Ku6+vR+3j+wecp99m9G7ex16ti5H96o0dGXFoyspCgOJYVDNi/12lkSSzAz1i2hXvTE15Wx7
- 2kx0zQ5DT+IE9KRPQ0V0MI4KhR1OOjrPk+y/QToSJJaW0womhl2qy05DP7nTwNE9uP3qFvT8YPyaDHRl
- z0Lngmh0xAehfYoHeiOd0D89CCucpCuZYX6GKjs7oT55Zk9nlAvaxwugiZSjdaoXCn3kWG/OKTRgsaJJ
- RolmdDAJ5PGWvB8+Qdm0KAn9lKXu7HgBvWsz0bVkNjpTY9CREIL2GG+0hcvQ5s9Hl7sZ7kc4Y5ebywZm
- jP9Qn5r8en1cOJQuxmgSs6BxY6PBi4fzUhGSTUw+IInXkHL0sUsQCvf+IyR4oCM9DrfJ53vSY8n40CHj
- IxyhDhBCTcY3y/TRINWFJsgB21zkedrO5DIuygVzqitCHVEsZKFaxEKjvQ7KxQb4iMt9GGbE3q39Da12
- TOGMGxe4Viw6rQj1Qcf0AHTHeKB9ghRqfwFa3UzR5GiAeqk+aiQ6qLBj4ZafCJ9NnHBCkTjlTombJa5Z
- s1AkYEFhy8JFkSEOWVlp7PUMFtPQVkO/8CvhYchecNjOtk7pJ0GXHw8dLkaM8Xpk/DiU2emgmIy8Tqtd
- 5mSCQokervBYKKTv12xY+IxviAI+v8FcV38WDTdq/v642My3tDx0wZ4PldQYjQ66+JpWftB4chGt8Vep
- XeGzcJmM1v59iT4/5RtjG4dTbqCrO5nGMBoa6glio2sQs4dnXXLdlg0663GDjNeu9BVql5l2SfudjD/B
- M8JSS8vPx7FYwUz3pwaTaGOTrUUyzndFPxhNBl/8UdN+vyyz/k5uyJ7H9Hm62BUevq7aze27yxSkWmMv
- iXQG20XhM4MTuECuVGJvgPP+Tt8ITU1/3aAdDnV6yjFVXBiu2o/DFbEersqMUUjBW+JsihInNoocDFAo
- 1sFlmsTXdO2Un9tFpuuTpX3NGrZyUfr5skkeuGL7DK5JjXDdzQql3gJUBtjiKy8R6iiV3vLlosrVHApK
- sddph+oppe6QORxjhnkyNC9axGnInK8oC7YfNL5IboYSbz4qgiVQRrniqq8MWzicssMiK1VLqBNag8W4
- 6cFBOe2G9jBr8bNDoo3NsHXTmNCQmipWpSfVVwaJUSh6BtflplCQ8VWhDlDFeKEszB37hIIGkoZRczso
- FJa0hLujI0IKpZcVKhz0UU4HXaVcdk9kZPTzB5SxRGu8MnW+ujJUiiKxLood2Sj1sELleDuooj1QGemN
- Y3aiblOW7kymixbOHiH/721RXuia5ASltzXtBJUcLiZ4z1V6ntGMPfUZGXaqrOTmqonOKKZA1Qaogny7
- wocPJRVzVRGueMtefN9ORy+N5D89pNgbeNafqKO80UlV600va1Q4GqHF3xZpItESRjN2qHNzrZUZSY3V
- VDYryJcVLuYoJePLafXrAmxQE+KAc0728NY3XEfyXywPNvF4H7VFeqE1XIpaby5q3cxQ5i1/YG9oKGEk
- Y0NLVnJJdawfSv0EKPXkkttwUObOQTUZUeNngy+c7BBrbHqEpNZDPX6ZAlubv7ZFeqApTIpqiokmHx7e
- dpadY26PPnVZaWfq40NRHiRBmb8QZV5cataopFbjy8MVZyGWczhaA+yHegyL+duOkuIuionGEDFq3C3Q
- HCBBDIerLe5Gl4qFqXsaEiehgoK2fLwtynwEtOU8lFOroUq0yJWHAh7vJkkDhno8GoZU/3/oKlN1U8pt
- 8KMYcjfHF+52Tczt0aF9Xe6MtpQZqI6QozzQFuW+NjQB/mCr8uXTQcXDu7Y23wp19EZU33D19LwV4+X3
- NOEOqHc1RTO5ZhqX+7MnuRERIpXyHixM662f6olKcp1yZuW1xpdrG03gS0ch+b3JQZKP6JWKlvFmZskN
- QfR87GsNlZMBStxE/WwWm8fcHjllaUmnOmdPQE2Y42COL/vx6tOWF7kL8JKVVQVJHYd6jJwVQuGBHnoE
- baYJtFFmWy0QFDC3RsbHISEJ3YsT0UirX0s5vyrEHuUUvNqVr6RWSu0cPYjL9Ay1+X5U+LOT/Ve9nhZo
- oefpGxLRXRPyMObW49O5YLaqLSUaylgf1E5yoxJBhooAEbmNYHD1r7qKkGNpeZqko1YW8/XYHmVyyb0O
- 2Th6RDVDEsdiC3Pr8agKCkpqz56HlnmT0DhjPOome6Ca3KiCqssq7RlAsfCuWHSXrasbxXQZNRKsrHK6
- fCRo9eTjrIw7soxUFxN5pnMZTSB5Chrjg3Ez2gs14U6DcVDlL4DCyw5ZFhYnSTr0Xn6UOe7k8GWblxwq
- TymCjIy070UfnXLKPDdnzeztXD4XrakxUD0XhvqpPvg6XI7KQDGq/W1Q4umAMCP2CqbLqGOjr+9ygct9
- 2ObqiN0CwSnm8qNR6+np3JyaCM3KZLSmP4tvZkegPtYXtREUyFQ61wSKcMlVDB5r8I3CmLFcZLO929UJ
- Fxwk99gUHszl4Tkmk/l1LUiAJjcN6sw4NM2JhHK6P+oiXVBNDy61QXb43EUMCxYrgukyJpibm1tW+koH
- WqQSKg71E5jLwxNkbu5/P2suetZkoC17FprnT0HDjEDcjHJDLZUSNZROz8odvqNTazzTZczIcnTc0O/h
- imXm5oeYS8Mz0czM8UFGIno2ZKI9Zy5aUmKhSgjBLcpE9REUyMFy7OXzS0k6bMU5Ghx1dy47zuXWMF8f
- jZppE2sGctPRuTKFiYNwNMb44FaUC65RdggzNP7ff22OIZZ6eh5xpqbaU/nRM95kC4v49vgo9K5JG3yF
- rp4/Gc0JwSgNdUe+wLqKJE5Dyl+Nx3/9uJTDKWicEoKOhXF0HkSjMsoPb/D5fVa6uvGM5OknwdB42wlb
- 287TlJO3WnNvWOrozKXLVKL8htBnsdwoD2tLBq3bjMnJ+zu/fVisfwP1S8tTgtT67QAAAABJRU5ErkJg
- gg==
+ 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
</value>
</data>
<metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>133, 56</value>
+ <value>142, 59</value>
</metadata>
<data name="bLoadHands.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -450,13 +595,13 @@ Jeżeli Server-&gt;Show hand records w BCS nie pokazuje rozkładów (i/lub nie p
to także należy ręcznie zrobić Upload.</value>
</data>
<metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>527, 17</value>
+ <value>459, 20</value>
</metadata>
<metadata name="openPBN.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>607, 17</value>
+ <value>657, 20</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>710, 17</value>
+ <value>247, 59</value>
</metadata>
<data name="bLaunch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -484,10 +629,10 @@ to także należy ręcznie zrobić Upload.</value>
</value>
</data>
<metadata name="namesTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>343, 21</value>
+ <value>539, 20</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>55</value>
+ <value>25</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/Aktywator/PBN.cs b/Aktywator/PBN.cs
index e312d63..2e36aef 100644
--- a/Aktywator/PBN.cs
+++ b/Aktywator/PBN.cs
@@ -43,6 +43,10 @@ namespace Aktywator
this._count++;
}
}
+ if (this._count == 0)
+ {
+ throw new Exception("PBN nie zawiera rozdań z zadanego przedziału");
+ }
if (pbn.Boards.Count > 0 && pbn.Boards[0].HasField("Event"))
{
this._title = pbn.Boards[0].GetField("Event");
diff --git a/Aktywator/Properties/AssemblyInfo.cs b/Aktywator/Properties/AssemblyInfo.cs
index 90362f9..af831a3 100644
--- a/Aktywator/Properties/AssemblyInfo.cs
+++ b/Aktywator/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.1")]
-[assembly: AssemblyFileVersion("1.1.4.1")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt
index 6e1bd6e..aeb1927 100644
--- a/Aktywator/Resources/BuildDate.txt
+++ b/Aktywator/Resources/BuildDate.txt
@@ -1 +1 @@
-2018-10-05
+2018-11-18
diff --git a/Aktywator/Setting.cs b/Aktywator/Setting.cs
index bde6fd1..657c822 100644
--- a/Aktywator/Setting.cs
+++ b/Aktywator/Setting.cs
@@ -42,15 +42,18 @@ namespace Aktywator
field.Checked = a.ToUpper() == "TRUE" ? true : false;
}
- public static string load(string name, Bws bws, StringBuilder errors, string section = null)
+ public static string load(string name, Bws bws, StringBuilder errors, string section = null, string table = "Settings", string sectionField = "`Section`")
{
StringBuilder str = new StringBuilder();
str.Append("SELECT ");
str.Append(name);
- str.Append(" FROM Settings");
+ str.Append(" FROM ");
+ str.Append(table);
if (section != null)
{
- str.Append(" WHERE `Section` = ");
+ str.Append(" WHERE ");
+ str.Append(sectionField);
+ str.Append(" = ");
str.Append(section);
}
try
@@ -171,12 +174,56 @@ namespace Aktywator
}
}
- public static void saveSectionGroups(Sql sql, bool value)
+ public static void saveScoringType(Sql sql, int value, string section)
{
- StringBuilder sb = new StringBuilder("UPDATE Tables SET `Group` = ");
- sb.Append(value ? "1" : "`Section`");
+ StringBuilder sb = new StringBuilder("UPDATE `Section` SET `ScoringType` = ");
+ sb.Append(value);
+ if (section != null)
+ {
+ sb.Append(" WHERE `ID` = ");
+ sb.Append(section);
+ }
sb.Append(";");
sql.query(sb.ToString());
}
+
+ public static void saveSectionGroups(Sql sql, bool value, int teamTableOffset = 0)
+ {
+ if (teamTableOffset == 0)
+ {
+ StringBuilder sb = new StringBuilder("UPDATE Tables SET `Group` = ");
+ sb.Append(value ? "1" : "`Section`");
+ sb.Append(";");
+ sql.query(sb.ToString());
+ }
+ else
+ {
+ int group = 1;
+ StringBuilder tablesQuery = new StringBuilder("SELECT `Section`, (`Table` MOD ");
+ tablesQuery.Append(teamTableOffset);
+ tablesQuery.Append(") FROM `Tables` GROUP BY `Section`, (`Table` MOD ");
+ tablesQuery.Append(teamTableOffset);
+ tablesQuery.Append(");");
+ OleDbDataReader tables = sql.select(tablesQuery.ToString());
+ List<string> queries = new List<string>();
+ while (tables.Read())
+ {
+ StringBuilder sb = new StringBuilder("UPDATE `Tables` SET `Group` = ");
+ sb.Append(group++);
+ sb.Append(" WHERE `Section` = ");
+ sb.Append(Bws.bwsNumber(tables, 0));
+ sb.Append(" AND (`Table` MOD ");
+ sb.Append(teamTableOffset);
+ sb.Append(") = ");
+ sb.Append(Bws.bwsNumber(tables, 1));
+ sb.Append(";");
+ queries.Add(sb.ToString());
+ }
+ foreach (string query in queries)
+ {
+ sql.query(query);
+ }
+ }
+ }
}
}