diff options
| -rw-r--r-- | Aktywator/Bws.cs | 36 | ||||
| -rw-r--r-- | Aktywator/MainForm.Designer.cs | 63 | ||||
| -rw-r--r-- | Aktywator/MainForm.cs | 14 | ||||
| -rw-r--r-- | Aktywator/MainForm.resx | 191 | ||||
| -rw-r--r-- | Aktywator/Setting.cs | 28 |
5 files changed, 202 insertions, 130 deletions
diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index e292f2d..5793417 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -64,7 +64,7 @@ namespace Aktywator return sector.ToUpper()[0] - 'A' + 1; } - private string sectorNumberToLetter(int sector) + internal string sectorNumberToLetter(int sector) { char character = (char)('A' - 1 + sector); return character.ToString(); @@ -270,12 +270,18 @@ namespace Aktywator public void loadSettings() { + if (settings == null) + { + return; + } + main.lFirstSectorSettings.Visible = false; + string section = "*".Equals(main.cbSettingsSection.Text) ? null : this.sectorLetterToNumber(main.cbSettingsSection.Text).ToString(); StringBuilder errors = new StringBuilder(); foreach (Setting s in settings) { try { - s.load(); + s.load(section); } catch (OleDbException) { @@ -283,13 +289,18 @@ namespace Aktywator errors.Append(s.name); } } - main.xShowContract.Checked = (Setting.load("ShowContract", this, errors) == "0"); - main.xShowPlayerNames.Checked = (Setting.load("BM2ShowPlayerNames", this, errors) != "0"); - main.xPINcode.Text = Setting.load("BM2PINcode", this, errors); + main.xShowContract.Checked = (Setting.load("ShowContract", this, errors, section) == "0"); + main.xShowPlayerNames.Checked = (Setting.load("BM2ShowPlayerNames", this, errors, section) != "0"); + main.xPINcode.Text = Setting.load("BM2PINcode", this, errors, section); int resultsOverview = 0; - int.TryParse(Setting.load("BM2ResultsOverview", this, errors), out resultsOverview); + int.TryParse(Setting.load("BM2ResultsOverview", this, errors, section), out resultsOverview); main.xResultsOverview.SelectedIndex = resultsOverview; + if (section == null && main.cbSettingsSection.Items.Count > 2) + { + main.lFirstSectorSettings.Visible = true; + } + if (errors.Length > 0) { MessageBox.Show("Nie można uzyskać dostępu do pól: \n" + errors.ToString() + ".\nPrawdopodobnie te pola nie istnieją.", @@ -299,12 +310,13 @@ namespace Aktywator public void saveSettings() { + string section = "*".Equals(main.cbSettingsSection.Text) ? null : this.sectorLetterToNumber(main.cbSettingsSection.Text).ToString(); StringBuilder errors = new StringBuilder(); foreach (Setting s in settings) { try { - s.save(); + s.save(section); } catch (OleDbException) { @@ -312,11 +324,11 @@ namespace Aktywator errors.Append(s.name); } } - Setting.save("ShowContract", main.xShowContract.Checked ? "0" : "1", this, errors); - Setting.save("BM2ShowPlayerNames", main.xShowPlayerNames.Checked ? "1" : "0", this, errors); - Setting.save("BM2NameSource", "2", this, errors); - Setting.save("BM2PINcode", "'" + main.xPINcode.Text + "'", this, errors); - Setting.save("BM2ResultsOverview", main.xResultsOverview.SelectedIndex.ToString(), this, errors); + Setting.save("ShowContract", main.xShowContract.Checked ? "0" : "1", this, errors, section); + Setting.save("BM2ShowPlayerNames", main.xShowPlayerNames.Checked ? "1" : "0", this, errors, section); + 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); this.loadSettings(); } diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 3ecf440..c9624a3 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -38,6 +38,9 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.lFirstSectorSettings = new System.Windows.Forms.Label(); + this.cbSettingsSection = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.statusStrip2 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lRequiredVersion = new System.Windows.Forms.ToolStripStatusLabel(); @@ -82,7 +85,6 @@ this.xShowPairNumbers = new System.Windows.Forms.CheckBox(); this.xMemberNumbersNoBlankEntry = new System.Windows.Forms.CheckBox(); this.xShowPlayerNames = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.namesPanel = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); @@ -217,6 +219,9 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.lFirstSectorSettings); + this.tabPage1.Controls.Add(this.cbSettingsSection); + this.tabPage1.Controls.Add(this.label1); this.tabPage1.Controls.Add(this.statusStrip2); this.tabPage1.Controls.Add(this.toolStrip2); this.tabPage1.Controls.Add(this.groupBox7); @@ -225,7 +230,6 @@ this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox2); - this.tabPage1.Controls.Add(this.label1); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); @@ -234,6 +238,37 @@ this.tabPage1.Text = "Ustawienia"; this.tabPage1.UseVisualStyleBackColor = true; // + // lFirstSectorSettings + // + this.lFirstSectorSettings.AutoSize = true; + this.lFirstSectorSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.lFirstSectorSettings.Location = new System.Drawing.Point(119, 39); + this.lFirstSectorSettings.Name = "lFirstSectorSettings"; + this.lFirstSectorSettings.Size = new System.Drawing.Size(263, 13); + this.lFirstSectorSettings.TabIndex = 49; + this.lFirstSectorSettings.Text = "załadowano ustawienia z pierwszego sektora"; + // + // cbSettingsSection + // + this.cbSettingsSection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbSettingsSection.FormattingEnabled = true; + this.cbSettingsSection.Items.AddRange(new object[] { + "*"}); + this.cbSettingsSection.Location = new System.Drawing.Point(59, 36); + this.cbSettingsSection.Name = "cbSettingsSection"; + this.cbSettingsSection.Size = new System.Drawing.Size(53, 21); + this.cbSettingsSection.TabIndex = 48; + this.cbSettingsSection.SelectedIndexChanged += new System.EventHandler(this.cbSettingsSection_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 39); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 13); + this.label1.TabIndex = 47; + this.label1.Text = "Sektor:"; + // // statusStrip2 // this.statusStrip2.BackColor = System.Drawing.Color.White; @@ -461,7 +496,7 @@ this.groupBox5.Controls.Add(this.xCheckLeadCard); this.groupBox5.Controls.Add(this.xLeadCard); this.groupBox5.Controls.Add(this.xViewHandrecord); - this.groupBox5.Location = new System.Drawing.Point(1, 355); + this.groupBox5.Location = new System.Drawing.Point(4, 355); this.groupBox5.Name = "groupBox5"; this.groupBox5.Size = new System.Drawing.Size(257, 121); this.groupBox5.TabIndex = 42; @@ -592,7 +627,7 @@ this.groupBox3.Controls.Add(this.xIntermediateResults); this.groupBox3.Controls.Add(this.xAutoBoardNumber); this.groupBox3.Controls.Add(this.xCollectBidding); - this.groupBox3.Location = new System.Drawing.Point(1, 209); + this.groupBox3.Location = new System.Drawing.Point(3, 209); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(257, 140); this.groupBox3.TabIndex = 40; @@ -655,9 +690,9 @@ this.groupBox2.Controls.Add(this.xShowPairNumbers); this.groupBox2.Controls.Add(this.xMemberNumbersNoBlankEntry); this.groupBox2.Controls.Add(this.xShowPlayerNames); - this.groupBox2.Location = new System.Drawing.Point(1, 65); + this.groupBox2.Location = new System.Drawing.Point(5, 65); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(257, 138); + this.groupBox2.Size = new System.Drawing.Size(256, 138); this.groupBox2.TabIndex = 39; this.groupBox2.TabStop = false; this.groupBox2.Text = "Rozstawienie"; @@ -705,18 +740,6 @@ this.xShowPlayerNames.Text = "pokazuj nazwiska"; this.xShowPlayerNames.UseVisualStyleBackColor = true; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label1.ForeColor = System.Drawing.SystemColors.WindowText; - this.label1.Location = new System.Drawing.Point(89, 37); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(398, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Te same ustawienia są ustawiane dla wszystkich sektorów, przynajmniej na razie :-" + - ")"; - // // tabPage2 // this.tabPage2.Controls.Add(this.namesPanel); @@ -1335,7 +1358,6 @@ public System.Windows.Forms.CheckBox xShowResults; public System.Windows.Forms.TabPage tabPage2; public System.Windows.Forms.CheckBox xConfirmNP; - public System.Windows.Forms.Label label1; public System.Windows.Forms.CheckBox xShowPlayerNames; public System.Windows.Forms.CheckBox xAutoBoardNumber; public System.Windows.Forms.CheckBox xScoreCorrection; @@ -1414,6 +1436,9 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.NumericUpDown numNamesRefreshInterval; private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label1; + public System.Windows.Forms.Label lFirstSectorSettings; + public System.Windows.Forms.ComboBox cbSettingsSection; } } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 712a104..0187e84 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -67,6 +67,7 @@ namespace Aktywator bws.convert(); labelFilename.Text = filename; + this.fillSectionSelector(bws.getSections()); // 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))); @@ -77,6 +78,14 @@ namespace Aktywator this.WindowState = FormWindowState.Normal; } + private void fillSectionSelector(string sections) + { + cbSettingsSection.SelectedIndex = 0; + foreach (string section in sections.Split(',')) { + cbSettingsSection.Items.Add(bws.sectorNumberToLetter(Int32.Parse(section.Trim()))); + } + } + private void bindSettingChanges() { foreach (Setting s in this.bwsSettings) @@ -538,5 +547,10 @@ namespace Aktywator } } + private void cbSettingsSection_SelectedIndexChanged(object sender, EventArgs e) + { + bws.loadSettings(); + } + } } diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index 30e33ef..766bdc0 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -266,22 +266,22 @@ <data name="bMysqlSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> 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 </value> </data> <data name="bForceSync.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -298,56 +298,57 @@ <data name="bTruncate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAuJSURBVGhD7ZkJUFRXFoY7IGuzNvRCN3RDQzf7jqyCiCJo - FIiiIrKJiKLGKLjEFY0LYmI0LokxyWQqqckYs4wanYxTSdwRIc1OQFk6LM3eIIpaTkz+OQ0vM5mkUigD - 0VTlq7rV9Hv/vX3uveece96D9QdPGwPFhc/eUxS+dfv0J+/fPnvyvb5Tn2zvPnHCl7n9RGhMT3dszcpc - 2jTvufe7M1MuFYcFX7gc4r+BuT3EDyUl3PuKor/1f/oXdO5cg7aNWejakYPeQ3m4/ec3ULP/5bN+traO - jHzMqZozx6hpeVaman329Vt7NqNz0wrUxk/DaVdHLDFlnxFra8eTzHBQ/EOLMvCBoqCt+7WdaMqah+bl - CVDlLET7pix0bl+Nrl1rcO+1l6DKzf3XthnTNw12GiPqIyN5dQlz8zpffFF9950DGHgjD42L5+OMsxzJ - hoYfG7NYM0gmGFITcVOn+qo+P/lDR+7zZPwctK5Og2pdBjpyX0DXng3o3peLnv3b0LNvK/pf2Qwc2oHr - Sxcp/EUiT2aIUaMhecGmlnXr+u+8exgPPnwTHXkbcG1yKHLNzb+2ZmktJIn1kPInHNm6eQc+eBMqWvX2 - telQrc9E+9aVZPyL6KEd6Tm8G+ojeeg9uBO9NJFemsT3+etxe8MKbAgOXM0M83+hzMh4TrXqhfq+g7tx - /0/7MPDOPtxcsQjHpdKBCB2dl0niRk1/UPxz2Gw2782FSVeaNuege9MydG9fhW5a+Z7XdkB9dC96j76C - vtf3oE8zgQPbByfQl0cT2LYC39NOnYiO+JjDYpkwwz0WytRUgXJx+kfdW1bj1s7VuJu/Dt071qBo+hRs - NTMronFnk4w+hscoxtd30+dLlvR1bsnGrf256H9rH/o07ZhmArQDNKFeut67dyPUO7Kh3rgU6ucTgGVz - UB4T+W2YUOjNjPVI1CclpamWpPX1rEpG3/I56F+bhsaMuTjr5oxYXf1jJHEfUj4GhoaGnqtDQ99TZC2C - Om8jbeWruPP2Ptw6vGvIffZuQu+utVBvWY6eVSnoyohFV0IEBuJDoJwX/d0siSSRGepX0ax6Y3LSmfaU - meiaHQJ1/ASoU6ehPDIQR4TCDpmW1vMk+2+QjgSJufm0/IkhF2szU9BP7jRwZDduvboZ6h+Nz0lDV+Ys - dC6IREdsANqnuKE3XIb+6QFYIZOuZIb5BcrMzLi6xJnqzggntI8XoDtcjtapHijwkmOdKadAj8WKJBkl - mtHByJ/HW/J+6IT6pkUJ6KcsdXv7C+hdk46uJbPRmRyFjrggtEd5oi3UHm2+fHS5muBemCN2ujitZ8b4 - D3XJia/XxYSi3skQTWIWul3YaPDg4ZxUhEQjow9I4jGkHH1s4oTCPf8MChzoSI3BLfJ5dWo0GR88ZHyY - A1R+QqjI+GZ7XTRItdEdYIetTvJcTWdyGaf6BXOqyoMdUCRkoUrEQqOtFsrEeviIy30QYsDepfkNjXZM - 4Ywb579GLDqlCPZCx3Q/9ES5oX2CFCpfAVpdjNHkoIc6qS6qJVoot2Hhpo8In02ccFwRP+V2sYs5rlqy - UChgQWHNwgWRPg5aWHTb6ugtpqEthn7hN8JNn73gkI11bb2PBF0+PHQ4GTDG65Dx41Bqo4UiMvIarXap - zAgFEh1c5rFQQN+vWrHwGV8f+Xx+g6m27iwabtT8/XGxmm9ufvC8LR9KqSEa7bTxDa38oPHkIhrjr1C7 - zGfhEhmt+fsifX7KN8RWDqdMT1t7Mo1hMDTUE8RKWy9qN8+y+Jo1G3TW4zoZr1npy9QuMe2i5jsZf5xn - gKXm5l+MY7ECme5PDUaRhkZbCu05Dwt/NJoMvvCTpvl+yd7yoVyfPY/p83SxMzR0bZWLy8NLFKQaYy+K - tAbbBeEzgxM4T65UbKuHc76yb4XGxr9t0A6HKjXpqDImBFdsx+GyWAdX7A1RQMFb7GiMYhkbhXZ6KBBr - 4RJN4hu6dtLH5QLT9cnSnpPDrl+Ueq50khsuWz+Dq1IDXHOxQImnABV+1vjaQ4RaSqU3vbmodDaFglLs - NdqhOkqp2+3tjjLDPBmaFy3iNKTPV5QG2g4aXyg3QbEnH+WBEtRHOOOKtz02czilh0QWypZgGVoDxbjh - xkEZ7YbmMGvxsUG8ldWwddOY0JCcLFamJtRVBIhRIHoG1+TGUJDxlcF2UEZ5oDTEFXuFggaShlBzOSAU - FreEuqIjTIp6DwuU2+mijA66Crn9XZGBwS8fUMYSjfH1yfNVFcFSFIq1UeTARombBSrG20AZ6YaKcE8c - tRH1GLO0ZzJdNHB2C/n/aIvwQNckGeo9LWknqORwMsJ7ztJzjGbsqUtLs1FmJDZXTnREEQWqJkAV5Nvl - XnzUUzFXGeaMt2zF92y0dFJI/vNDir2eZ/mJKsITnVS13vCwRLmDAVp8rZEiEi1hNGOHKjvbsj4tobGK - ymYF+bLCyRQlZHwZrX6tnxWqg+xwVmYLT139tST/1fJgI4/3UVu4B1pDpajx5KLGxQSlnvL7tvr6EkYy - NrRkJBZXRfugxEeAEncuuQ0Hpa4cVJER1T5W+FJmg2hD48MktRzq8evkW1v9vS3cDU0hUlRRTDR58fC2 - o/1Z5vboU5uRcrouNhhlARKU+gpR6sGlZokKatXePFx2FGI5h6MxwHaox7CYvu0gKeqimGgMEqPa1QzN - fhJEcbia4m50KV+YvLshfhLKKWjLxluj1EtAW85DGbVqqkQLnXnI5/FukNRvqMejoU/1/4fO9soeSrkN - PhRDrqb40tWmibk9OrSvzZ7RljQDVWFylPlbo8zbiibAH2yV3nw6qHh419rqO6GWzojqG66OjqdivPxu - d6gd6pyN0UyumcLl/uJJbkQESaW8+wtTeuumuqOCXKeMWXmN8WWaRhP4ykFIfm90gOQjeqWiYbyJSWJD - AD0fe1tCKdNDsYuon81i85jbI6c0JeFk5+wJqA5xGMzxpT9dfdryQlcBXrKwKCepw1CPkbNCKNyvpkfQ - ZppAG2W21QJBPnNrZHwcFBTXszgejbT6NZTzK4NsUUbBq1n5Cmol1M7Sg7i9jr4m348Kf5XZft3rboYW - ep6+LhHdMSIPY249Pp0LZivbkiJRH+2FmkkuVCLYo9xPRG4jGFz9K84iZJmbnyLpqJXFfB22W6lccrfD - fhw9opoggWO2mbn1eFQGBCS0Z85Dy7xJaJwxHrWT3VBFblRO1WWl5gygWHhXLLrD1taOYLqMGnEWFlld - XhK0uvNxxp47soxUGxV+unMZTSBxChpjA3Ej0gPVobLBOKj0FUDhYYMMM7MTJB16Lz/KHJPZfdXmIYfS - XYoAAwPNe9FHp4wyz41ZM3s7l89Fa3IUlM+FoG6qF74JlaPCX4wqXysUu9shxIC9guky6ljp6jqd53If - tDk7YJdAcJK5/GjUuLs7NifHo3tlIlpTn8W3s8NQF+2NmjAKZCqdq/1FuOgsBo81+EZhzFgustrW4yzD - eTvJXTaFB3N5eI7a2/t0LYhDd3YKVOkxaJoTjvrpvqgNd0IVPbjUBNjgCycxzFisMKbLmGBqampe4S0d - aJFKqDjUjWMuD0+AqanvvYy5UOekoS1zFprnT0HDDH/ciHBBDZUS1ZROz8jtHtKpNZ7pMmZkODis73dz - xjJT04PMpeGZaGLicD8tHur16WjPmouWpGgo44JwkzJRXRgFcqAce/j8EpIOW3GOBkdcHUuPcbnVzNdH - o3raxOqB7FR0rkxi4iAUjVFeuBnhhKuUHUL0Df/3X5tjiLmOjluMsbHmVH70jDfZzCy2PTYCvTkpg6/Q - VfMnozkuECXBrsgTWFaSRDak/M14/NePSzmc/MYpQehYGEPnQSQqInzwBp/fZ6GtHctInn7i9A23Hre2 - 7jxFOXmLJfe6uZbWXLpMJcrvCF0Wy4XysKZk0LjNmJy8f/D7h8X6N6CbzA7/ZSu8AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAuKSURBVGhD7ZkJUFRXFoY7IGuzNvRCN3RDNzT7jqyCiCJo + FIiiIrKJiKLGKLjEFY0LYmI0LokxyWQqqckYYzJqdGacSuKOCGl2AsrSYWn2BlHUcuLkn9PwMpNJKoUy + EE1VvqpbTb/339vn3nvOuec9WL/zrDFQXPj8fUXhO3fOfPrhnXOnPug7/en27hMnfJnbT4XG9HTH1qzM + pU3zXviwOzPlcnFY8MUrIf4bmNtDfF9Swn2gKPpL/2d/QufONWjbmIWuHTnoPZSHO398CzX7Xz3nZ2vr + yMjHnKo5c4yalmdlqtZn37i9ZzM6N61Abfw0nHF1xBJT9lmxtnY8yQwHxd+3KAMfKgraut/YiaaseWhe + ngBVzkK0b8pC5/bV6Nq1BvffeAWq3Nx/bpsxfdNgpzGiPjKSV5cwN6/z5ZfV9947gIG38tC4eD7OOsuR + bGh40pjFmkEywZCaiJs61bfp85Pfd+S+SMbPQevqNKjWZaAj9yV07dmA7n256Nm/DT37tqL/tc3AoR24 + sXSRwl8k8mSGGDUakhdsalm3rv/u+4fx8OO30ZG3AdcnhyLX3Pxra5bWQpJYDyl/xJGtm3fgo7eholVv + X5sO1fpMtG9dSca/jB7akZ7Du6E+kofegzvRSxPppUn8K3897mxYgQ3BgauZYf4vlBkZL6hWvVTfd3A3 + HvxhHwbe24dbKxbhuFQ6EKGj8ypJ3KjpD4p/CpvN5r29MOlq0+YcdG9ahu7tq9BNK9/zxg6oj+5F79HX + 0PfmHvRpJnBg++AE+vJoAttW4F+0UyeiI05yWCwTZrgnQpmaKlAuTv+ke8tq3N65Gvfy16F7xxoUTZ+C + rWZmRTTubJLRx/AYxfj6bvrbkiV9nVuycXt/Lvrf2Yc+TTummQDtAE2ol6737t0I9Y5sqDcuhfrFBGDZ + HJTHRH4bJhR6M2M9FvVJSWmqJWl9PauS0bd8DvrXpqExYy7OuTkjVlf/GEnch5RPgKGhoefq0NAPFFmL + oM7bSFv5Ou6+uw+3D+8acp+9m9C7ay3UW5ajZ1UKujJi0ZUQgYH4ECjnRX83SyJJZIb6RTSr3picdLY9 + ZSa6ZodAHT8B6tRpKI8MxBGhsMNBS+tFkv03SEeCxNx8Wv7EkEu1mSnoJ3caOLIbt1/fDPUPxuekoStz + FjoXRKIjNgDtU9zQG+6A/ukBWOEgXckM8zOUmZlxdYkz1Z0RTmgfL0B3uBytUz1Q4CXHOlNOgR6LFUky + SjSjg5E/j7fkw9AJ9U2LEtBPWerO9pfQuyYdXUtmozM5Ch1xQWiP8kRbqAxtvnx0uZrgfpgjdro4rWfG + +A91yYlv1sWEot7JEE1iFrpd2Gjw4OG8VIREI6OPSOIxpBx9bOKEwj3/CAoc6EiNwW3yeXVqNBkfPGR8 + mD1UfkKoyPhmmS4apNroDrDDVid5rqYzuYxT/YI5VeXB9igSslAlYqHRVgtlYj18wuU+DDFg79L8hkY7 + pnDGjfNfIxadVgR7oWO6H3qi3NA+QQqVrwCtLsZostdDnVQX1RItlNuwcMtHhM8nTjiuiJ9yp9jFHNcs + WSgUsKCwZuGiSB8HLSy6bXX0FtPQFkO/8Cvhps9ecMjGurbeR4IuHx46nAwY43XI+HEotdFCERl5nVa7 + 1MEIBRIdXOGxUEDfr1mx8DlfH/l8foOptu4sGm7U/P1JsZpvbn7wgi0fSqkhGu208Q2t/KDx5CIa469S + u8Jn4TIZrfn7En1+xjfEVg6nTE9bezKNYTA01FPESlsvajfPsvi6NRt01uMGGa9Z6SvULjPtkuY7GX+c + Z4Cl5uZfjGOxApnuzwxGkYZGWwplnEeFPxhNBl/8UdN8vyyzfCTXZ89j+jxb7AwNXVvl4vLoMgWpxthL + Iq3BdlH43OAELpArFdvq4byvw7dCY+NfN2iHQ5WadFQZE4KrtuNwRayDqzJDFFDwFjsao9iBjUI7PRSI + tXCZJvENXTvl43KR6fp0ac/JYdcvSj1fOskNV6yfwzWpAa67WKDEU4AKP2t87SFCLaXSW95cVDqbQkEp + 9jrtUB2l1O0yu6PMME+H5kWLOA3p8xWlgbaDxhfKTVDsyUd5oAT1Ec646i3DZg6n9JDIQtkS7IDWQDFu + unFQRruhOcxafGwQb2U1bN00JjQkJ4uVqQl1FQFiFIiew3W5MRRkfGWwHZRRHigNccVeoaCBpCHUXA4I + hcUtoa7oCJOi3sMC5Xa6KKODrkIuuycyMPj5A8pYojG+Pnm+qiJYikKxNors2Shxs0DFeBsoI91QEe6J + ozaiHmOW9kymiwbObiH/720RHuia5IB6T0vaCSo5nIzwgbP0PKMZe+rS0myUGYnNlRMdUUSBqglQBfl2 + uRcf9VTMVYY54x1b8X0bLZ0Ukv/0kGKv51l+qorwRCdVrTc9LFFub4AWX2ukiERLGM3YocrOtqxPS2is + orJZQb6scDJFCRlfRqtf62eF6iA7nHOwhaeu/lqS/2J5sJHH+6Qt3AOtoVLUeHJR42KCUk/5A1t9fQkj + GRtaMhKLq6J9UOIjQIk7l9yGg1JXDqrIiGofK3zpYINoQ+PDJLUc6vHL5Ftb/bUt3A1NIVJUUUw0efHw + rqPsHHN79KnNSDlTFxuMsgAJSn2FKPXgUrNEBbVqbx6uOAqxnMPRGGA71GNYTN+1lxR1UUw0BolR7WqG + Zj8JojhcTXE3upQvTN7dED8J5RS0ZeOtUeoloC3noYxaNVWihc485PN4N0nqN9Tj8dCn+v9jZ5myh1Ju + gw/FkKspvnS1aWJujw7ta7NntCXNQFWYHGX+1ijztqIJ8AdbpTefDioe3re2+k6opTOi+oaro+OpGC+/ + 1x1qhzpnYzSTa6ZwuT97khsRQVIp78HClN66qe6oINcpY1ZeY3yZptEEvrIXkt8bHSD5iF6paBhvYpLY + EEDPx96WUDroodhF1M9msXnM7ZFTmpJwqnP2BFSH2A/m+NIfrz5teaGrAK9YWJST1H6ox8hZIRTuV9Mj + aDNNoI0y22qBIJ+5NTJOBgXF9SyORyOtfg3l/MogW5RR8GpWvoJaCbVz9CAu09HX5PtR4c8Otl/3upuh + hZ6nb0hEd43Iw5hbT07ngtnKtqRI1Ed7oWaSC5UIMpT7ichtBIOrf9VZhCxz89MkHbWymK/DdiuVS+51 + yMbRI6oJEjhmm5lbT0ZlQEBCe+Y8tMybhMYZ41E72Q1V5EblVF1Was4AioX3xaK7bG3tCKbLqBFnYZHV + 5SVBqzsfZ2XckWWk2qjwM53LaAKJU9AYG4ibkR6oDnUYjINKXwEUHjbIMDM7QdKh9/KjzDEHu6/aPORQ + uksRYGCgeS/6+JRR5rk5a2Zv5/K5aE2OgvKFENRN9cI3oXJU+ItR5WuFYnc7hBiwVzBdRh0rXV2nC1zu + wzZne+wSCE4xlx+PGnd3x+bkeHSvTERr6vP4dnYY6qK9URNGgUylc7W/CJecxeCxBt8ojBnLRVbbepwd + cMFOco9N4cFcHp6jMplP14I4dGenQJUeg6Y54aif7ovacCdU0YNLTYANvnASw4zFCmO6jAmmpqbmFd7S + gRaphIpD3Tjm8vAEmJr63s+YC3VOGtoyZ6F5/hQ0zPDHzQgX1FApUU3p9Kzc7hGdWuOZLmNGhr39+n43 + ZywzNT3IXBqeiSYm9g/S4qFen472rLloSYqGMi4ItygT1YVRIAfKsYfPLyHpsBXnaHDE1bH0GJdbzXx9 + PKqnTaweyE5F58okJg5C0RjlhVsRTrhG2SFE3/B//7U5hpjr6LjFGBtrTuXHz3iTzcxi22Mj0JuTMvgK + XTV/MprjAlES7Io8gWUlSRyGlL8aT/76cSmHk984JQgdC2PoPIhERYQP3uLz+yy0tWMZybNPnL7h1uPW + 1p2nKSdvseTeMNfSmkuXqUT5DaHLYrlQHtaUDBq3GZOT93d++7BY/wYb0MwCKnkXKwAAAABJRU5ErkJg + gg== </value> </data> <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> @@ -373,35 +374,35 @@ <data name="bClearHands.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> 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 </value> </data> <data name="label11.Text" xml:space="preserve"> diff --git a/Aktywator/Setting.cs b/Aktywator/Setting.cs index e981328..a5540d6 100644 --- a/Aktywator/Setting.cs +++ b/Aktywator/Setting.cs @@ -26,23 +26,33 @@ namespace Aktywator this.fwV = firmwareVersion; } - public void load() + public void load(string section = null) { StringBuilder str = new StringBuilder(); str.Append("SELECT "); str.Append(this.name); str.Append(" FROM Settings"); + if (section != null) + { + str.Append(" WHERE `Section` = "); + str.Append(section); + } field.Checked = false; string a = bws.sql.selectOne(str.ToString()); field.Checked = a.ToUpper() == "TRUE" ? true : false; } - public static string load(string name, Bws bws, StringBuilder errors) + public static string load(string name, Bws bws, StringBuilder errors, string section = null) { StringBuilder str = new StringBuilder(); str.Append("SELECT "); str.Append(name); str.Append(" FROM Settings"); + if (section != null) + { + str.Append(" WHERE `Section` = "); + str.Append(section); + } try { return bws.sql.selectOne(str.ToString()); @@ -55,23 +65,33 @@ namespace Aktywator } } - public void save() + public void save(string section = null) { StringBuilder str = new StringBuilder(); str.Append("UPDATE Settings SET "); str.Append(this.name); if (field.Checked) str.Append("=true"); else str.Append("=false"); + if (section != null) + { + str.Append(" WHERE `Section` = "); + str.Append(section); + } bws.sql.query(str.ToString()); } - public static void save(string name, string value, Bws bws, StringBuilder errors) + public static void save(string name, string value, Bws bws, StringBuilder errors, string section = null) { StringBuilder str = new StringBuilder(); str.Append("UPDATE Settings SET "); str.Append(name); str.Append("="); str.Append(value); + if (section != null) + { + str.Append(" WHERE `Section` = "); + str.Append(section); + } try { bws.sql.query(str.ToString()); |