diff --git a/Reseter2/CheckControl.cs b/Reseter2/CheckControl.cs
index e232bed..86573ee 100644
--- a/Reseter2/CheckControl.cs
+++ b/Reseter2/CheckControl.cs
@@ -11,19 +11,26 @@ using System.Windows.Forms;
namespace Reseter2
{
+
[DefaultEvent(nameof(CheckControl))]
- public partial class CheckControl : UserControl
+
+ partial class CheckControl : UserControl
{
+
public bool Checked = false;
// public ImageList imageList;
public delegate void UpdateCheck(bool check);
public event UpdateCheck updateCheck;
- public CheckControl()
+ public CheckControl():base()
{
// imageList = imagelist;
- InitializeComponent();
- pictureBox1.Image = imageList2.Images[0];
+ if (!this.DesignMode)
+ {
+ InitializeComponent();
+ pictureBox1.Image = imageList2.Images[0];
+ }
+
}
public void pictureBox1_Click(object sender, EventArgs e)
diff --git a/Reseter2/Form1.Designer.cs b/Reseter2/Form1.Designer.cs
index 29c8c90..d600eeb 100644
--- a/Reseter2/Form1.Designer.cs
+++ b/Reseter2/Form1.Designer.cs
@@ -79,8 +79,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 13);
this.label1.TabIndex = 1;
- this.label1.Text = "Имя ПК";
- this.label1.Click += new System.EventHandler(this.label1_Click);
+ this.label1.Text = "Имя ПК";
//
// bt_reset
//
diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs
index fb13f26..93504e7 100644
--- a/Reseter2/Form1.cs
+++ b/Reseter2/Form1.cs
@@ -71,10 +71,7 @@ namespace Reseter2
- private void label1_Click(object sender, EventArgs e)
- {
-
- }
+
private void bt_reset_Click(object sender, EventArgs e)
{
diff --git a/Reseter2/Form1.resx b/Reseter2/Form1.resx
index 135d2b4..4328061 100644
--- a/Reseter2/Form1.resx
+++ b/Reseter2/Form1.resx
@@ -120,6 +120,9 @@
122, 17
+
+ 209, 17
+
425, 17
@@ -128,7 +131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
- UQAAAk1TRnQBSQFMAgEBCQEAAWABAQFgAQEBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
+ UQAAAk1TRnQBSQFMAgEBCQEAAWgBAQFoAQEBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
AwABSAMAAQEBAAEQBgABNhIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/kAAB/wF/
Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
@@ -486,59 +489,54 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADQ
- CgAAAk1TRnQBSQFMAgEBAwEAAbgBAAG4AQABEgEAARIBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
- AwABSAMAARIDAAEBAQABCAUAARABBRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
- AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
- AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
- AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
- AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
- AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
- AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
- ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
- AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
- AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
- AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
- AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
- AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
- Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
- AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
- AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
- ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
- ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
- AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
- AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
- AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
- AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
- AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
- AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
- AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
- ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
- AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
- AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP/AgAB8wEHDO8BvAH0
- Af8BAAHzAQcM7wG8AfQB/wEAAfMBBwzvAbwB9AH/EwACvAvxAfABvAEHAfQBAAK8C/EB8AG8AQcB9AEA
- ArwL8QHwAbwBBwH0EgABBwG8AfQM/wHzAbwB8AEHAbwB9Az/AfMBvAHwAQcBvAH0DP8B8wG8AfASAAHs
- AfAO/wHxAe8B7AHwA/8BwgKYAfQH/wHxAe8B7AHwDv8B8QHvEgABbQHxDv8B8QHvAW0B8QL/AcIBlwEz
- AVUBngf/AfEB7wFtAfEE/wHCA5gBngHCBP8B8QHvEgABbQHxDv8B8QHvAW0B8QH/AcIBVQMzAVUBCAH0
- Bf8B8QHvAW0B8QP/AfEBmASXAZ4BwgP/AfEB7xIAAW0B8Q7/AfEB7wFtAfABwgGXAjMCVQIzAQgF/wHx
- Ae8BbQHxAv8B8wGYAZcBCALCAQgBlwGeAcIC/wHxAe8SAAFtAfEO/wHxAe8BbQG8AZcCVQGYAfQBwgFV
- ATMBVQEIAfQD/wHxAe8BbQHxAv8BCAOYAlUBmAEIAZcBngL/AfEB7xIAAW0B8Q7/AfEB7wFtAfEB8AGY
- AQgD/wHxAzMBCAP/AfEB7wFtAfEC/wGYAZcBCAGXAjMBVQHCAZcBmAL/AfEB7xIAAW0B8Q7/AfEB7wFt
- AfEB/wHCAfQD/wH0AfEBVQEzAVUBngH0Af8B8QHvAW0B8QL/AZgBlwEIAZgBVQEzAVUBCAGXAZgC/wHx
- Ae8SAAFtAfEO/wHxAe8BbQHxCP8BwgFVATMBVQGYAf8B8QHvAW0B8QL/AQgBlwGYAfIBmAGXApgBlwEI
- Av8B8QHvEgABbQHxDv8B8QHvAW0B8Qn/AQgBVQEzAVUBngHxAe8BbQHxAv8B9AGYAZcBmAEIApgBlwGY
- AfMC/wHxAe8SAAFtAfEO/wHxAe8BbQHxCv8BwgFVATMBlwHxAe8BbQHxA/8BwgGYA5cCmAHCA/8B8QHv
- EgABbQHxDv8B8QHvAW0B8Qv/AQgBVQGXAfEB7wFtAfEE/wH0AQgCmAEIBf8B8QHvEgAB6wG8Dv8B8AHv
- AesBvAz/AcIBmAG8Ae8B6wG8Dv8BvAHvEgAB7wEHAfIL/wH0AfICBwHvAQcB8gv/AfQB8gEHAfAB7wEH
- AfIL/wH0AfIBBwHwEgAB9AG8AQcBvArxAfACBwHzAfQBvAEHAbwK8QHwAgcB8wH0AbwBBwG8CvEB8AIH
- AfMTAAH0Ae8C7AhtAewB7QEHAwAB9AHvAuwIbQHsAe0BBwMAAfQB7wLsCG0B7AHtAQcUAAFCAU0BPgcA
- AT4DAAEoAwABSAMAARIDAAEBAQABAQUAAdgXAAP/AQABgAEAASABAAEIBwABgAEAASABAAEIuwABgAEA
- AeABAAE4AQABDAUACw==
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe
+ CgAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+ 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/wIAAfIBBwrvAQcB8gH/
+ AQAB8gEHCu8BBwHyAf8BAAHyAQcK7wEHAfIB/xAAAfQBvAHxCvIB8QEHAfIB9AG8AfEK8gHxAQcB8gH0
+ AbwB8QryAfEBBwHyEAAB7wHwC/8B9AHxAbwB7wHwAv8B9QHzAfIB9QX/AfQB8QG8Ae8B8Av/AfQB8QG8
+ EAAB6wHxDP8B8gHvAesB8QH/AfUBCAKXAQgG/wHyAe8B6wHxA/8B9AHxAggBwgH0A/8B8gHvEAABbQHy
+ DP8B8gHvAW0B8gH1AQgBVQIzAZcB8gH0BP8B8gHvAW0B8gL/AfQBCAGYApcBmAHCAfQC/wHyAe8QAAFt
+ AfIM/wHyAe8BbQHxAcIBlwEzAlUBMwFVAfAE/wHyAe8BbQHyAv8BCAKYAggCmAHCAfQB/wHyAe8QAAFt
+ AfIM/wHyAe8BbQHuAZcBVQGXAQgBwgFVATMBlwHwAfQC/wHyAe8BbQHyAf8B9AOYAZcBVQOYAcIB/wHy
+ Ae8QAAFtAfIM/wHyAe8BbQHxAbwBmAHzAv8B8gIzAVUB8gL/AfIB7wFtAfIB/wHyApgBlwIzAVUBCAGX
+ AQgB/wHyAe8QAAFtAfIM/wHyAe8BbQHyAfUBwgP/AfQB8gFVATMBlwEIAfUB8gHvAW0B8gH/AfIDmAFV
+ ATMBVQGYAZcBCAH/AfIB7xAAAW0B8gz/AfIB7wFtAfIH/wHCAVUBMwGXAQgB8QHvAW0B8gH/AfQCmAEI
+ AZgBlwOYAfMB/wHyAe8QAAFtAfIM/wHyAe8BbQHyCP8BCAJVAZcBCAHvAW0B8gL/AfEGmAEIAv8B8gHv
+ EAABbQHyDP8B8gHvAW0B8gn/AQgCVQEIAe8BbQHyAv8B9QHxA5gBCAHxAfQC/wHyAe8QAAHrAfEM/wHy
+ Ae8B6wHxCf8B9QEIAZgBCAHvAesB8QT/AfQC8gH0BP8B8QHvEAAB9wG8AfMK/wHzAbwBBwH3AbwB8wn/
+ AfUB8QHuAbwB9wG8AfMK/wHzArwQAAHzArwB8QjyAfEBvAEHAfIB8wK8AfEI8gHxAbwBBwHyAfMCvAHx
+ CPIB8QG8AQcB8hEAAfMB9wHsAesGbQHrAewB7wH0AgAB8wH3AewB6wZtAesB7AHvAfQCAAHzAfcB7AHr
+ Bm0B6wHsAe8B9BEAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAGAAQABgAEA
+ AYBzAAGAAQEBgAEBAYABAQIACw==
-
- 209, 17
-
diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj
index 5ba202b..5b177d2 100644
--- a/Reseter2/Reseter2.csproj
+++ b/Reseter2/Reseter2.csproj
@@ -12,6 +12,21 @@
512
true
true
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
AnyCPU
@@ -22,6 +37,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -184,5 +200,17 @@
+
+
+ False
+ Microsoft .NET Framework 4.7.2 %28x86 и x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
\ No newline at end of file
diff --git a/Reseter2/Setting/SGlobalSetting.cs b/Reseter2/Setting/SGlobalSetting.cs
index ac71477..3105bad 100644
--- a/Reseter2/Setting/SGlobalSetting.cs
+++ b/Reseter2/Setting/SGlobalSetting.cs
@@ -3,6 +3,7 @@ using Reseter2.Words;
using System;
using System.Collections.Generic;
using System.IO;
+using System.IO.Compression;
using System.Linq;
using System.Runtime.Serialization.Formatters.Binary;
using System.Security.Policy;
@@ -69,18 +70,27 @@ namespace Reseter2.Setting
private static object Load(string path)
{
object obj = null;
+ GZipStream compressStream = null;
BinaryFormatter binaryFormatter = new BinaryFormatter();
FileStream file = null;
try
{
file = new FileStream(path, FileMode.Open);
- obj = binaryFormatter.Deserialize(file);
+ compressStream = new GZipStream(file, CompressionMode.Decompress);
+ obj = binaryFormatter.Deserialize(compressStream);
+ compressStream.Close();
+ compressStream.Dispose();
file.Close();
file.Dispose();
return obj;
}
catch
{
+ if (compressStream != null)
+ {
+ compressStream.Close();
+ compressStream.Dispose();
+ }
if (file != null)
{
file.Close();
@@ -119,6 +129,7 @@ namespace Reseter2.Setting
public static bool SaveClose(WordsCategory output, DialogResult ok = DialogResult.No)
{
+ GZipStream compressStream = null;
BinaryFormatter binaryFormatter = new BinaryFormatter();
MemoryStream Memory = new MemoryStream();
binaryFormatter.Serialize(Memory, output);
@@ -141,11 +152,14 @@ namespace Reseter2.Setting
try
{
- file = new FileStream(settingWords.PathBase, FileMode.OpenOrCreate);
+ file = new FileStream(settingWords.PathBase, FileMode.Create);
+ compressStream = new GZipStream(file, CompressionMode.Compress);
Memory.Position = 0;
- Memory.CopyTo(file);
+ Memory.CopyTo(compressStream);
Memory.Close();
Memory.Dispose();
+ compressStream.Close();
+ compressStream.Dispose();
file.Close();
file.Dispose();
}
@@ -153,8 +167,11 @@ namespace Reseter2.Setting
{
Memory.Close();
Memory.Dispose();
+ compressStream.Close();
+ compressStream.Dispose();
file.Close();
file.Dispose();
+
return SaveCheck(settingWords.PathBase, output);
}
@@ -176,23 +193,33 @@ namespace Reseter2.Setting
}
public static bool Save(string path, object output)
{
+ GZipStream compressStream = null;
BinaryFormatter binaryFormatter = new BinaryFormatter();
FileStream file = null;
try
{
- file = new FileStream(path, FileMode.OpenOrCreate);
- binaryFormatter.Serialize(file, output);
+ file = new FileStream(path, FileMode.Create);
+ compressStream = new GZipStream(file, CompressionMode.Compress);
+ binaryFormatter.Serialize(compressStream, output);
+ compressStream.Close();
+ compressStream.Dispose();
file.Close();
file.Dispose();
return true;
}
catch
{
- if(file != null)
+ if (compressStream != null)
{
- file.Close();
- file.Dispose();
+ compressStream.Close();
+ compressStream.Dispose();
}
+ if (file != null)
+ {
+ file.Close();
+ file.Dispose();
+ }
+
return SaveCheck(path, output);
}
diff --git a/Reseter2/TaskControl.cs b/Reseter2/TaskControl.cs
index 0afa960..e7f3d97 100644
--- a/Reseter2/TaskControl.cs
+++ b/Reseter2/TaskControl.cs
@@ -18,7 +18,11 @@ namespace Reseter2
public TaskControl()
{
reseterTask = null;
- InitializeComponent();
+ if (!this.DesignMode)
+ {
+ InitializeComponent();
+ }
+
}
public void Intit(ReseterTask res)
diff --git a/Reseter2/Words/BilderWords.Designer.cs b/Reseter2/Words/BilderWords.Designer.cs
index 4ac066d..20afe0d 100644
--- a/Reseter2/Words/BilderWords.Designer.cs
+++ b/Reseter2/Words/BilderWords.Designer.cs
@@ -35,11 +35,11 @@
this.bt_close = new System.Windows.Forms.Button();
this.bt_saveClose = new System.Windows.Forms.Button();
this.bt_save = new System.Windows.Forms.Button();
- this.cb_create = new System.Windows.Forms.ComboBox();
- this.bt_new = new System.Windows.Forms.Button();
this.bt_deleteItem = new System.Windows.Forms.Button();
this.treeView1 = new System.Windows.Forms.TreeView();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+ this.listBox = new System.Windows.Forms.ListBox();
+ this.label1 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
@@ -98,25 +98,6 @@
this.bt_save.UseVisualStyleBackColor = true;
this.bt_save.Click += new System.EventHandler(this.bt_save_Click);
//
- // cb_create
- //
- this.cb_create.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_create.FormattingEnabled = true;
- this.cb_create.Location = new System.Drawing.Point(12, 13);
- this.cb_create.Name = "cb_create";
- this.cb_create.Size = new System.Drawing.Size(175, 21);
- this.cb_create.TabIndex = 7;
- //
- // bt_new
- //
- this.bt_new.Location = new System.Drawing.Point(193, 12);
- this.bt_new.Name = "bt_new";
- this.bt_new.Size = new System.Drawing.Size(23, 23);
- this.bt_new.TabIndex = 8;
- this.bt_new.Text = "+";
- this.bt_new.UseVisualStyleBackColor = true;
- this.bt_new.Click += new System.EventHandler(this.bt_new_Click);
- //
// bt_deleteItem
//
this.bt_deleteItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -138,11 +119,11 @@
this.treeView1.ImageIndex = 0;
this.treeView1.ImageList = this.imageList1;
this.treeView1.ItemHeight = 16;
- this.treeView1.Location = new System.Drawing.Point(9, 41);
+ this.treeView1.Location = new System.Drawing.Point(9, 68);
this.treeView1.Name = "treeView1";
this.treeView1.SelectedImageIndex = 1;
this.treeView1.ShowLines = false;
- this.treeView1.Size = new System.Drawing.Size(207, 471);
+ this.treeView1.Size = new System.Drawing.Size(207, 444);
this.treeView1.TabIndex = 4;
this.treeView1.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView1_BeforeSelect);
this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
@@ -162,15 +143,36 @@
this.imageList1.Images.SetKeyName(7, "18favicon.ico");
this.imageList1.Images.SetKeyName(8, "40favicon.ico");
//
+ // listBox
+ //
+ this.listBox.FormattingEnabled = true;
+ this.listBox.Items.AddRange(new object[] {
+ "Компьютер",
+ "Категорию"});
+ this.listBox.Location = new System.Drawing.Point(9, 32);
+ this.listBox.Name = "listBox";
+ this.listBox.Size = new System.Drawing.Size(207, 30);
+ this.listBox.TabIndex = 10;
+ this.listBox.DoubleClick += new System.EventHandler(this.bt_new_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(9, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(103, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Добавить элемент";
+ //
// BilderWords
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(504, 556);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.listBox);
this.Controls.Add(this.treeView1);
this.Controls.Add(this.bt_deleteItem);
- this.Controls.Add(this.bt_new);
- this.Controls.Add(this.cb_create);
this.Controls.Add(this.bt_save);
this.Controls.Add(this.bt_saveClose);
this.Controls.Add(this.bt_close);
@@ -183,6 +185,7 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BilderWords_FormClosing);
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -192,10 +195,10 @@
private System.Windows.Forms.Button bt_close;
private System.Windows.Forms.Button bt_saveClose;
private System.Windows.Forms.Button bt_save;
- private System.Windows.Forms.ComboBox cb_create;
- private System.Windows.Forms.Button bt_new;
private System.Windows.Forms.Button bt_deleteItem;
private System.Windows.Forms.TreeView treeView1;
public System.Windows.Forms.ImageList imageList1;
+ private System.Windows.Forms.ListBox listBox;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/Reseter2/Words/BilderWords.cs b/Reseter2/Words/BilderWords.cs
index c339356..9fb9df0 100644
--- a/Reseter2/Words/BilderWords.cs
+++ b/Reseter2/Words/BilderWords.cs
@@ -24,8 +24,8 @@ namespace Reseter2.Words
private Control control;
private bool DragOn;
WordsCategory ChangeCategory;
- private byte[] hash;
- MD5 Hash = MD5.Create();
+ //private byte[] hash;
+ //MD5 Hash = MD5.Create();
public BilderWords()
{
LoadForm();
@@ -47,9 +47,8 @@ namespace Reseter2.Words
{
ChangeCategory = SGlobalSetting.Clone(WordsList.MainCategory);
InitializeComponent();
- cb_create.Items.Add("Категория");
- cb_create.Items.Add("Компьютер");
- cb_create.SelectedIndex = 1;
+
+ //cb_create.SelectedIndex = 1;
treeView1.ItemDrag += new ItemDragEventHandler(TreeView1_ItemDrag);
treeView1.DragEnter += new DragEventHandler(TreeView1_DragEnter);
treeView1.DragOver += new DragEventHandler(TreeView1_DragOver);
@@ -262,9 +261,9 @@ namespace Reseter2.Words
object item = null;
TreeNode treeNode = new TreeNode();
- switch (cb_create.SelectedIndex)
+ switch (listBox.SelectedIndex)
{
- case 0:
+ case 1:
item = new WordsCategory("Новая категория");
index = 0;
WordsList.InsertItem(index, (WordsCategory)item, ParentCategory);
@@ -272,7 +271,7 @@ namespace Reseter2.Words
treeNode.SelectedImageIndex = 0;
treeNode.Text = "Новая категория";
break;
- case 1:
+ case 0:
item = new WordsComp(new CompId("Новый ПК"));
index = ParentCategory.Count();
WordsList.InsertItem(index, (WordsComp)item, ParentCategory);
@@ -280,7 +279,8 @@ namespace Reseter2.Words
treeNode.SelectedImageIndex = 1;
treeNode.Text = "Новый ПК";
break;
- }
+ }
+ listBox.SelectedIndex = -1;
treeNode.Tag = item;
ParentNodes.Insert(index,treeNode);
@@ -303,6 +303,7 @@ namespace Reseter2.Words
else
{
WordsList.MainCategory = ChangeCategory;
+ this.DialogResult = DialogResult.OK;
}
}
diff --git a/Reseter2/Words/BilderWords.resx b/Reseter2/Words/BilderWords.resx
index bd52562..54aacf7 100644
--- a/Reseter2/Words/BilderWords.resx
+++ b/Reseter2/Words/BilderWords.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACQ
- JAAAAk1TRnQBSQFMAgEBCQEAAVgBAAFYAQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ JAAAAk1TRnQBSQFMAgEBCQEAAXgBAAF4AQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABMAMAAQEBAAEQBgABGBIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
AX8B/wF/Af8BfwH/AX8B/wF/Af8Bf2AAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8Bf2AAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/