Skip to content

Commit 49c1d15

Browse files
harborsiemharborsiem
committed
Some fixes
1 parent 205d5fc commit 49c1d15

15 files changed

+49
-154
lines changed

‎Be.HexEditor/Be.HexEditor.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<PreBuildEvent />
4141
<PostBuildEvent />
4242
<Version>2.0.0</Version>
43+
<SignAssembly>False</SignAssembly>
44+
<AssemblyOriginatorKeyFile>Be.HexEditor.snk</AssemblyOriginatorKeyFile>
4345
</PropertyGroup>
4446
<ItemGroup>
4547
<Compile Remove="W32.cs" />

‎Be.HexEditor/Core/FormEx.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ void MainForm_Load(object sender, EventArgs e)
7979
void AdjustWindowInitial()
8080
{
8181
// Hold initial DPI used at loading this window.
82-
DpiOld = this.CurrentAutoScaleDimensions.Width;
82+
if (AutoScaleMode == AutoScaleMode.Dpi)
83+
DpiOld = this.CurrentAutoScaleDimensions.Width;
84+
else
85+
DpiOld = DpiAtDesign;
8386

8487
// Check current DPI.
8588
DpiNew = GetDpiWindowMonitor();

‎Be.HexEditor/FormFind.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ void ByteProvider_Changed(object sender, EventArgs e)
3131
ValidateFind();
3232
}
3333

34-
#region Windows Form Designer generated code
35-
/// <summary>
36-
/// Required method for Designer support - do not modify
37-
/// the contents of this method with the code editor.
38-
/// </summary>
39-
#endregion
40-
4134
private FindOptions _findOptions;
4235

4336
public FindOptions FindOptions
@@ -212,10 +205,5 @@ private void timerPercent_Tick(object sender, EventArgs e)
212205
lblPercent.Text = text;
213206
}
214207

215-
private void flowLayoutPanel1_Paint(object sender, PaintEventArgs e)
216-
{
217-
218-
}
219-
220208
}
221209
}

‎Be.HexEditor/FormFind.de.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@
129129
<data name="btnCancel.Text" xml:space="preserve">
130130
<value>Abbrechen</value>
131131
</data>
132+
<data name="chkMatchCase.Text" xml:space="preserve">
133+
<value>Exakter Vergleich</value>
134+
</data>
132135
<data name="hexFind.BuiltInContextMenu.CopyMenuItemText" xml:space="preserve">
133136
<value>Kopieren</value>
134137
</data>

‎Be.HexEditor/FormFind.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<value>NoControl</value>
335335
</data>
336336
<data name="chkMatchCase.Location" type="System.Drawing.Point, System.Drawing">
337-
<value>240, 22</value>
337+
<value>180, 22</value>
338338
</data>
339339
<data name="chkMatchCase.Size" type="System.Drawing.Size, System.Drawing">
340340
<value>86, 19</value>
@@ -397,7 +397,7 @@
397397
<value>hexFind</value>
398398
</data>
399399
<data name="&gt;&gt;hexFind.Type" xml:space="preserve">
400-
<value>Be.Windows.Forms.HexBox, Be.Windows.Forms.HexBox, Culture=neutral, PublicKeyToken=null</value>
400+
<value>Be.Windows.Forms.HexBox, Be.Windows.Forms.HexBox, Culture=neutral, PublicKeyToken=e0e5adf0ebc99863</value>
401401
</data>
402402
<data name="&gt;&gt;hexFind.Parent" xml:space="preserve">
403403
<value>groupBox1</value>

‎Be.HexEditor/FormFind.ru.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<value>Вырезать</value>
143143
</data>
144144
<data name="hexFind.BuiltInContextMenu.SelectAllMenuItemText" xml:space="preserve">
145-
<value />
145+
<value>Выбрать все</value>
146146
</data>
147147
<data name="$this.Text" xml:space="preserve">
148148
<value>Найти</value>

‎Be.HexEditor/FormHexEditor.de.resx‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121121
<data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
122122
<value>207, 22</value>
123123
</data>
@@ -378,26 +378,4 @@
378378
<data name="hexBox.BuiltInContextMenu.SelectAllMenuItemText" xml:space="preserve">
379379
<value>Alles markieren</value>
380380
</data>
381-
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
382-
<value>
383-
AAABAAIAEBAQAAAAAAAoAQAAJgAAACAgEAAAAAAA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAIAA
384-
AAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/
385-
AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAD/////////AP////////8A/////////wD/AA//AA
386-
//APD/8P/w//8A8P/w//Dw/wDw//D/8AD/APD/8P/w8P8A8P/w//D/DwD/AA//AAAPAP////////8A//
387-
///////wD/////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
388-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAA
389-
AAAAAAAAEAAAABAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD/
390-
/wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
391-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
392-
////////////////////////////////////////////////////////////AAD///8AAAAA////////
393-
8AAAD///AAAAAP///////wD//wD///8A//////////8A//8A////AP/////////wD///8A///wD/AP//
394-
////8A////AP//8A/wD///////AP///wD///AAAA///////wD///8A///wAAAP//////8A////AP//8A
395-
/wD///////AP///wD///AP8A/wD////wD///8A///wD///8A/////wD//wD///8A////AP////8A//8A
396-
//8AAAAAAAD/////8AAAD///AAAAAAAA//////8AAP//////////////////////////////////////
397-
////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
398-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
399-
//////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
400-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////////////////w==
401-
</value>
402-
</data>
403381
</root>

‎Be.HexEditor/FormHexEditor.it.resx‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121121
<data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
122122
<value>141, 22</value>
123123
</data>
@@ -372,29 +372,7 @@
372372
<data name="hexBox.Font" type="System.Drawing.Font, System.Drawing">
373373
<value>Courier New, 9pt</value>
374374
</data>
375-
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
376-
<value>
377-
AAABAAIAEBAQAAAAAAAoAQAAJgAAACAgEAAAAAAA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAIAA
378-
AAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/
379-
AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAD/////////AP////////8A/////////wD/AA//AA
380-
//APD/8P/w//8A8P/w//Dw/wDw//D/8AD/APD/8P/w8P8A8P/w//D/DwD/AA//AAAPAP////////8A//
381-
///////wD/////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
382-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAA
383-
AAAAAAAAEAAAABAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD/
384-
/wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
385-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
386-
////////////////////////////////////////////////////////////AAD///8AAAAA////////
387-
8AAAD///AAAAAP///////wD//wD///8A//////////8A//8A////AP/////////wD///8A///wD/AP//
388-
////8A////AP//8A/wD///////AP///wD///AAAA///////wD///8A///wAAAP//////8A////AP//8A
389-
/wD///////AP///wD///AP8A/wD////wD///8A///wD///8A/////wD//wD///8A////AP////8A//8A
390-
//8AAAAAAAD/////8AAAD///AAAAAAAA//////8AAP//////////////////////////////////////
391-
////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
392-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
393-
//////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
394-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////////////////w==
395-
</value>
396-
</data>
397-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
375+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
398376
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
399377
<value>Inherit</value>
400378
</data>

‎Be.HexEditor/FormHexEditor.ja.resx‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121121
<data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
122122
<value>168, 22</value>
123123
</data>
@@ -375,29 +375,7 @@
375375
<data name="hexBox.BuiltInContextMenu.SelectAllMenuItemText" xml:space="preserve">
376376
<value>すべて選択</value>
377377
</data>
378-
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
379-
<value>
380-
AAABAAIAEBAQAAAAAAAoAQAAJgAAACAgEAAAAAAA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAIAA
381-
AAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/
382-
AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAD/////////AP////////8A/////////wD/AA//AA
383-
//APD/8P/w//8A8P/w//Dw/wDw//D/8AD/APD/8P/w8P8A8P/w//D/DwD/AA//AAAPAP////////8A//
384-
///////wD/////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
385-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAA
386-
AAAAAAAAEAAAABAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD/
387-
/wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
388-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
389-
////////////////////////////////////////////////////////////AAD///8AAAAA////////
390-
8AAAD///AAAAAP///////wD//wD///8A//////////8A//8A////AP/////////wD///8A///wD/AP//
391-
////8A////AP//8A/wD///////AP///wD///AAAA///////wD///8A///wAAAP//////8A////AP//8A
392-
/wD///////AP///wD///AP8A/wD////wD///8A///wD///8A/////wD//wD///8A////AP////8A//8A
393-
//8AAAAAAAD/////8AAAD///AAAAAAAA//////8AAP//////////////////////////////////////
394-
////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
395-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
396-
//////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
397-
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////////////////w==
398-
</value>
399-
</data>
400-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
378+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
401379
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
402380
<value>Inherit</value>
403381
</data>

‎Be.HexEditor/FormHexEditor.resx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@
539539
<value>hexBox</value>
540540
</data>
541541
<data name="&gt;&gt;hexBox.Type" xml:space="preserve">
542-
<value>Be.Windows.Forms.HexBox, Be.Windows.Forms.HexBox, Culture=neutral, PublicKeyToken=null</value>
542+
<value>Be.Windows.Forms.HexBox, Be.Windows.Forms.HexBox, Culture=neutral, PublicKeyToken=e0e5adf0ebc99863</value>
543543
</data>
544544
<data name="&gt;&gt;hexBox.Parent" xml:space="preserve">
545545
<value>bodyPanel</value>
@@ -577,9 +577,6 @@
577577
<data name="bodyPanel.Location" type="System.Drawing.Point, System.Drawing">
578578
<value>3, 52</value>
579579
</data>
580-
<data name="bodyPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
581-
<value>4, 3, 4, 3</value>
582-
</data>
583580
<data name="bodyPanel.Size" type="System.Drawing.Size, System.Drawing">
584581
<value>649, 398</value>
585582
</data>

0 commit comments

Comments
 (0)