kamp/Mk0.Software.Bildduplikate
1
0
Fork 0
Code Issues 2 Pull Requests Packages Releases 11 Activity

fixed #31

Browse Source
This commit is contained in:
Manuel Kamper 2022-11-01 16:16:51 +01:00
parent 4df68efc51
commit 33941b3518
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk0.Software.Bildduplikate/Main.Designer.cs generated
View File

@ -273,7 +273,7 @@ namespace Mk0.Software.Bildduplikate
this.MinimumSize = new System.Drawing.Size(1000, 590); this.MinimumSize = new System.Drawing.Size(1000, 590);
this.Name = "Main"; this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Bildduplikate v1.8 by kmpr.at"; this.Text = "Bildduplikate v1.9 by kmpr.at";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Shown += new System.EventHandler(this.Main_Shown); this.Shown += new System.EventHandler(this.Main_Shown);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);

44
Mk0.Software.Bildduplikate/Main.cs
View File

@ -101,8 +101,8 @@ namespace Mk0.Software.Bildduplikate
string size1, size2; string size1, size2;
if (f1.Length == f2.Length) if (f1.Length == f2.Length)
{ {
size1 = @"\b " + FormatSize(f1.Length) + @" \b0 "; size1 = @" \b " + FormatSize(f1.Length) + @" \b0 ";
size2 = @"\b " + FormatSize(f2.Length) + @" \b0 "; size2 = @" \b " + FormatSize(f2.Length) + @" \b0 ";
dup1++; dup1++;
dup1++; dup1++;
dup2++; dup2++;
@ -110,7 +110,7 @@ namespace Mk0.Software.Bildduplikate
} }
else if (f1.Length > f2.Length) else if (f1.Length > f2.Length)
{ {
size1 = @"\b " + FormatSize(f1.Length) + @" \b0 "; size1 = @" \b " + FormatSize(f1.Length) + @" \b0 ";
size2 = FormatSize(f2.Length); size2 = FormatSize(f2.Length);
dup1++; dup1++;
dup1++; dup1++;
@ -118,7 +118,7 @@ namespace Mk0.Software.Bildduplikate
else else
{ {
size1 = FormatSize(f1.Length); size1 = FormatSize(f1.Length);
size2 = @"\b " + FormatSize(f2.Length) + @" \b0 "; size2 = @" \b " + FormatSize(f2.Length) + @" \b0 ";
dup2++; dup2++;
dup2++; dup2++;
} }
@ -127,8 +127,8 @@ namespace Mk0.Software.Bildduplikate
string filePath2 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2)); string filePath2 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2));
if (filePath1 == filePath2) if (filePath1 == filePath2)
{ {
filePath1 = @"\b " + filePath1 + @" \b0 "; filePath1 = @" \b " + filePath1 + @" \b0 ";
filePath2 = @"\b " + filePath2 + @" \b0 "; filePath2 = @" \b " + filePath2 + @" \b0 ";
dup1++; dup1++;
dup2++; dup2++;
} }
@ -137,8 +137,8 @@ namespace Mk0.Software.Bildduplikate
string fileName2 = Path.GetFileName(Duplicates.ElementAt(lineDup).Path2); string fileName2 = Path.GetFileName(Duplicates.ElementAt(lineDup).Path2);
if (fileName1 == fileName2) if (fileName1 == fileName2)
{ {
fileName1 = @"\b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 "; fileName1 = @" \b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 ";
fileName2 = @"\b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 "; fileName2 = @" \b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 ";
dup1++; dup1++;
dup2++; dup2++;
} }
@ -146,14 +146,14 @@ namespace Mk0.Software.Bildduplikate
{ {
if (fileName1.Count(Char.IsDigit) < fileName2.Count(Char.IsDigit)) if (fileName1.Count(Char.IsDigit) < fileName2.Count(Char.IsDigit))
{ {
fileName1 = @"\b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 "; fileName1 = @" \b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 ";
fileName2 = GetRtfUnicodeEscapedString(fileName2); fileName2 = GetRtfUnicodeEscapedString(fileName2);
dup1++; dup1++;
} }
else if(fileName2.Count(Char.IsDigit) < fileName1.Count(Char.IsDigit)) else if(fileName2.Count(Char.IsDigit) < fileName1.Count(Char.IsDigit))
{ {
fileName1 = GetRtfUnicodeEscapedString(fileName1); fileName1 = GetRtfUnicodeEscapedString(fileName1);
fileName2 = @"\b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 "; fileName2 = @" \b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 ";
dup2++; dup2++;
} }
else else
@ -161,12 +161,12 @@ namespace Mk0.Software.Bildduplikate
if (fileName1.Length > fileName2.Length) if (fileName1.Length > fileName2.Length)
{ {
fileName1 = GetRtfUnicodeEscapedString(fileName1); fileName1 = GetRtfUnicodeEscapedString(fileName1);
fileName2 = @"\b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 "; fileName2 = @" \b " + GetRtfUnicodeEscapedString(fileName2) + @" \b0 ";
dup2++; dup2++;
} }
else if (fileName2.Length > fileName1.Length) else if (fileName2.Length > fileName1.Length)
{ {
fileName1 = @"\b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 "; fileName1 = @" \b " + GetRtfUnicodeEscapedString(fileName1) + @" \b0 ";
fileName2 = GetRtfUnicodeEscapedString(fileName2); fileName2 = GetRtfUnicodeEscapedString(fileName2);
dup1++; dup1++;
} }
@ -181,21 +181,21 @@ namespace Mk0.Software.Bildduplikate
string lastTime1str, lastTime2str; string lastTime1str, lastTime2str;
if (lastTime1 == lastTime2) if (lastTime1 == lastTime2)
{ {
lastTime1str = @"\b " + lastTime1.ToString() + @" \b0 "; lastTime1str = @" \b " + lastTime1.ToString() + @" \b0 ";
lastTime2str = @"\b " + lastTime2.ToString() + @" \b0 "; lastTime2str = @" \b " + lastTime2.ToString() + @" \b0 ";
dup1++; dup1++;
dup2++; dup2++;
} }
else if (lastTime1 > lastTime2) else if (lastTime1 > lastTime2)
{ {
lastTime1str = @"\b " + lastTime1.ToString() + @" \b0 "; lastTime1str = @" \b " + lastTime1.ToString() + @" \b0 ";
lastTime2str = lastTime2.ToString(); lastTime2str = lastTime2.ToString();
dup1++; dup1++;
} }
else else
{ {
lastTime1str = lastTime1.ToString(); lastTime1str = lastTime1.ToString();
lastTime2str = @"\b " + lastTime2.ToString() + @" \b0 "; lastTime2str = @" \b " + lastTime2.ToString() + @" \b0 ";
dup2++; dup2++;
} }
@ -206,8 +206,8 @@ namespace Mk0.Software.Bildduplikate
{ {
if (img1.Height == img2.Height && img1.Width == img2.Width) if (img1.Height == img2.Height && img1.Width == img2.Width)
{ {
res1str = @"\b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 "; res1str = @" \b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 ";
res2str = @"\b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 "; res2str = @" \b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 ";
dup1++; dup1++;
dup1++; dup1++;
dup2++; dup2++;
@ -215,7 +215,7 @@ namespace Mk0.Software.Bildduplikate
} }
else if (img1.Height > img2.Height && img1.Width > img2.Width) else if (img1.Height > img2.Height && img1.Width > img2.Width)
{ {
res1str = @"\b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 "; res1str = @" \b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 ";
res2str = img2.Width + "x" + img2.Height + " @ " + res2 + " DPI"; res2str = img2.Width + "x" + img2.Height + " @ " + res2 + " DPI";
dup1++; dup1++;
dup1++; dup1++;
@ -223,7 +223,7 @@ namespace Mk0.Software.Bildduplikate
else if (img2.Height > img1.Height && img2.Width > img1.Width) else if (img2.Height > img1.Height && img2.Width > img1.Width)
{ {
res1str = img1.Width + "x" + img1.Height + " @ " + res1 + " DPI"; res1str = img1.Width + "x" + img1.Height + " @ " + res1 + " DPI";
res2str = @"\b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 "; res2str = @" \b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 ";
dup2++; dup2++;
dup2++; dup2++;
} }
@ -235,7 +235,7 @@ namespace Mk0.Software.Bildduplikate
} }
else if (res1 > res2) else if (res1 > res2)
{ {
res1str = @"\b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 "; res1str = @" \b " + img1.Width + "x" + img1.Height + " @ " + res1 + " DPI" + @" \b0 ";
res2str = img2.Width + "x" + img2.Height + " @ " + res2 + " DPI"; res2str = img2.Width + "x" + img2.Height + " @ " + res2 + " DPI";
dup1++; dup1++;
dup1++; dup1++;
@ -243,7 +243,7 @@ namespace Mk0.Software.Bildduplikate
else else
{ {
res1str = img1.Width + "x" + img1.Height + " @ " + res1 + " DPI"; res1str = img1.Width + "x" + img1.Height + " @ " + res1 + " DPI";
res2str = @"\b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 "; res2str = @" \b " + img2.Width + "x" + img2.Height + " @ " + res2 + " DPI" + @" \b0 ";
dup2++; dup2++;
dup2++; dup2++;
} }

2
Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj
View File

@ -24,7 +24,7 @@
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.8.0.0</ApplicationVersion> <ApplicationVersion>1.9.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>

4
Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.0.0")] [assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyFileVersion("1.8.0.0")] [assembly: AssemblyFileVersion("1.9.0.0")]