diff --git a/DiskImager/Disk.cs b/DiskImager/Disk.cs
index 6c1d9b4..12ca4a5 100644
--- a/DiskImager/Disk.cs
+++ b/DiskImager/Disk.cs
@@ -291,24 +291,21 @@ namespace DynamicDevices.DiskWriter
{
((ZipOutputStream)fs).CloseEntry();
((ZipOutputStream)fs).Close();
- }
- if (fs is TarOutputStream)
+ } else if (fs is TarOutputStream)
{
((TarOutputStream)fs).CloseEntry();
fs.Close();
- }
- if (fs is GZipOutputStream)
+ } else if (fs is GZipOutputStream)
{
fs.Close();
- }
- if (fs is XZOutputStream)
+ } else if (fs is XZOutputStream)
{
fs.Close();
}
}
errored = false;
- if (removeAfter)
+ if (removeAfter && !IsCancelling)
_diskAccess.UnmountDrive();
readfail1:
@@ -542,17 +539,14 @@ namespace DynamicDevices.DiskWriter
{
((ZipOutputStream)fs).CloseEntry();
((ZipOutputStream)fs).Close();
- }
- if (fs is TarOutputStream)
+ } else if (fs is TarOutputStream)
{
((TarOutputStream) fs).CloseEntry();
fs.Close();
- }
- if (fs is GZipOutputStream)
+ } else if (fs is GZipOutputStream)
{
fs.Close();
- }
- if (fs is XZOutputStream)
+ } else if (fs is XZOutputStream)
{
fs.Close();
}
diff --git a/DiskImager/MainForm.cs b/DiskImager/MainForm.cs
index 3e07310..4b594ef 100644
--- a/DiskImager/MainForm.cs
+++ b/DiskImager/MainForm.cs
@@ -120,7 +120,8 @@ namespace DynamicDevices.DiskWriter
var drive = (string)checkedListBoxDrives.CheckedItems[0];
ClearLayoutPanels();
- GetPathIfEmpty();
+ if (GetPathIfEmpty() == false)
+ return;
DisableButtons(true);
@@ -135,6 +136,9 @@ namespace DynamicDevices.DiskWriter
Thread.CurrentThread.CurrentUICulture = CurrentLocale;
SendProgressToUI(disk);
+ DiskAccesses.Add(diskAccess);
+ _disks.Add(disk);
+
var res = false;
try
{
@@ -177,7 +181,8 @@ namespace DynamicDevices.DiskWriter
}
ClearLayoutPanels();
- GetPathIfEmpty();
+ if (GetPathIfEmpty() == false)
+ return;
DisableButtons(true);
@@ -317,15 +322,24 @@ namespace DynamicDevices.DiskWriter
///
/// Select the file for read / write and setup defaults for whether we're using compression based on extension
///
- private void ChooseFile()
+ private bool ChooseFile()
{
var dr = saveFileDialog1.ShowDialog();
if (dr != DialogResult.OK)
- return;
+ return false;
textBoxFileName.Text = saveFileDialog1.FileName;
- TextBoxFileNameTextChanged(this, null);
+ TextBoxFileNameTextChanged(this, null);
+ return true;
+ }
+
+ ///
+ /// Before writing / reading we should check that FileName is not empty
+ ///
+ private bool GetPathIfEmpty()
+ {
+ return !string.IsNullOrEmpty(textBoxFileName.Text) || ChooseFile();
}
///
@@ -346,15 +360,6 @@ namespace DynamicDevices.DiskWriter
});
}
- ///
- /// Before writing / reading we should check that FileName is not empty
- ///
- private void GetPathIfEmpty()
- {
- if (string.IsNullOrEmpty(textBoxFileName.Text))
- ChooseFile();
- }
-
///
/// Flushes all existing controls from layout panels
///
diff --git a/DiskImager/MainForm.resx b/DiskImager/MainForm.resx
index 2a04173..7594601 100644
--- a/DiskImager/MainForm.resx
+++ b/DiskImager/MainForm.resx
@@ -117,197 +117,46 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- groupBoxTruncation
-
-
- 429, 180
-
-
- Write
-
-
- 56, 17
-
-
- 12
-
-
-
-
-
- textBoxFileName
+
+ 25, 20
-
- 10
+
+ 5
-
- 8
-
-
- Compression
-
-
- 94, 13
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ZIP
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
-
- If enabled, during 'Read' utility will lok into MBR table
-and save only allocated partitions.
-If disabled, you will get a complete disk image with
-unallocated space on it. Resulting image will be same
-size with disk capacity.
-
-HINT: If you do not know what to do, leave this property
-checked
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 10
-
-
- $this
-
-
- Unmount drives after write
-
-
- labelDriveTitle
-
-
- groupBoxCompression
-
-
- 1
-
-
- 15
-
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- displayAllDrivesToolStripMenuItem
-
-
- menuStripMain
-
-
- toolTipUnmount
-
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBoxCompression
-
-
- 684, 127
-
-
- groupBoxCompression
+
+ buttonRead
Language
-
+
4
-
- 54, 19
-
-
- 2
-
-
- 7
-
-
- $this
-
-
- 708, 22
-
-
- 12, 219
-
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 4
-
-
- Disk Imager
-
-
- 47, 17
-
-
- 75, 23
-
-
- 9
-
-
- 7
-
-
- Misc.
-
-
- 114, 22
-
-
- russianToolStripMenuItem
-
-
- optionsToolStripMenuItem
-
-
- saveFileDialog1
+
+ languageToolStripMenuItem
54, 13
-
-
-
Read
-
- True
+
+ 94, 13
+
+
+ 149, 17
+
+
+ checkBoxUnmount
+
+
+ Display All Drives *** DANGEROUS ***
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
If enabled, utility will try to unmount drives that were
@@ -317,252 +166,59 @@ If disabled, you will have to remove drives yourself.
HINT: If you do not know what to do, leave this property
checked
-
- $this
-
-
- 0, 0
-
-
- 0
-
-
- 6, 13
-
-
-
- TopDown
-
-
- groupBoxCompression
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 254, 124
-
-
- statusStrip1
-
-
- True
-
-
- 11
-
-
- 2
-
-
- 708, 24
-
-
- groupBoxTruncation
-
-
- 14
+
+ flowLayoutPanelProgressBars
$this
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 6, 45
-
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 0, 356
-
-
+
-
- 137, 124
+
+ buttonCancel
-
- System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ groupBoxTruncation
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 267, 45
-
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- English
-
-
- radioButtonCompGz
-
-
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- flowLayoutPanelProgressBars
+
+ 15
-
- 528, 180
+
+ 168, 17
-
- 429, 124
+
+ russianToolStripMenuItem
-
- Russian
+
+ 12, 219
-
- groupBoxCompression
-
-
- $this
-
-
-
-
-
- Options
-
-
- $this
-
-
- checkBoxUnmount
-
-
- 384, 49
-
-
- 0
-
-
- Removable Drives
-
-
- $this
-
-
- buttonRead
-
-
-
-
-
- 621, 180
-
-
- 198, 19
-
-
- File Name
-
-
- TGZ
-
-
- 3
-
-
-
-
-
- $this
-
-
- labelFileName
-
-
- 3
-
-
- 6, 20
+
+ 155, 89
buttonChooseFile
-
- 2
-
-
- Progress
-
-
- 149, 17
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
-
- 0
-
-
- 75, 23
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 39, 17
-
-
- checkBoxUseMBR
-
-
- 11
-
-
-
-
-
- $this
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 114, 22
-
-
- $this
-
-
- False
-
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 275, 22
+
+ 6, 45
menuStrip1
-
- toolTipDrives
+
+
+ TopDown
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ This is a table with all your drives mounted on the system.
+By default it shows only removable drives, but you can
+change this in 'Options -> Display all drives'
-
- 42, 17
-
-
- buttonWrite
-
-
-
+
+ 3
Here you can choose a compression method for your image.
@@ -574,331 +230,672 @@ For 'Read' operation you can use any format you like.
HINT: If you are trying to perform 'Read' & do not know what to do,
select XZ as it gives most satisfying results
-
- 6
-
-
- toolTip
-
-
- 152, 73
-
-
+
$this
+
+ 16
+
+
+ 0
+
+
+ 8
+
Cancel
-
- This is a table with all your drives mounted on the system.
-By default it shows only removable drives, but you can
-change this in 'Options -> Display all drives'
+
+ radioButtonCompTgz
-
- label1
+
+ statusStrip1
+
+
+ Disk Imager
+
+
+ 1
+
+
+
+
+
+ 54, 19
+
+
+ 1
+
+
+
+
+
+ System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 0
+
+
+ True
+
+
+
+
+
+ 10
toolTipCompression
+
+ Options
+
+
+ toolTip
+
+
+ toolTipMBR
+
+
+ 366, 20
+
+
+ TGZ
+
+
+ ...
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 118, 17
+
+
+ 6, 13
+
+
+ groupBoxTruncation
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ saveFileDialog1
+
+
+ toolTipUnmount
+
+
+ 114, 22
+
+
+ label1
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 429, 180
+
+
+ 429, 124
+
+
+ Misc.
+
+
+ labelDriveTitle
+
+
+ radioButtonCompNone
+
+
+ 429, 34
+
+
+ 2
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 6
+
Use MBR partition sizes (read)
+
+ toolStripStatusLabel1
+
+
+ 7
+
+
+
+
+
+ 6
+
+
+ TopDown
+
+
+ 8
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 3
+
+
+
+
+
+ displayAllDrivesToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ groupBoxCompression
+
+
+ statusStrip1
+
+
+ ZIP
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 40, 17
+
+
+ $this
+
+
+ 100, 19
+
+
+ 152, 73
+
+
+ Image Files (*.img)|*.img|Binary files (*.bin)|*.bin|All files (*.*)|*.*
+
+
+ textBoxFileName
+
+
+ True
+
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ MainForm
+
+
+ 708, 378
+
+
+
+
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ English
+
+
+ XZ
+
+
+ NONE
+
+
+
+
+
+ 2
+
+
+ 1
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 9, 34
+
+
+ 12, 50
+
+
+ 153, 19
+
+
+ Write
+
+
+ 275, 22
+
+
+ 0, 356
+
+
+ 48, 13
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ 621, 180
+
+
+ optionsToolStripMenuItem
+
+
+ If enabled, during 'Read' utility will lok into MBR table
+and save only allocated partitions.
+If disabled, you will get a complete disk image with
+unallocated space on it. Resulting image will be same
+size with disk capacity.
+
+HINT: If you do not know what to do, leave this property
+checked
+
+
+ 0
+
+
+
+
+
+ checkedListBoxDrives
+
+
+ 75, 23
+
+
+ True
+
+
+ $this
+
+
+ buttonWrite
+
+
+ GZ
+
+
+
+
+
+ 267, 45
+
+
+ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 11
+
+
+ radioButtonCompXZ
+
+
+ 6, 20
+
$this
+
+ groupBoxCompression
+
+
+ 39, 17
+
+
+ 137, 124
+
+
+
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Opens file selection dialog
+
+
+ $this
+
+
+ Compression
+
+
+ groupBoxCompression
+
+
+ $this
+
+
+ 528, 180
+
+
+ 19
+
+
+ 14
+
+
+ 4
+
+
+ toolTipDrives
+
+
+ 0, 0
+
+
+ 75, 23
+
+
+ 12
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 1
+
+
+
+
+
+ $this
+
+
+ 12, 89
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Russian
+
+
+ 5
+
+
+ labelFileName
+
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 2
+
+
+ 275, 22
+
+
+
+
+
+ $this
+
+
+ groupBoxTruncation
+
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 12
+
+
+ File Name
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 61, 20
+
+
+ True
+
+
+ False
+
+
+ 2
+
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ menuStripMain
+
+
+ 10
+
+
+ 9, 73
+
+
+ 708, 24
+
+
+ $this
+
+
+ 56, 17
+
+
+ 1
+
+
+ 198, 19
+
+
+ 0
+
+
+ 13
+
+
+ groupBoxCompression
+
+
+ 9
+
+
+ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 708, 22
+
+
+ $this
+
+
+ Progress
+
+
+
+
+
+ 47, 17
+
+
+ True
+
+
+ Removable Drives
+
+
+ 75, 23
+
+
+ 4
+
+
+ 3
+
+
+ 207, 75
+
+
+
+
+
+ flowLayoutPanelProgressLabels
+
+
+ 11
+
+
+ 0
+
+
+ groupBoxCompression
+
+
+ toolStripStatusLabel1
+
+
+
+
+
+ $this
+
True
-
- 13
-
-
- ...
-
-
- 429, 34
-
-
- 13
-
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 40, 17
-
-
- 207, 75
-
-
- System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 48, 13
-
-
- 3
-
-
-
-
-
- 275, 22
-
-
- True
-
-
- 3
-
-
- toolStripStatusLabel1
-
-
-
-
-
- Image Files (*.img)|*.img|Binary files (*.bin)|*.bin|All files (*.*)|*.*
-
-
- 12, 89
-
-
- 6, 19
-
-
- $this
-
-
- Opens file selection dialog
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 118, 17
-
-
- System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- radioButtonCompTgz
-
-
- 9, 34
-
-
- 5
-
-
- True
-
-
- statusStrip1
+
+ Unmount drives after write
-
- 75, 23
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- NONE
+
+ checkBoxUseMBR
-
- 1
-
-
- True
-
-
+
-
- GZ
-
-
- MainForm
-
-
- 153, 19
-
-
- 0
-
-
- 16
-
-
- 0
-
-
- Display All Drives *** DANGEROUS ***
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- radioButtonCompXZ
-
-
- True
-
-
- TopDown
-
-
- 9, 73
-
-
- groupBoxCompression
-
-
- 155, 89
-
-
-
-
-
- buttonCancel
-
-
- 168, 17
-
-
- True
-
-
- $this
-
-
- 19
-
-
- languageToolStripMenuItem
-
-
- toolTipMBR
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 1
-
-
- 61, 20
-
-
- 25, 20
-
-
- 100, 19
-
-
- toolStripStatusLabel1
-
-
- 1
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 12, 50
-
radioButtonCompZip
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 7
-
- 4
-
-
- checkedListBoxDrives
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 708, 378
-
-
- englishToolStripMenuItem
-
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 8
-
-
- 1
-
-
- 2
-
-
- 5
-
-
- 366, 20
-
-
- True
-
-
- 6
-
-
- 0
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBoxTruncation
-
-
- flowLayoutPanelProgressLabels
-
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
+
$this
-
- XZ
+
+ 684, 127
-
- 12
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- radioButtonCompNone
+
+ 0
+
+
+ 13
+
+
+ radioButtonCompGz
+
+
+ True
+
+
+ 42, 17
+
+
+ 3
+
+
+ True
+
+
+ groupBoxCompression
17
-
-
+
+ 6, 19
+
+
+ englishToolStripMenuItem
+
+
+ 114, 22
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ 254, 124
+
+
+ 384, 49
820, 17
-
- 705, 17
-
-
- ru
+
+ 961, 17
True
@@ -921,7 +918,7 @@ change this in 'Options -> Display all drives'
409, 17
-
- 961, 17
+
+ 705, 17
\ No newline at end of file
diff --git a/DiskImager/MainForm.ru.resx b/DiskImager/MainForm.ru.resx
index 90f34cb..98a8dad 100644
--- a/DiskImager/MainForm.ru.resx
+++ b/DiskImager/MainForm.ru.resx
@@ -130,6 +130,9 @@
Запись
+
+ Открыть диалог выбора файла
+
Образы файлов (*.img,*.bin,*.sdcard)|*.img;*.bin;*.sdcard|Сжатые файлы (*.zip,*.gz,*tgz)|*.zip;*.gz;*.tgz|Все файлы (*.*)|*.*
@@ -157,11 +160,13 @@
Сжатие
-
- 56, 20
-
-
- Опции
+
+ Выбрать метод сжатия образа.
+Для записи на диск не надо указывать формат, утилита сама распознает формат
+архива/образа.
+Для чтения с диска можно указать любой желаемый формат.
+
+СОВЕТ: Если вы читаете с диска и не знаете, что выбрать, используйте XZ
265, 22
@@ -169,12 +174,6 @@
Показать все диски ***ОПАСНО***
-
- 265, 22
-
-
- Язык
-
141, 22
@@ -187,11 +186,17 @@
Русский
-
- 267, 78
+
+ 265, 22
-
- Образ логических разделов
+
+ Язык
+
+
+ 56, 20
+
+
+ Опции
216, 17
@@ -219,6 +224,12 @@
СОВЕТ: Если не знаете, зачем это, оставьте отмеченным.
+
+ 267, 78
+
+
+ Образ логических разделов
+
Список дисков, подмонтированных системой.
По умолчанию показывает внешние диски, но можно
@@ -230,15 +241,4 @@
Прогресс
-
- Открыть диалог выбора файла
-
-
- Выбрать метод сжатия образа.
-Для записи на диск не надо указывать формат, утилита сама распознает формат
-архива/образа.
-Для чтения с диска можно указать любой желаемый формат.
-
-СОВЕТ: Если вы читаете с диска и не знаете, что выбрать, используйте XZ
-
\ No newline at end of file